aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts/components
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-06-27 02:01:50 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-06-27 02:01:50 +0800
commitf70c1ff009385266d694269c2c4dd0e9fb38dc46 (patch)
tree3880a973d173c640cc29f08d19a5950b287c2d2d /packages/website/ts/components
parentc4e2dcafa4bd5f4b905680e2c1b80d6ddb6ab6fb (diff)
downloaddexon-sol-tools-f70c1ff009385266d694269c2c4dd0e9fb38dc46.tar
dexon-sol-tools-f70c1ff009385266d694269c2c4dd0e9fb38dc46.tar.gz
dexon-sol-tools-f70c1ff009385266d694269c2c4dd0e9fb38dc46.tar.bz2
dexon-sol-tools-f70c1ff009385266d694269c2c4dd0e9fb38dc46.tar.lz
dexon-sol-tools-f70c1ff009385266d694269c2c4dd0e9fb38dc46.tar.xz
dexon-sol-tools-f70c1ff009385266d694269c2c4dd0e9fb38dc46.tar.zst
dexon-sol-tools-f70c1ff009385266d694269c2c4dd0e9fb38dc46.zip
Ledger to metamask to ledger working
Diffstat (limited to 'packages/website/ts/components')
-rw-r--r--packages/website/ts/components/portal/portal.tsx7
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/website/ts/components/portal/portal.tsx b/packages/website/ts/components/portal/portal.tsx
index 58acb435e..bb88e3824 100644
--- a/packages/website/ts/components/portal/portal.tsx
+++ b/packages/website/ts/components/portal/portal.tsx
@@ -182,9 +182,10 @@ export class Portal extends React.Component<PortalProps, PortalState> {
prevPathname: nextProps.location.pathname,
});
}
+
+ // If the address changed, but the network did not, we can just refetch the currently tracked tokens.
if (
- nextProps.userAddress !== this.props.userAddress ||
- nextProps.networkId !== this.props.networkId ||
+ (nextProps.userAddress !== this.props.userAddress && nextProps.networkId === this.props.networkId) ||
nextProps.lastForceTokenStateRefetch !== this.props.lastForceTokenStateRefetch
) {
const trackedTokenAddresses = _.keys(this.state.trackedTokenStateByAddress);
@@ -200,7 +201,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
const newTokenAddresses = _.map(newTokens, token => token.address);
// Add placeholder entry for this token to the state, since fetching the
// balance/allowance is asynchronous
- const trackedTokenStateByAddress = this.state.trackedTokenStateByAddress;
+ const trackedTokenStateByAddress = { ...this.state.trackedTokenStateByAddress };
for (const tokenAddress of newTokenAddresses) {
trackedTokenStateByAddress[tokenAddress] = {
balance: new BigNumber(0),