Skip to content
This repository has been archived by the owner on Mar 11, 2024. It is now read-only.

Fix JS exception #709

Merged
merged 1 commit into from
May 11, 2023
Merged

Fix JS exception #709

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions public/electron.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,26 +175,26 @@ function createWindow() {

if (isDev) {
// Open the DevTools.
mainWindow.webContents.openDevTools()
mainWindow?.webContents.openDevTools()
}

// Set default window open handler (open new windows in the web browser by default)
mainWindow.webContents.setWindowOpenHandler(({ url }) => {
mainWindow?.webContents.setWindowOpenHandler(({ url }) => {
shell.openExternal(url)
return { action: 'deny' }
})

nativeTheme.on('updated', () =>
mainWindow.webContents.send('theme:shouldUseDarkColors', nativeTheme.shouldUseDarkColors)
mainWindow?.webContents.send('theme:shouldUseDarkColors', nativeTheme.shouldUseDarkColors)
)

mainWindow.on('closed', () => (mainWindow = null))

autoUpdater.on('download-progress', (info) => mainWindow.webContents.send('updater:download-progress', info))
autoUpdater.on('download-progress', (info) => mainWindow?.webContents.send('updater:download-progress', info))

autoUpdater.on('error', (error) => mainWindow.webContents.send('updater:error', error))
autoUpdater.on('error', (error) => mainWindow?.webContents.send('updater:error', error))

autoUpdater.on('update-downloaded', (event) => mainWindow.webContents.send('updater:updateDownloaded', event))
autoUpdater.on('update-downloaded', (event) => mainWindow?.webContents.send('updater:updateDownloaded', event))

if (!isMac) {
if (process.argv.length > 1) {
Expand Down Expand Up @@ -225,7 +225,7 @@ app.on('second-instance', (_event, args) => {

if (url) {
deepLinkUri = extractWalletConnectUri(url)
mainWindow.webContents.send('wc:connect', deepLinkUri)
mainWindow?.webContents.send('wc:connect', deepLinkUri)
}
}
}
Expand Down Expand Up @@ -315,7 +315,7 @@ app.on('activate', function () {
app.on('open-url', (_, url) => {
if (url.startsWith(ALEPHIUM_WALLET_CONNECT_DEEP_LINK_PREFIX)) {
deepLinkUri = extractWalletConnectUri(url)
if (mainWindow) mainWindow.webContents.send('wc:connect', deepLinkUri)
if (mainWindow) mainWindow?.webContents.send('wc:connect', deepLinkUri)
}
})

Expand Down