poanetwork
/
MyCrypto
mirror of https://github.com/poanetwork/MyCrypto.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change network without window refresh (#815) 

* change network without window refresh

* fix saga tests

* fix import
This commit is contained in:
Daniel Ternyak 2018-01-15 00:22:11 -06:00 committed by GitHub
parent d720b502ff
commit 48ee9bd87b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/components/ui/UnlockHeader.tsx
View File

@ -20,7 +20,7 @@ export class UnlockHeader extends React.Component<Props, State> {
};
public componentDidUpdate(prevProps: Props) {
if (this.props.wallet && this.props.wallet !== prevProps.wallet) {
if (this.props.wallet !== prevProps.wallet) {
this.setState({ isExpanded: !this.state.isExpanded });
}
}

5
common/sagas/config.ts
View File

@ -41,6 +41,8 @@ import { IWallet, Web3Wallet } from 'libs/wallet';
import { getWalletInst } from 'selectors/wallet';
import { TypeKeys as WalletTypeKeys } from 'actions/wallet/constants';
import { State as ConfigState, INITIAL_STATE as configInitialState } from 'reducers/config';
import { resetWallet } from 'actions/wallet';
import { reset as resetTransaction } from 'actions/transaction';
export const getConfig = (state: AppState): ConfigState => state.config;
@ -173,7 +175,8 @@ export function* handleNodeChangeIntent(action: ChangeNodeIntentAction): SagaIte
// if there's no wallet, do not reload as there's no component state to resync
if (currentWallet && currentConfig.network !== actionConfig.network) {
yield call(reload);
yield put(resetWallet());
yield put(resetTransaction());
}
}

7
spec/sagas/config.spec.ts
View File

@ -7,7 +7,6 @@ import {
pollOfflineStatus,
handlePollOfflineStatus,
handleNodeChangeIntent,
reload,
unsetWeb3Node,
unsetWeb3NodeOnWalletEvent,
equivalentNodeOrDefault
@ -26,7 +25,8 @@ import { Web3Wallet } from 'libs/wallet';
import { RPCNode } from 'libs/nodes';
import { showNotification } from 'actions/notifications';
import { translateRaw } from 'translations';
import { resetWallet } from 'actions/wallet';
import { reset as resetTransaction } from 'actions/transaction';
// init module
configuredStore.getState();
@ -214,7 +214,8 @@ describe('handleNodeChangeIntent*', () => {
it('should call reload if wallet exists and network is new', () => {
data.clone2 = data.gen.clone();
expect(data.clone2.next(truthyWallet).value).toEqual(call(reload));
expect(data.clone2.next(truthyWallet).value).toEqual(put(resetWallet()));
expect(data.clone2.next(truthyWallet).value).toEqual(put(resetTransaction()));
expect(data.clone2.next().done).toEqual(true);
});