Author: natew

src/__swaps__/screens/Swap/Swap.tsx

@@ -22,7 +22,6 @@ import { ChainId } from '@/state/backendNetworks/types';
 import { SwapAssetType } from '@/__swaps__/types/swap';
 import { parseSearchAsset } from '@/__swaps__/utils/assets';
 import { AbsolutePortalRoot } from '@/components/AbsolutePortal';
-import { useAccountSettings } from '@/hooks';
 import { useDelayedMount } from '@/hooks/useDelayedMount';
 import { userAssetsStore } from '@/state/assets/userAssets';
 import { swapsStore, useSwapsStore } from '@/state/swaps/swapsStore';
@@ -32,6 +31,7 @@ import { SwapProvider, useSwapContext } from './providers/swap-provider';
 import { NavigateToSwapSettingsTrigger } from './components/NavigateToSwapSettingsTrigger';
 import { useSwapsSearchStore } from './resources/search/searchV2';
 import { ReviewButton } from './components/ReviewButton';
+import { useAccountAddress } from '@/state/wallets/walletsStore';
 
 /** README
  * This screen is largely driven by Reanimated and Gesture Handler, which
@@ -142,7 +142,7 @@ const useCleanupOnUnmount = () => {
 };
 
 const WalletAddressObserver = () => {
-  const { accountAddress } = useAccountSettings();
+  const accountAddress = useAccountAddress();
   const { setAsset } = useSwapContext();
 
   const setNewInputAsset = useCallback(() => {

src/components/AddFundsInterstitial.js

@@ -2,10 +2,11 @@ import { analytics } from '@/analytics';
 import Divider from '@/components/Divider';
 import { ButtonPressAnimation, ScaleButtonZoomableAndroid } from '@/components/animations';
 import { Icon } from '@/components/icons';
-import { useAccountSettings, useDimensions } from '@/hooks';
+import { useDimensions } from '@/hooks';
 import Routes from '@/navigation/routesNames';
 import ShadowStack from '@/react-native-shadow-stack';
 import { Network } from '@/state/backendNetworks/types';
+import { useAccountAddress, useWalletsStore } from '@/state/wallets/walletsStore';
 import styled from '@/styled-thing';
 import { padding, position } from '@/styles';
 import { openInBrowser } from '@/utils/openInBrowser';
@@ -17,7 +18,6 @@ import { View } from 'react-native';
 import networkInfo from '../helpers/networkInfo';
 import showWalletErrorAlert from '../helpers/support';
 import { useNavigation } from '../navigation/Navigation';
-import { useWalletsStore } from '@/state/wallets/walletsStore';
 import { useTheme } from '../theme/ThemeContext';
 import { deviceUtils, magicMemo } from '../utils';
 import { Centered, Row, RowWithMargins } from './layout';
@@ -176,7 +176,7 @@ const AddFundsInterstitial = ({ network }) => {
   const { isSmallPhone } = useDimensions();
   const { navigate } = useNavigation();
   const isDamaged = useWalletsStore(state => state.getIsDamaged());
-  const { accountAddress } = useAccountSettings();
+  const accountAddress = useAccountAddress();
   const { colors } = useTheme();
   const { name: routeName } = useRoute();
 

src/components/activity-list/ActivityList.tsx

@@ -15,6 +15,7 @@ import { safeAreaInsetValues } from '@/utils';
 import { useAccountSettings, useAccountTransactions } from '@/hooks';
 import { usePendingTransactionsStore } from '@/state/pendingTransactions';
 import { TransactionSections, TransactionItemForSectionList } from '@/helpers/buildTransactionsSectionsSelector';
+import { useAccountAddress } from '@/state/wallets/walletsStore';
 
 const sx = StyleSheet.create({
   sectionHeader: {
@@ -85,7 +86,8 @@ function ListFooterComponent({ label, onPress }: { label: string; onPress: () =>
 }
 
 const ActivityList = () => {
-  const { accountAddress, nativeCurrency } = useAccountSettings();
+  const accountAddress = useAccountAddress();
+  const { nativeCurrency } = useAccountSettings();
 
   const { setScrollToTopRef } = useSectionListScrollToTopContext<TransactionItemForSectionList, TransactionSections>();
   const { sections, nextPage, transactionsCount, remainingItemsLabel } = useAccountTransactions();

src/components/asset-list/RecyclerAssetList2/Claimable.tsx

@@ -13,11 +13,13 @@ import { ChainImage } from '@/components/coin-icon/ChainImage';
 import { useNativeAsset } from '@/utils/ethereumUtils';
 import { ChainId } from '@/state/backendNetworks/types';
 import { usePoints } from '@/resources/points';
+import { useAccountAddress } from '@/state/wallets/walletsStore';
 
 const RAINBOW_ICON_URL = 'https://rainbowme-res.cloudinary.com/image/upload/v1694722625/dapps/rainbow-icon-large.png';
 
 export const Claimable = React.memo(function Claimable({ uniqueId, extendedState }: { uniqueId: string; extendedState: ExtendedState }) {
-  const { accountAddress, nativeCurrency } = useAccountSettings();
+  const accountAddress = useAccountAddress();
+  const { nativeCurrency } = useAccountSettings();
   const { navigate } = extendedState;
 
   const isETHRewards = uniqueId === 'rainbow-eth-rewards';

src/state/wallets/walletsStore.ts

@@ -613,6 +613,8 @@ export const getAccountAddress = () => useWalletsStore.getState().accountAddress
 export const getWallets = () => useWalletsStore.getState().wallets;
 export const getSelectedWallet = () => useWalletsStore.getState().selected;
 
+export const useAccountAddress = () => useWalletsStore(state => state.accountAddress);
+
 export const isImportedWallet = (address: string): boolean => {
   const wallets = getWallets();
   if (!wallets) {