Skip to content

Commit ef4037e

Browse files
benisgoldBrodyHughes
authored andcommitted
remove zustand selectors that return objects (#6355)
Co-authored-by: Matthew Wall <[email protected]> (cherry picked from commit 56d15e3)
1 parent 372c7ed commit ef4037e

File tree

4 files changed

+13
-17
lines changed

4 files changed

+13
-17
lines changed

src/__swaps__/screens/Swap/components/TokenList/ChainSelection.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ export const ChainSelection = memo(function ChainSelection({ allText, output }:
3232
const backendNetworks = useBackendNetworksStore(state => state.backendNetworksSharedValue);
3333

3434
// chains sorted by balance on output, chains without balance hidden on input
35-
const { balanceSortedChainList, filter } = useUserAssetsStore(state => ({
36-
balanceSortedChainList: output ? state.getBalanceSortedChainList() : state.getChainsWithBalance(),
37-
filter: state.filter,
38-
}));
35+
const balanceSortedChainList = useUserAssetsStore(state => (output ? state.getBalanceSortedChainList() : state.getChainsWithBalance()));
36+
const filter = useUserAssetsStore(state => state.filter);
37+
3938
const inputListFilter = useSharedValue(filter);
4039

4140
const accentColor = useMemo(() => {

src/__swaps__/screens/Swap/providers/SyncSwapStateAndSharedValues.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ export function SyncGasStateToSharedValues() {
146146

147147
const gasSettings = useSelectedGas(chainId);
148148

149-
const { userNativeNetworkAsset, isLoadingNativeNetworkAsset } = useUserAssetsStore(state => {
150-
const { address: nativeCurrencyAddress } = useBackendNetworksStore.getState().getChainsNativeAsset()[chainId];
151-
const uniqueId = getUniqueId(nativeCurrencyAddress, chainId);
152-
return { userNativeNetworkAsset: state.getLegacyUserAsset(uniqueId), isLoadingNativeNetworkAsset: state.isLoadingUserAssets };
153-
});
149+
const { address: nativeCurrencyAddress } = useBackendNetworksStore.getState().getChainsNativeAsset()[chainId];
150+
151+
const isLoadingNativeNetworkAsset = useUserAssetsStore(state => state.isLoadingUserAssets);
152+
const userNativeNetworkAsset = useUserAssetsStore(state => state.getLegacyUserAsset(getUniqueId(nativeCurrencyAddress, chainId)));
153+
154154
const { data: estimatedGasLimit } = useSwapEstimatedGasLimit({ chainId, assetToSell, quote });
155155

156156
const gasFeeRange = useSharedValue<[string, string] | null>(null);

src/hooks/useWalletSectionsData.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,8 @@ export default function useWalletSectionsData({
5656
} = {}) {
5757
const { accountAddress, language, network, nativeCurrency } = useAccountSettings();
5858
const { selectedWallet, isReadOnlyWallet } = useWallets();
59-
const { isLoadingUserAssets, sortedAssets = [] } = useUserAssetsStore(state => ({
60-
sortedAssets: state.legacyUserAssets,
61-
isLoadingUserAssets: state.isLoadingUserAssets,
62-
}));
59+
const isLoadingUserAssets = useUserAssetsStore(state => state.isLoadingUserAssets);
60+
const sortedAssets = useUserAssetsStore(state => state.legacyUserAssets);
6361
const isWalletEthZero = useIsWalletEthZero();
6462

6563
const { nftSort, nftSortDirection } = useNftSort();

src/hooks/useWatchPendingTxs.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ import { useConnectedToHardhatStore } from '@/state/connectedToHardhat';
1414
import { useBackendNetworksStore } from '@/state/backendNetworks/backendNetworks';
1515

1616
export const useWatchPendingTransactions = ({ address }: { address: string }) => {
17-
const { storePendingTransactions, setPendingTransactions } = usePendingTransactionsStore(state => ({
18-
storePendingTransactions: state.pendingTransactions,
19-
setPendingTransactions: state.setPendingTransactions,
20-
}));
17+
const storePendingTransactions = usePendingTransactionsStore(state => state.pendingTransactions);
18+
const setPendingTransactions = usePendingTransactionsStore(state => state.setPendingTransactions);
19+
2120
const { connectedToHardhat } = useConnectedToHardhatStore();
2221

2322
const pendingTransactions = useMemo(() => storePendingTransactions[address] || [], [address, storePendingTransactions]);

0 commit comments

Comments
 (0)