Merge pull request #153 from novasamatech/fix/max_amount

Fix: Max amount
novasamatech · Jul 9, 2024 · 004be49 · 004be49
2 parents 43a5b85 + d09299c
commit 004be49
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/app/common/_temp_hooks/useAmountLogic.tsx b/app/common/_temp_hooks/useAmountLogic.tsx
@@ -8,10 +8,11 @@ import { useAssetHub } from '@/common/utils/hooks/useAssetHub.ts';
 
 type AmountLogicParams = {
  selectedAsset?: TransferAsset;
+ isGift: boolean;
 };
 
 // TODO: Use BN to operate with amount and fee
-export const useAmountLogic = ({ selectedAsset }: AmountLogicParams) => {
+export const useAmountLogic = ({ selectedAsset, isGift }: AmountLogicParams) => {
  const { getAssetHubFee } = useAssetHub();
  const { getTransactionFee } = useExtrinsic();
  const { getExistentialDeposit, getExistentialDepositStatemine } = useQueryService();
@@ -27,12 +28,7 @@ export const useAmountLogic = ({ selectedAsset }: AmountLogicParams) => {
 
  const getFeeAmount = (selectedAsset: TransferAsset, transferAmount: string): Promise<number> => {
  if (isStatemineAsset(selectedAsset.asset.type)) {
- return getAssetHubFee(
- selectedAsset.chainId,
- selectedAsset.asset.typeExtras!.assetId,
- transferAmount,
- selectedAsset.isGift,
- );
+ return getAssetHubFee(selectedAsset.chainId, selectedAsset.asset.typeExtras!.assetId, transferAmount, isGift);
  }
 
  return getTransactionFee(selectedAsset.chainId, TransactionType.TRANSFER, transferAmount);
@@ -74,15 +70,15 @@ export const useAmountLogic = ({ selectedAsset }: AmountLogicParams) => {
 
  useEffect(() => {
  setPending(true);
- getTransferDetails(selectedAsset as TransferAsset, fee?.toString() ?? '0')
+ getTransferDetails(selectedAsset as TransferAsset, amount || '0')
  .then(({ fee, formattedDeposit }) => {
  setFee(fee);
  setDeposit(formattedDeposit);
  })
  .finally(() => {
  setPending(false);
  });
- }, [fee]);
+ }, [amount]);
 
  useEffect(() => {
  if (!selectedAsset) return;

diff --git a/app/routes/transfer/direct/$chainId.$assetId/$address.amount.tsx b/app/routes/transfer/direct/$chainId.$assetId/$address.amount.tsx
@@ -44,7 +44,7 @@ const Page = () => {
  fee,
  maxAmountToSend,
  isAmountValid,
- } = useAmountLogic({ selectedAsset });
+ } = useAmountLogic({ selectedAsset, isGift: false });
 
  // Set amount from query params (/exchange/widget Mercurio page does this)
  useEffect(() => {

diff --git a/app/routes/transfer/gift/$chainId.$assetId/amount.tsx b/app/routes/transfer/gift/$chainId.$assetId/amount.tsx
@@ -36,7 +36,7 @@ const Page = () => {
  maxAmountToSend,
  isAmountValid,
  touched,
- } = useAmountLogic({ selectedAsset });
+ } = useAmountLogic({ selectedAsset, isGift: true });
 
  const handleMaxGiftSend = () => {
  handleMaxSend();