chore: avoid re-asignement

sygmaprotocol · Jun 3, 2024 · 2aa84c3 · 2aa84c3
1 parent d041495
commit 2aa84c3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/packages/widget/src/controllers/transfers/evm/build.ts b/packages/widget/src/controllers/transfers/evm/build.ts
@@ -11,7 +11,6 @@ import type {
 import { Web3Provider } from '@ethersproject/providers';
 import type { UnsignedTransaction, BigNumber } from 'ethers';
 import { constants, utils } from 'ethers';
-import type { SubstrateFee } from '@buildwithsygma/sygma-sdk-core/substrate';
 import type { Eip1193Provider } from '../../../interfaces';
 
 /**
@@ -27,7 +26,6 @@ export async function buildEvmFungibleTransactions({
   provider,
   providerChainId,
   env,
-  fee,
   pendingEvmApprovalTransactions,
   pendingTransferTransaction
 }: {
@@ -39,7 +37,6 @@ export async function buildEvmFungibleTransactions({
   provider: Eip1193Provider;
   providerChainId: number;
   env: Environment;
-  fee: EvmFee | SubstrateFee | null;
   pendingEvmApprovalTransactions: UnsignedTransaction[];
   pendingTransferTransaction: UnsignedTransaction;
   sourceNetwork: Domain | null;
@@ -94,21 +91,21 @@ export async function buildEvmFungibleTransactions({
     resourceId,
     resourceAmount.toString()
   );
-  fee = await evmTransfer.getFee(transfer);
+  const transferFee = await evmTransfer.getFee(transfer);
 
   pendingEvmApprovalTransactions = await evmTransfer.buildApprovals(
     transfer,
-    fee
+    transferFee
   );
 
   pendingTransferTransaction = await evmTransfer.buildTransferTransaction(
     transfer,
-    fee
+    transferFee
   );
   return {
     pendingEvmApprovalTransactions,
     pendingTransferTransaction,
-    fee,
+    fee: transferFee,
     resourceAmount
   };
 }
diff --git a/packages/widget/src/controllers/transfers/fungible-token-transfer.ts b/packages/widget/src/controllers/transfers/fungible-token-transfer.ts
@@ -559,7 +559,6 @@ export class FungibleTokenTransferController implements ReactiveController {
               provider: provider!,
               providerChainId: providerChainId!,
               env: this.env,
-              fee: this.fee,
               pendingEvmApprovalTransactions:
                 this.pendingEvmApprovalTransactions,
               pendingTransferTransaction: this
@@ -614,7 +613,6 @@ export class FungibleTokenTransferController implements ReactiveController {
                 destinationAddress: this.destinationAddress!,
                 resourceId: this.selectedResource!.resourceId,
                 resourceAmount: this.resourceAmount,
-                fee: this.fee as SubstrateFee,
                 pendingTransferTransaction: this
                   .pendingTransferTransaction as SubstrateTransaction
               });

diff --git a/packages/widget/src/controllers/transfers/substrate/build.ts b/packages/widget/src/controllers/transfers/substrate/build.ts
@@ -13,7 +13,6 @@ export async function buildSubstrateFungibleTransactions({
   destinationAddress,
   resourceId,
   resourceAmount,
-  fee,
   pendingTransferTransaction
 }: {
   address: string;
@@ -23,7 +22,6 @@ export async function buildSubstrateFungibleTransactions({
   destinationAddress: string;
   resourceId: string;
   resourceAmount: BigNumber;
-  fee: SubstrateFee;
   pendingTransferTransaction: SubstrateTransaction;
 }): Promise<{
   pendingTransferTransaction: SubstrateTransaction;
@@ -41,20 +39,20 @@ export async function buildSubstrateFungibleTransactions({
     String(resourceAmount)
   );
 
-  fee = await substrateTransfer.getFee(transfer);
+  const transferFee = await substrateTransfer.getFee(transfer);
 
   if (resourceAmount.toString() === transfer.details.amount.toString()) {
-    resourceAmount = resourceAmount.sub(fee.fee.toString());
+    resourceAmount = resourceAmount.sub(transferFee.fee.toString());
   }
 
   pendingTransferTransaction = substrateTransfer.buildTransferTransaction(
     transfer,
-    fee
+    transferFee
   );
 
   return {
     pendingTransferTransaction,
     resourceAmount,
-    fee
+    fee: transferFee
   };
 }