aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-06-27 03:16:10 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-06-27 03:16:10 +0800
commit3866154b505c40008b57afb8b75575eb14419578 (patch)
treed71a8ae2542d615e10c0fd0193be76f68043c9ba /packages
parent64ed2464cf2bca26002e66bdb634b57d723fe8ad (diff)
downloaddexon-0x-contracts-3866154b505c40008b57afb8b75575eb14419578.tar.gz
dexon-0x-contracts-3866154b505c40008b57afb8b75575eb14419578.tar.zst
dexon-0x-contracts-3866154b505c40008b57afb8b75575eb14419578.zip
Fix stateful ledger dialog edge state
Diffstat (limited to 'packages')
-rw-r--r--packages/website/ts/blockchain.ts3
-rw-r--r--packages/website/ts/components/dialogs/ledger_config_dialog.tsx1
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index d2040abb5..0d8cbdcd4 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -191,7 +191,6 @@ export class Blockchain {
// tslint:disable-next-line:no-floating-promises
this._onPageLoadInitFireAndForgetAsync();
}
- // TODO: Investigate if we need this.
public async networkIdUpdatedFireAndForgetAsync(newNetworkId: number): Promise<void> {
const isConnected = !_.isUndefined(newNetworkId);
if (!isConnected) {
@@ -246,7 +245,7 @@ export class Blockchain {
this._dispatcher.updateBlockchainIsLoaded(false);
// We don't want to be out of sync with the network metamask declares.
const networkId = await Blockchain._getInjectedWeb3ProviderNetworkIdIfExistsAsync();
- await this._resetOrInitializeAsync(this.networkId, shouldPollUserAddress, userLedgerProvider);
+ await this._resetOrInitializeAsync(networkId, shouldPollUserAddress, userLedgerProvider);
}
public async setProxyAllowanceAsync(token: Token, amountInBaseUnits: BigNumber): Promise<void> {
utils.assert(this.isValidAddress(token.address), BlockchainCallErrs.TokenAddressIsInvalid);
diff --git a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
index 69144bdd3..81071d404 100644
--- a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
+++ b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
@@ -282,6 +282,7 @@ export class LedgerConfigDialog extends React.Component<LedgerConfigDialogProps,
if (didSucceed) {
this.setState({
stepIndex: LedgerSteps.SELECT_ADDRESS,
+ connectionErrMsg: '',
});
} else {
this.props.dispatcher.updateBlockchainIsLoaded(true);