Merge branch 'develop' into feat/dapp-cip-30

Emurgo · May 20, 2024 · a527a20 · a527a20
2 parents 74b6641 + fb225e2
commit a527a20
Show file tree

Hide file tree

Showing 14 changed files with 275 additions and 169 deletions.
diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
@@ -131,7 +131,7 @@
     "@yoroi/resolver": "2.0.5",
     "@yoroi/setup-wallet": "1.0.0",
     "@yoroi/staking": "1.5.1",
-    "@yoroi/swap": "1.5.3",
+    "@yoroi/swap": "1.6.0",
     "@yoroi/theme": "^1.0.0",
     "@yoroi/transfer": "1.0.0",
     "add": "2.0.6",

diff --git a/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx b/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx
@@ -61,7 +61,6 @@ import {
 } from '../navigation'
 import {COLORS} from '../theme'
 import {useFrontendFees, useStakingKey, useWalletName} from '../yoroi-wallets/hooks'
-import {isMainnetNetworkId} from '../yoroi-wallets/utils'
 import {ModalInfo} from './ModalInfo'
 import {TxDetails} from './TxDetails'
 import {TxHistory} from './TxHistory'
@@ -85,17 +84,17 @@ export const TxHistoryNavigator = () => {
   const {frontendFees} = useFrontendFees(wallet)
   const stakingKey = useStakingKey(wallet)
   const swapManager = React.useMemo(() => {
-    const aggregatorTokenId = isMainnetNetworkId(wallet.networkId) ? milkTokenId.mainnet : milkTokenId.preprod
+    const aggregatorTokenId = wallet.isMainnet ? milkTokenId.mainnet : milkTokenId.preprod
     const swapStorage = swapStorageMaker()
     const swapApi = swapApiMaker({
-      isMainnet: isMainnetNetworkId(wallet.networkId),
+      isMainnet: wallet.isMainnet,
       stakingKey,
       primaryTokenId: wallet.primaryTokenInfo.id,
       supportedProviders,
     })
     const frontendFeeTiers = frontendFees?.[aggregator] ?? ([] as const)
     return swapManagerMaker({swapStorage, swapApi, frontendFeeTiers, aggregator, aggregatorTokenId})
-  }, [wallet.networkId, wallet.primaryTokenInfo.id, stakingKey, frontendFees])
+  }, [wallet.isMainnet, wallet.primaryTokenInfo.id, stakingKey, frontendFees])
 
   // resolver
   const resolverManager = React.useMemo(() => {
@@ -106,11 +105,12 @@ export const TxHistoryNavigator = () => {
         },
       },
       cslFactory: init,
+      isMainnet: wallet.isMainnet,
     })
     const walletStorage = storage.join(`wallet/${wallet.id}/`)
     const resolverStorage = resolverStorageMaker({storage: walletStorage})
     return resolverManagerMaker(resolverStorage, resolverApi)
-  }, [storage, wallet.id])
+  }, [storage, wallet.id, wallet.isMainnet])
 
   // claim
   const claimApi = React.useMemo(() => {