Skip to content

fix(neuron-ui): set current wallet to empty when all wallets are deleted #988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashchan merged 1 commit into from
Oct 15, 2019
Merged

fix(neuron-ui): set current wallet to empty when all wallets are deleted #988

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions packages/neuron-ui/src/states/initStates/wallet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import { addresses, currentWallet } from 'services/localCache'

export const emptyWallet: State.Wallet = {
name: '',
id: '',
balance: '0',
addresses: [],
}

const wallet = currentWallet.load()

export const walletState: State.Wallet = {
Expand Down
4 changes: 2 additions & 2 deletions packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
backupWallet as backupRemoteWallet,
showErrorMessage,
} from 'services/remote'
import initStates from 'states/initStates'
import { emptyWallet } from 'states/initStates/wallet'
import { WalletWizardPath } from 'components/WalletWizard'
import i18n from 'utils/i18n'
import { wallets as walletsCache, currentWallet as currentWalletCache } from 'services/localCache'
Expand All @@ -26,7 +26,7 @@ import { addNotification, addPopup } from './app'
export const updateCurrentWallet = () => (dispatch: StateDispatch, history: any) => {
getCurrentWallet().then(res => {
if (res.status === 1) {
const payload = res.result || initStates.wallet
const payload = res.result || emptyWallet
if (!payload || !payload.id) {
history.push(`${Routes.WalletWizard}${WalletWizardPath.Welcome}`)
}
Expand Down