Trigger Wallet Ready when address changed

1 files changed, 16 insertions, 2 deletions

diff --git a/packages/instant/src/redux/analytics_middleware.ts b/packages/instant/src/redux/analytics_middleware.ts
index 7fbb12cb9..a86cf1b83 100644
--- a/packages/instant/src/redux/analytics_middleware.ts
+++ b/packages/instant/src/redux/analytics_middleware.ts
@@ -3,13 +3,27 @@ import * as _ from 'lodash';
 import { Middleware } from 'redux';
 
 import { ETH_DECIMALS } from '../constants';
-import { AccountState } from '../types';
+import { Account, AccountState } from '../types';
 import { analytics } from '../util/analytics';
 
 import { Action, ActionTypes } from './actions';
 
 import { State } from './reducer';
 
+const shouldTriggerWalletReady = (prevAccount: Account, curAccount: Account): boolean => {
+    const justTurnedReady = curAccount.state === AccountState.Ready && prevAccount.state !== AccountState.Ready;
+    if (justTurnedReady) {
+        return true;
+    }
+
+    if (curAccount.state === AccountState.Ready && prevAccount.state === AccountState.Ready) {
+        // Account was ready, and is now ready again, but address has changed
+        return curAccount.address !== prevAccount.address;
+    }
+
+    return false;
+};
+
 export const analyticsMiddleware: Middleware = store => next => middlewareAction => {
     const prevState = store.getState() as State;
     const prevAccount = prevState.providerState.account;
@@ -21,7 +35,7 @@ export const analyticsMiddleware: Middleware = store => next => middlewareAction
 
     switch (nextAction.type) {
         case ActionTypes.SET_ACCOUNT_STATE_READY:
-            if (curAccount.state === AccountState.Ready && prevAccount.state !== AccountState.Ready) {
+            if (curAccount.state === AccountState.Ready && shouldTriggerWalletReady(prevAccount, curAccount)) {
                 const ethAddress = curAccount.address;
                 analytics.addUserProperties({ ethAddress });
                 analytics.trackWalletReady();