Merge branch 'main' into @szymon/nativeCryptoLib

Author: gugell

packages/core-mobile/.gitignore

@@ -97,3 +97,7 @@ expo-env.d.ts
 
 # Branch
 /ios/config.xcconfig
+
+# generated api clients
+app/utils/network/generated/glacierApi.client.ts
+app/utils/network/generated/tokenAggregatorApi.client.ts

packages/core-mobile/app/consts/reactQueryKeys.ts

@@ -14,8 +14,8 @@ export enum ReactQueryKeys {
 
   NETWORKS = 'networks',
   NETWORK_CONTRACT_TOKENS = 'networkContractTokens',
-  WATCHLIST_TOKENS_AND_CHARTS = 'watchlistTokensAndCharts',
-  WATCHLIST_TRENDING_TOKENS_AND_CHARTS = 'watchlistTrendingTokensAndCharts',
+  WATCHLIST_TOP_TOKENS = 'watchlistTopTokens',
+  WATCHLIST_TRENDING_TOKENS = 'watchlistTrendingTokens',
   WATCHLIST_PRICES = 'watchlistPrices',
   WATCHLIST_TOKEN_SEARCH = 'watchlistTokenSearch',
   LAST_TRANSACTED_ERC20_NETWORKS = 'lastTransactedErc20Networks',

packages/core-mobile/app/hooks/watchlist/useGetTrendingTokens.ts

@@ -18,10 +18,7 @@ export const useGetTrendingTokens = <TData = TrendingToken[]>(
 
   return useQuery({
     enabled: isFocused,
-    queryKey: [
-      ReactQueryKeys.WATCHLIST_TRENDING_TOKENS_AND_CHARTS,
-      exchangeRate
-    ],
+    queryKey: [ReactQueryKeys.WATCHLIST_TRENDING_TOKENS, exchangeRate],
     queryFn: async () => {
       const tokens = await runAfterInteractions(async () => {
         return WatchlistService.getTrendingTokens(exchangeRate)

packages/core-mobile/app/hooks/watchlist/useGetTokensAndCharts.ts renamed to packages/core-mobile/app/hooks/watchlist/useTopTokens.ts

@@ -7,21 +7,18 @@ import { selectSelectedCurrency } from 'store/settings/currency'
 import { TokensAndCharts } from 'store/watchlist'
 import { runAfterInteractions } from 'utils/runAfterInteractions'
 
-export const useGetTokensAndCharts = (): UseQueryResult<
-  TokensAndCharts,
-  Error
-> => {
+export const useTopTokens = (): UseQueryResult<TokensAndCharts, Error> => {
   const currency = useSelector(selectSelectedCurrency)
   const isFocused = useIsFocused()
 
   return useQuery({
     enabled: isFocused,
-    queryKey: [ReactQueryKeys.WATCHLIST_TOKENS_AND_CHARTS, currency],
+    queryKey: [ReactQueryKeys.WATCHLIST_TOP_TOKENS, currency],
     queryFn: () => {
       return runAfterInteractions(async () => {
-        return WatchlistService.getTokens(currency)
+        return WatchlistService.getTopTokens(currency)
       })
     },
-    refetchInterval: 60000 // 1 minute
+    refetchInterval: 120000 // 2 minutes
   })
 }

packages/core-mobile/app/hooks/watchlist/useWatchlist.ts

@@ -16,7 +16,7 @@ import { LocalTokenWithBalance } from 'store/balance/types'
 import { getCaip2ChainIdForToken } from 'utils/caip2ChainIds'
 import { isNetworkContractToken } from 'utils/isNetworkContractToken'
 import { useGetPrices } from './useGetPrices'
-import { useGetTokensAndCharts } from './useGetTokensAndCharts'
+import { useTopTokens } from './useTopTokens'
 import { useGetTrendingTokens } from './useGetTrendingTokens'
 
 type UseWatchListReturnType = {
@@ -47,7 +47,7 @@ export const useWatchlist = (): UseWatchListReturnType => {
     isLoading: isLoadingTopTokens,
     refetch: refetchTopTokens,
     isRefetching: isRefetchingTopTokens
-  } = useGetTokensAndCharts()
+  } = useTopTokens()
   const {
     data: trendingTokensResponse,
     isLoading: isLoadingTrendingTokens,

packages/core-mobile/app/hooks/watchlist/useWatchlistListener.ts

@@ -17,7 +17,7 @@ export const useWatchlistListener = (): void => {
         effect: async () => {
           await queryClient.invalidateQueries({
             queryKey: [
-              ReactQueryKeys.WATCHLIST_TOKENS_AND_CHARTS,
+              ReactQueryKeys.WATCHLIST_TOP_TOKENS,
               ReactQueryKeys.WATCHLIST_PRICES
             ]
           })

packages/core-mobile/app/new/common/components/SimpleTextInput.tsx

@@ -15,7 +15,7 @@ export const SimpleTextInput = ({
   maxLength,
   autoFocus,
   secureTextEntry,
-  testID = 'text_input'
+  testID = 'input_text'
 }: {
   value: string
   onChangeText: (name: string) => void

packages/core-mobile/app/new/common/components/WalletCard.tsx

@@ -95,32 +95,34 @@ const WalletCard = ({
         </View>
 
         {showMoreButton && (
-          <DropdownMenu
-            groups={[
-              {
-                key: 'wallet-actions',
-                items: getDropdownItems(wallet)
-              }
-            ]}
-            onPressAction={(event: { nativeEvent: { event: string } }) =>
-              handleDropdownSelect(event.nativeEvent.event, wallet)
-            }>
-            <TouchableOpacity
-              hitSlop={8}
-              style={{
-                minHeight: 48,
-                paddingRight: 24,
-                paddingLeft: 12,
-                justifyContent: 'center',
-                alignItems: 'center'
-              }}>
-              <Icons.Navigation.MoreHoriz
-                color={colors.$textSecondary}
-                width={20}
-                height={20}
-              />
-            </TouchableOpacity>
-          </DropdownMenu>
+          <View accessible={true} testID={`more_icon__${wallet.name}`}>
+            <DropdownMenu
+              groups={[
+                {
+                  key: 'wallet-actions',
+                  items: getDropdownItems(wallet)
+                }
+              ]}
+              onPressAction={(event: { nativeEvent: { event: string } }) =>
+                handleDropdownSelect(event.nativeEvent.event, wallet)
+              }>
+              <TouchableOpacity
+                hitSlop={8}
+                style={{
+                  minHeight: 48,
+                  paddingRight: 24,
+                  paddingLeft: 12,
+                  justifyContent: 'center',
+                  alignItems: 'center'
+                }}>
+                <Icons.Navigation.MoreHoriz
+                  color={colors.$textSecondary}
+                  width={20}
+                  height={20}
+                />
+              </TouchableOpacity>
+            </DropdownMenu>
+          </View>
         )}
       </TouchableOpacity>
 

packages/core-mobile/app/new/features/ledger/consts.ts

@@ -31,6 +31,9 @@ export const SOLANA_DERIVATION_PATH = "44'/501'/0'/0'/0"
 // Solana derivation path prefix for generating indexed paths
 export const SOLANA_DERIVATION_PATH_PREFIX = "44'/501'/0'/0'"
 
+// Deprecated Avalanche public key path prefix
+export const DEPRECATED_AVALANCHE_DERIVATION_PATH_PREFIX = "m/44'/9000'/0'"
+
 /**
  * Generate a Solana derivation path for a specific account index
  * @param accountIndex - The account index to generate the path for

packages/core-mobile/app/new/features/track/market/components/MarketScreen.tsx

@@ -28,7 +28,6 @@ const MarketScreen = ({
     isLoadingTopTokens,
     refetchTopTokens
   } = useWatchlist()
-
   const { data, sort, view } = useTrackSortAndView(topTokens, prices)
   const listType = view.selected as MarketView