fix multichain fee calc (#4442)

rainbow-me · Dec 1, 2022 · ade88d7 · ade88d7
1 parent 81ef902
commit ade88d7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/src/components/expanded-state/swap-details/SwapDetailsContent.js b/src/components/expanded-state/swap-details/SwapDetailsContent.js
@@ -52,6 +52,9 @@ export default function SwapDetailsContent({
  const inputCurrencyNetwork = ethereumUtils.getNetworkFromType(
  inputCurrency?.type
  );
+ const outputCurrencyNetwork = ethereumUtils.getNetworkFromType(
+ outputCurrency?.type
+ );
 
  return (
  <AccentColorProvider color={colorForAsset}>
@@ -87,7 +90,7 @@ export default function SwapDetailsContent({
  )}
  {tradeDetails.feePercentageBasisPoints !== 0 && (
  <SwapDetailsFeeRow
- network={inputCurrencyNetwork}
+ network={outputCurrencyNetwork}
  testID="swaps-details-fee-row"
  tradeDetails={tradeDetails}
  />

diff --git a/src/components/expanded-state/swap-details/SwapDetailsFeeRow.js b/src/components/expanded-state/swap-details/SwapDetailsFeeRow.js
@@ -11,11 +11,7 @@ import { useAccountSettings, useStepper } from '@/hooks';
 import { useNavigation } from '@/navigation';
 import Routes from '@/navigation/routesNames';
 
-export default function SwapDetailsUniswapRow({
- tradeDetails,
- network,
- testID,
-}) {
+export default function SwapDetailsFeeRow({ tradeDetails, network, testID }) {
  const { navigate } = useNavigation();
  const { nativeCurrency } = useAccountSettings();
  const { rainbowFeeNative, rainbowFeePercentage } = useRainbowFee({

diff --git a/src/hooks/useRainbowFee.js b/src/hooks/useRainbowFee.js
@@ -10,7 +10,7 @@ import { useAccountSettings, useSwapCurrencies } from '@/hooks';
 import { ethereumUtils } from '@/utils';
 
 export default function useRainbowFee({ tradeDetails, network }) {
- const { inputCurrency } = useSwapCurrencies();
+ const { inputCurrency, outputCurrency } = useSwapCurrencies();
  const { accountAddress } = useAccountSettings();
  const [nativeAsset, setNativeAsset] = useState(null);
 
@@ -35,7 +35,7 @@ export default function useRainbowFee({ tradeDetails, network }) {
 
  const feeInOutputToken = convertRawAmountToDecimalFormat(
  feeInOutputTokensRawAmount,
- 18
+ outputCurrency?.decimals || 18
  );
 
  return (
@@ -59,7 +59,17 @@ export default function useRainbowFee({ tradeDetails, network }) {
  }
  }
  return null;
- }, [inputCurrency, tradeDetails, nativeAsset]);
+ }, [
+ nativeAsset,
+ inputCurrency.price,
+ inputCurrency.decimals,
+ tradeDetails.sellAmount,
+ tradeDetails.buyTokenAddress,
+ tradeDetails.buyAmount,
+ tradeDetails.feePercentageBasisPoints,
+ tradeDetails.sellAmountMinusFees,
+ outputCurrency?.decimals,
+ ]);
 
  useEffect(() => {
  const getNativeAsset = async () => {