Merge branch 'develop' into @matthew/backend-chain-badge

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

@@ -30,10 +30,9 @@ export const ChainSelection = memo(function ChainSelection({ allText, output }:
   const backendNetworks = useBackendNetworksStore(state => state.backendNetworksSharedValue);
 
   // chains sorted by balance on output, chains without balance hidden on input
-  const { balanceSortedChainList, filter } = useUserAssetsStore(state => ({
-    balanceSortedChainList: output ? state.getBalanceSortedChainList() : state.getChainsWithBalance(),
-    filter: state.filter,
-  }));
+  const balanceSortedChainList = useUserAssetsStore(state => (output ? state.getBalanceSortedChainList() : state.getChainsWithBalance()));
+  const filter = useUserAssetsStore(state => state.filter);
+
   const inputListFilter = useSharedValue(filter);
 
   const accentColor = useMemo(() => {

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

@@ -146,11 +146,11 @@ export function SyncGasStateToSharedValues() {
 
   const gasSettings = useSelectedGas(chainId);
 
-  const { userNativeNetworkAsset, isLoadingNativeNetworkAsset } = useUserAssetsStore(state => {
-    const { address: nativeCurrencyAddress } = useBackendNetworksStore.getState().getChainsNativeAsset()[chainId];
-    const uniqueId = getUniqueId(nativeCurrencyAddress, chainId);
-    return { userNativeNetworkAsset: state.getLegacyUserAsset(uniqueId), isLoadingNativeNetworkAsset: state.isLoadingUserAssets };
-  });
+  const { address: nativeCurrencyAddress } = useBackendNetworksStore.getState().getChainsNativeAsset()[chainId];
+
+  const isLoadingNativeNetworkAsset = useUserAssetsStore(state => state.isLoadingUserAssets);
+  const userNativeNetworkAsset = useUserAssetsStore(state => state.getLegacyUserAsset(getUniqueId(nativeCurrencyAddress, chainId)));
+
   const { data: estimatedGasLimit } = useSwapEstimatedGasLimit({ chainId, assetToSell, quote });
 
   const gasFeeRange = useSharedValue<[string, string] | null>(null);