1 files changed, 18 insertions, 3 deletions
diff --git a/packages/instant/src/redux/analytics_middleware.ts b/packages/instant/src/redux/analytics_middleware.ts
index 1a8aefb38..8aa76eb77 100644
--- a/packages/instant/src/redux/analytics_middleware.ts
+++ b/packages/instant/src/redux/analytics_middleware.ts
@@ -55,10 +55,25 @@ export const analyticsMiddleware: Middleware = store => next => middlewareAction
             }
             break;
         case ActionTypes.UPDATE_SELECTED_ASSET:
-            if (curState.selectedAsset) {
+            const selectedAsset = curState.selectedAsset;
+            if (selectedAsset) {
+                const assetName = selectedAsset.metaData.name;
+                const assetData = selectedAsset.assetData;
                 analytics.trackTokenSelectorChose({
-                    assetName: curState.selectedAsset.metaData.name,
-                    assetData: curState.selectedAsset.assetData,
+                    assetName,
+                    assetData,
+                });
+                analytics.addEventProperties({
+                    selectedAssetName: assetName,
+                    selectedAssetData: assetData,
+                });
+            }
+            break;
+        case ActionTypes.SET_AVAILABLE_ASSETS:
+            const availableAssets = curState.availableAssets;
+            if (availableAssets) {
+                analytics.addEventProperties({
+                    numberAvailableAssets: availableAssets.length,
                 });
             }
             break;