Browse Source
Merge pull request #440 from meriadec/master
Fix images in build. Fix Linux build. Faster app relaunch.
master
Gaëtan Renaudeau
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
7 additions and
6 deletions
-
electron-builder.yml
-
src/components/SettingsPage/sections/Profile.js
-
src/helpers/staticPath.js
|
|
@ -13,6 +13,8 @@ mac: |
|
|
|
- zip |
|
|
|
|
|
|
|
linux: |
|
|
|
asarUnpack: |
|
|
|
- node_modules/@ledgerhq/ledger-core |
|
|
|
artifactName: ${name}-${version}-${os}-${arch}.${ext} |
|
|
|
category: Finance |
|
|
|
target: |
|
|
|
|
|
@ -84,14 +84,13 @@ class TabProfile extends PureComponent<Props, State> { |
|
|
|
this.props.cleanAccountsCache() |
|
|
|
await delay(500) |
|
|
|
db.cleanCache() |
|
|
|
remote.app.relaunch() |
|
|
|
remote.app.exit() |
|
|
|
remote.getCurrentWindow().webContents.reload() |
|
|
|
} |
|
|
|
|
|
|
|
handleHardReset = () => { |
|
|
|
handleHardReset = async () => { |
|
|
|
db.resetAll() |
|
|
|
remote.app.relaunch() |
|
|
|
remote.app.exit() |
|
|
|
await delay(500) |
|
|
|
remote.getCurrentWindow().webContents.reload() |
|
|
|
} |
|
|
|
|
|
|
|
handleChangePasswordCheck = isChecked => { |
|
|
|
|
|
@ -20,7 +20,7 @@ const staticPath = |
|
|
|
* note: `i` for `image` (using `img` was confusing when using with <img /> tag) |
|
|
|
*/ |
|
|
|
export function i(path: string): string { |
|
|
|
return `/images/${path}` |
|
|
|
return isRunningInAsar ? `${staticPath}/images/${path}` : `/images/${path}` |
|
|
|
} |
|
|
|
|
|
|
|
export default staticPath |
|
|
|