2 files changed, 42 insertions, 3 deletions
diff --git a/packages/instant/src/redux/analytics_middleware.ts b/packages/instant/src/redux/analytics_middleware.ts
new file mode 100644
index 000000000..8dd674e94
--- /dev/null
+++ b/packages/instant/src/redux/analytics_middleware.ts
@@ -0,0 +1,38 @@
+import { ObjectMap } from '@0x/types';
+import * as _ from 'lodash';
+import { Middleware } from 'redux';
+
+import { analytics } from '../util/analytics';
+
+import { AccountState } from './../types';
+import { Action, ActionTypes } from './actions';
+import { State } from './reducer';
+
+export const analyticsMiddleware: Middleware = store => next => middlewareAction => {
+    const prevState = store.getState() as State;
+    const nextAction = next(middlewareAction) as Action;
+    const nextState = store.getState() as State;
+
+    const curAccount = nextState.providerState.account;
+    const prevAccount = prevState.providerState.account;
+    switch (nextAction.type) {
+        case ActionTypes.SET_ACCOUNT_STATE_READY:
+            if (curAccount.state === AccountState.Ready && !_.isEqual(curAccount, prevAccount)) {
+                const ethAddress = curAccount.address;
+                analytics.addUserProperties({ ethAddress });
+                analytics.track('Wallet - Ready');
+            }
+            break;
+        case ActionTypes.UPDATE_ACCOUNT_ETH_BALANCE:
+            if (
+                curAccount.state === AccountState.Ready &&
+                curAccount.ethBalanceInWei &&
+                !_.isEqual(curAccount, prevAccount)
+            ) {
+                const ethBalanceInWei = curAccount.ethBalanceInWei.toString();
+                analytics.addUserProperties({ ethBalanceInWei });
+            }
+    }
+
+    return nextAction;
+};
diff --git a/packages/instant/src/redux/store.ts b/packages/instant/src/redux/store.ts
index 20710765d..54dfe58c4 100644
--- a/packages/instant/src/redux/store.ts
+++ b/packages/instant/src/redux/store.ts
@@ -1,7 +1,8 @@
 import * as _ from 'lodash';
-import { createStore, Store as ReduxStore } from 'redux';
-import { devToolsEnhancer } from 'redux-devtools-extension/developmentOnly';
+import { applyMiddleware, createStore, Store as ReduxStore } from 'redux';
+import { composeWithDevTools, devToolsEnhancer } from 'redux-devtools-extension/developmentOnly';
 
+import { analyticsMiddleware } from './analytics_middleware';
 import { createReducer, State } from './reducer';
 
 export type Store = ReduxStore<State>;
@@ -9,6 +10,6 @@ export type Store = ReduxStore<State>;
 export const store = {
     create: (initialState: State): Store => {
         const reducer = createReducer(initialState);
-        return createStore(reducer, initialState, devToolsEnhancer({}));
+        return createStore(reducer, initialState, composeWithDevTools(applyMiddleware(analyticsMiddleware)));
     },
 };