From 3e0a235c6707834cd4f3f1ee8e21de0b3bfcd86f Mon Sep 17 00:00:00 2001
From: Lyka Labrada <lykalabrada@gmail.com>
Date: Wed, 25 Oct 2023 15:55:09 +0800
Subject: [PATCH] fix(ui-ux): handle empty wallet address

---
 .../screens/Portfolio/PortfolioScreen.tsx     |  5 ++--
 shared/store/userPreferences.ts               | 27 ++++++++++++-------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/PortfolioScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/PortfolioScreen.tsx
index c0f5ff5543..3f072b6e4b 100644
--- a/mobile-app/app/screens/AppNavigator/screens/Portfolio/PortfolioScreen.tsx
+++ b/mobile-app/app/screens/AppNavigator/screens/Portfolio/PortfolioScreen.tsx
@@ -73,7 +73,7 @@ import * as SplashScreen from "expo-splash-screen";
 import { useLogger } from "@shared-contexts/NativeLoggingProvider";
 import { bottomTabDefaultRoutes } from "@screens/AppNavigator/constants/DefaultRoutes";
 import { DomainType, useDomainContext } from "@contexts/DomainContext";
-// import { AddressSelectionButtonV2 } from "./components/AddressSelectionButtonV2";
+import { AddressSelectionButtonV2 } from "./components/AddressSelectionButtonV2";
 import { ActionButtons } from "./components/ActionButtons";
 import {
   BottomSheetAssetSortList,
@@ -637,8 +637,7 @@ export function PortfolioScreen({ navigation }: Props): JSX.Element {
           dark={tailwind("bg-mono-dark-v2-00")}
           style={tailwind("px-5 flex flex-row items-center")}
         >
-          {/* TODO(lyka): Add back */}
-          {/* <AddressSelectionButtonV2 onPress={() => expandModal(false)} /> */}
+          <AddressSelectionButtonV2 onPress={() => expandModal(false)} />
           <ThemedTouchableOpacityV2
             testID="toggle_balance"
             style={tailwind("ml-2")}
diff --git a/shared/store/userPreferences.ts b/shared/store/userPreferences.ts
index 81fd802636..60161dca87 100644
--- a/shared/store/userPreferences.ts
+++ b/shared/store/userPreferences.ts
@@ -129,16 +129,23 @@ export const selectLocalWalletAddressArray = createSelector(
 export const selectAllLabeledWalletAddress = createSelector(
   (state: UserPreferences) => state.addresses,
   (walletAddress): LabeledAddress => {
-    return (Object.values(walletAddress) as LocalAddress[]).reduce(
-      (allAddress, each) => {
-        return {
-          ...allAddress,
-          [each.address]: each,
-          [each.evmAddress]: each,
-        };
-      },
-      {},
-    );
+    try {
+      if (walletAddress === undefined) {
+        return {} as LabeledAddress;
+      }
+      return (Object.values(walletAddress) as LocalAddress[]).reduce(
+        (allAddress, each) => {
+          return {
+            ...allAddress,
+            [each.address]: each,
+            [each.evmAddress]: each,
+          };
+        },
+        {},
+      );
+    } catch (e) {
+      return {} as LabeledAddress;
+    }
   },
 );