refactor: Tokens state (#2823)

Emurgo · Oct 25, 2023 · b0b5bde · b0b5bde
1 parent 55f7e5a
commit b0b5bde
Show file tree

Hide file tree

Showing 12 changed files with 817 additions and 146 deletions.
diff --git a/apps/wallet-mobile/src/features/Swap/SwapNavigator.tsx b/apps/wallet-mobile/src/features/Swap/SwapNavigator.tsx
@@ -21,9 +21,26 @@ export const SwapTabNavigator = () => {
 
   // state data
   const wallet = useSelectedWallet()
-  const {aggregatorTokenId, lpTokenHeldChanged, frontendFeeTiers, frontendFeeTiersChanged} = useSwap()
+  const {
+    aggregatorTokenId,
+    lpTokenHeldChanged,
+    frontendFeeTiers,
+    frontendFeeTiersChanged,
+    sellTokenInfoChanged,
+    primaryTokenInfoChanged,
+  } = useSwap()
   const lpTokenHeld = useBalance({wallet, tokenId: aggregatorTokenId})
 
+  // initialize sell with / and primary token
+  React.useEffect(() => {
+    const ptInfo = {
+      decimals: wallet.primaryTokenInfo.decimals ?? 0,
+      id: wallet.primaryTokenInfo.id,
+    }
+    sellTokenInfoChanged(ptInfo)
+    primaryTokenInfoChanged(ptInfo)
+  }, [primaryTokenInfoChanged, sellTokenInfoChanged, wallet.primaryTokenInfo.decimals, wallet.primaryTokenInfo.id])
+
   // update the fee tiers
   React.useEffect(() => {
     frontendFeeTiersChanged(frontendFeeTiers)

diff --git a/...n/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx b/...n/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
@@ -134,7 +134,7 @@ type SelectableTokenProps = {
 const SelectableToken = ({wallet, token, walletTokenIds}: SelectableTokenProps) => {
   const balanceAvailable = useBalance({wallet, tokenId: token.info.id})
   const {closeSearch} = useSearch()
-  const {buyTokenIdChanged, orderData} = useSwap()
+  const {buyTokenInfoChanged, orderData} = useSwap()
   const {
     sellQuantity: {isTouched: isSellTouched},
     buyTouched,
@@ -150,7 +150,10 @@ const SelectableToken = ({wallet, token, walletTokenIds}: SelectableTokenProps)
     track.swapAssetToChanged({
       to_asset: [{asset_name: token.info.name, asset_ticker: token.info.ticker, policy_id: token.info.group}],
     })
-    buyTokenIdChanged(token.info.id)
+    buyTokenInfoChanged({
+      decimals: token.info.decimals ?? 0,
+      id: token.info.id,
+    })
     buyTouched()
     navigateTo.startSwap()
     closeSearch()

diff --git a/...reateOrder/EditSellAmount/SelectSellTokenFromListScreen/SelectSellTokenFromListScreen.tsx b/...reateOrder/EditSellAmount/SelectSellTokenFromListScreen/SelectSellTokenFromListScreen.tsx
@@ -88,7 +88,7 @@ const TokenList = () => {
 type SelectableTokenProps = {disabled?: boolean; tokenInfo: Balance.TokenInfo; wallet: YoroiWallet}
 const SelectableToken = ({tokenInfo, wallet}: SelectableTokenProps) => {
   const {closeSearch} = useSearch()
-  const {sellTokenIdChanged, orderData} = useSwap()
+  const {sellTokenInfoChanged, orderData} = useSwap()
   const {
     buyQuantity: {isTouched: isBuyTouched},
     sellTouched,
@@ -104,7 +104,10 @@ const SelectableToken = ({tokenInfo, wallet}: SelectableTokenProps) => {
       from_asset: [{asset_name: tokenInfo.name, asset_ticker: tokenInfo.ticker, policy_id: tokenInfo.group}],
     })
     sellTouched()
-    sellTokenIdChanged(tokenInfo.id)
+    sellTokenInfoChanged({
+      id: tokenInfo.id,
+      decimals: tokenInfo.decimals ?? 0,
+    })
     navigateTo.startSwap()
     closeSearch()
   }

diff --git a/packages/swap/src/helpers/orders/costs/getFrontendFee.test.ts b/packages/swap/src/helpers/orders/costs/getFrontendFee.test.ts
@@ -21,8 +21,7 @@ describe('getFrontendFee', () => {
       // act
       const fee = getFrontendFee({
         lpTokenHeld: {tokenId: 'lp.token', quantity: '999999999999999999'},
-        sellInPrimaryTokenValue: sell,
-        primaryTokenId,
+        ptAmount: sell,
         feeTiers: milkHoldersDiscountTiers,
       })
       // assert
@@ -43,9 +42,8 @@ describe('getFrontendFee', () => {
       }
       // act
       const fee = getFrontendFee({
-        sellInPrimaryTokenValue: sellPrimaryAmountOver99,
+        ptAmount: sellPrimaryAmountOver99,
         lpTokenHeld: {tokenId: 'lp.token', quantity: Quantities.zero},
-        primaryTokenId,
         feeTiers: milkHoldersDiscountTiers,
       })
       // assert
@@ -67,8 +65,7 @@ describe('getFrontendFee', () => {
       // act
       const fee = getFrontendFee({
         lpTokenHeld: {tokenId: 'lp.token', quantity: '499'},
-        sellInPrimaryTokenValue: sellPrimaryAmountOver99,
-        primaryTokenId,
+        ptAmount: sellPrimaryAmountOver99,
         feeTiers: milkHoldersDiscountTiers,
       })
       // assert
@@ -90,8 +87,7 @@ describe('getFrontendFee', () => {
       // act
       const fee = getFrontendFee({
         lpTokenHeld: {tokenId: 'lp.token', quantity: '500'},
-        sellInPrimaryTokenValue: sellPrimaryAmountOver99,
-        primaryTokenId,
+        ptAmount: sellPrimaryAmountOver99,
         feeTiers: milkHoldersDiscountTiers,
       })
       // assert
@@ -114,9 +110,8 @@ describe('getFrontendFee', () => {
       }
       // act
       const fee = getFrontendFee({
-        sellInPrimaryTokenValue: buyPrimaryTokenAmount,
+        ptAmount: buyPrimaryTokenAmount,
         lpTokenHeld: {tokenId: 'lp.token', quantity: '999999999999999999'},
-        primaryTokenId,
         feeTiers: milkHoldersDiscountTiers,
       })
       // assert
@@ -137,9 +132,8 @@ describe('getFrontendFee', () => {
       }
       // act
       const fee = getFrontendFee({
-        sellInPrimaryTokenValue: buyPrimaryAmountOver99,
+        ptAmount: buyPrimaryAmountOver99,
         lpTokenHeld: {tokenId: 'lp.token', quantity: Quantities.zero},
-        primaryTokenId,
         feeTiers: milkHoldersDiscountTiers,
       })
       // assert
@@ -161,8 +155,7 @@ describe('getFrontendFee', () => {
       // act
       const fee = getFrontendFee({
         lpTokenHeld: {tokenId: 'lp.token', quantity: '499'},
-        sellInPrimaryTokenValue: buyPrimaryAmountOver99,
-        primaryTokenId,
+        ptAmount: buyPrimaryAmountOver99,
         feeTiers: milkHoldersDiscountTiers,
       })
       // assert
@@ -184,8 +177,7 @@ describe('getFrontendFee', () => {
       // act
       const fee = getFrontendFee({
         lpTokenHeld: {tokenId: 'lp.token', quantity: '500'},
-        sellInPrimaryTokenValue: buyPrimaryAmountOver99,
-        primaryTokenId,
+        ptAmount: buyPrimaryAmountOver99,
         feeTiers: milkHoldersDiscountTiers,
       })
       // assert
@@ -207,8 +199,7 @@ describe('getFrontendFee', () => {
     // act
     const fee = getFrontendFee({
       lpTokenHeld: {tokenId: 'lp.token', quantity: '999999999999999'},
-      sellInPrimaryTokenValue: buyPrimaryAmountOver99,
-      primaryTokenId,
+      ptAmount: buyPrimaryAmountOver99,
       feeTiers: [],
     })
     // assert
@@ -230,8 +221,7 @@ describe('getFrontendFee', () => {
     // act
     const fee = getFrontendFee({
       lpTokenHeld: {tokenId: 'lp.token', quantity: '999999999999999'},
-      sellInPrimaryTokenValue: buyPrimaryAmountOver99,
-      primaryTokenId,
+      ptAmount: buyPrimaryAmountOver99,
       feeTiers: [
         {
           fixedFee: asQuantity(3_000_000),
@@ -265,9 +255,8 @@ describe('getFrontendFee', () => {
       }
       // act
       const fee = getFrontendFee({
-        sellInPrimaryTokenValue: sellValueInPrimaryToken,
+        ptAmount: sellValueInPrimaryToken,
         lpTokenHeld: {tokenId: 'lp.token', quantity: '999999999999999999'},
-        primaryTokenId,
         feeTiers: milkHoldersDiscountTiers,
       })
       // assert
@@ -287,9 +276,8 @@ describe('getFrontendFee', () => {
       }
       // act
       const fee = getFrontendFee({
-        sellInPrimaryTokenValue: sellValueInPrimaryToken,
+        ptAmount: sellValueInPrimaryToken,
         lpTokenHeld: {tokenId: 'lp.token', quantity: Quantities.zero},
-        primaryTokenId,
         feeTiers: milkHoldersDiscountTiers,
       })
       // assert
@@ -311,8 +299,7 @@ describe('getFrontendFee', () => {
       // act
       const fee = getFrontendFee({
         lpTokenHeld: {tokenId: 'lp.token', quantity: '499'},
-        sellInPrimaryTokenValue: sellValueInPrimaryToken,
-        primaryTokenId,
+        ptAmount: sellValueInPrimaryToken,
         feeTiers: milkHoldersDiscountTiers,
       })
       // assert
@@ -334,8 +321,7 @@ describe('getFrontendFee', () => {
       // act
       const fee = getFrontendFee({
         lpTokenHeld: {tokenId: 'lp.token', quantity: '500'},
-        sellInPrimaryTokenValue: sellValueInPrimaryToken,
-        primaryTokenId,
+        ptAmount: sellValueInPrimaryToken,
         feeTiers: milkHoldersDiscountTiers,
       })
       // assert

diff --git a/packages/swap/src/helpers/orders/costs/getFrontendFee.ts b/packages/swap/src/helpers/orders/costs/getFrontendFee.ts
@@ -16,14 +16,12 @@ import {asQuantity} from '../../../utils/asQuantity'
  */
 export const getFrontendFee = ({
   lpTokenHeld,
-  primaryTokenId,
-  sellInPrimaryTokenValue,
+  ptAmount,
   feeTiers,
 }: {
-  primaryTokenId: Balance.TokenInfo['id']
   lpTokenHeld?: Balance.Amount
   feeTiers: ReadonlyArray<App.FrontendFeeTier>
-  sellInPrimaryTokenValue: Balance.Amount
+  ptAmount: Balance.Amount
 }): Readonly<{
   fee: Balance.Amount
   discountTier: App.FrontendFeeTier | undefined
@@ -36,21 +34,21 @@ export const getFrontendFee = ({
         tier.secondaryTokenBalanceThreshold,
       ) &&
       Quantities.isGreaterThanOrEqualTo(
-        sellInPrimaryTokenValue.quantity,
+        ptAmount.quantity,
         tier.primaryTokenValueThreshold,
       ),
   )
 
   // calculate the fee
   const fee = asQuantity(
-    new BigNumber(sellInPrimaryTokenValue.quantity)
+    new BigNumber(ptAmount.quantity)
       .times(discountTier?.variableFeeMultiplier ?? 0)
       .integerValue(BigNumber.ROUND_CEIL)
       .plus(discountTier?.fixedFee ?? 0),
   )
 
   return {
-    fee: {tokenId: primaryTokenId, quantity: fee},
+    fee: {tokenId: ptAmount.tokenId, quantity: fee},
     discountTier,
   } as const
 }