4x outbound fee and toFixed(0)

shapeshift · Nov 22, 2024 · 31bda9c · 31bda9c
1 parent 966ef7b
commit 31bda9c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/...viders/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Confirm.tsx b/...viders/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Confirm.tsx
@@ -424,17 +424,8 @@ export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
   }, [onNext])
 
   const missingBalanceForGasCryptoPrecision = useMemo(() => {
-    if (isTokenWithdraw) {
-      return fromBaseUnit(
-        bnOrZero(feeAssetBalanceCryptoBaseUnit)
-          .minus(bnOrZero(state?.withdraw.estimatedGasCryptoBaseUnit))
-          .minus(bnOrZero(dustAmountCryptoBaseUnit))
-          .times(-1),
-        feeAsset.precision,
-      )
-    }
     return fromBaseUnit(
-      bnOrZero(assetBalanceBaseUnit)
+      bnOrZero(isTokenWithdraw ? feeAssetBalanceCryptoBaseUnit : assetBalanceBaseUnit)
         .minus(bnOrZero(state?.withdraw.estimatedGasCryptoBaseUnit))
         .minus(bnOrZero(dustAmountCryptoBaseUnit))
         .times(-1),

diff --git a/...iders/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Withdraw.tsx b/...iders/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Withdraw.tsx
@@ -335,10 +335,10 @@ export const Withdraw: React.FC<WithdrawProps> = ({ accountId, fromAddress, onNe
     return toBaseUnit(outboundFeeInAssetCryptoPrecision, asset.precision)
   }, [outboundFeeCryptoBaseUnit, assetPriceInFeeAsset, asset, feeAsset])
 
+  // https://gitlab.com/thorchain/thornode/-/blob/develop/x/thorchain/querier_quotes.go#L467
   const safeOutboundFeeInAssetCryptoBaseUnit = useMemo(() => {
     if (!outboundFeeInAssetCryptoBaseUnit) return
-    // Add 5% as as a safety factor since the dust threshold fee is not necessarily going to cut it
-    return bnOrZero(outboundFeeInAssetCryptoBaseUnit).times(1.05).toFixed(0)
+    return bnOrZero(outboundFeeInAssetCryptoBaseUnit).times(4).toFixed(0)
   }, [outboundFeeInAssetCryptoBaseUnit])
 
   const _validateCryptoAmount = useCallback(

diff --git a/src/state/slices/opportunitiesSlice/resolvers/thorchainsavers/index.ts b/src/state/slices/opportunitiesSlice/resolvers/thorchainsavers/index.ts
@@ -356,7 +356,7 @@ export const thorchainSaversStakingOpportunitiesUserDataResolver = async ({
       ) // to actual asset precision base unit
 
       const rewardsAmountsCryptoBaseUnit: [string] = [
-        stakedAmountCryptoBaseUnitIncludeRewards.minus(stakedAmountCryptoBaseUnit).toFixed(),
+        stakedAmountCryptoBaseUnitIncludeRewards.minus(stakedAmountCryptoBaseUnit).toFixed(0),
       ]
 
       const dateUnlocked = await (async () => {
@@ -388,7 +388,7 @@ export const thorchainSaversStakingOpportunitiesUserDataResolver = async ({
       stakingOpportunitiesUserDataByUserStakingId[userStakingId] = {
         isLoaded: true,
         userStakingId,
-        stakedAmountCryptoBaseUnit: stakedAmountCryptoBaseUnit.toFixed(),
+        stakedAmountCryptoBaseUnit: stakedAmountCryptoBaseUnit.toFixed(0),
         rewardsCryptoBaseUnit: { amounts: rewardsAmountsCryptoBaseUnit, claimable: false },
         dateUnlocked,
       }