fix: transfer shows 0 network fee (#2855)

novasamatech · Dec 12, 2024 · c1caded · c1caded
1 parent 32f9d56
commit c1caded
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 239 deletions.
diff --git a/src/renderer/entities/transaction/ui/Fee/Fee.tsx b/src/renderer/entities/transaction/ui/Fee/Fee.tsx
@@ -13,7 +13,7 @@ type Props = {
   api: ApiPromise | null;
   multiply?: number;
   asset: Asset;
-  transaction?: Transaction;
+  transaction?: Transaction | null;
   className?: string;
   onFeeChange?: (fee: string) => void;
   onFeeLoading?: (loading: boolean) => void;

diff --git a/src/renderer/entities/transaction/ui/XcmFee/XcmFee.tsx b/src/renderer/entities/transaction/ui/XcmFee/XcmFee.tsx
@@ -15,7 +15,7 @@ type Props = {
   multiply?: number;
   asset: Asset;
   config: XcmConfig;
-  transaction?: Transaction | DecodedTransaction;
+  transaction?: Transaction | DecodedTransaction | null;
   className?: string;
   onFeeChange?: (fee: string) => void;
   onFeeLoading?: (loading: boolean) => void;

diff --git a/src/renderer/features/governance/lib/createFeeCalculator.ts b/src/renderer/features/governance/lib/createFeeCalculator.ts
diff --git a/src/renderer/features/governance/lib/createMultipleTxStore.ts b/src/renderer/features/governance/lib/createMultipleTxStore.ts
@@ -3,11 +3,10 @@ import { type Store, combine, createStore } from 'effector';
 
 import { type Account, type Chain, type Transaction, type Wallet } from '@/shared/core';
 import { nullable } from '@/shared/lib/utils';
+import { createFeeCalculator } from '@/shared/transactions';
 import { transactionService } from '@/entities/transaction';
 import { accountUtils, walletUtils } from '@/entities/wallet';
 
-import { createFeeCalculator } from './createFeeCalculator';
-
 type Params = {
   $api: Store<ApiPromise | null>;
   $chain: Store<Chain | null>;

diff --git a/src/renderer/features/governance/lib/createTransactionForm.ts b/src/renderer/features/governance/lib/createTransactionForm.ts
@@ -14,12 +14,11 @@ import {
   type Wallet,
 } from '@/shared/core';
 import { nullable, toAddress, transferableAmountBN } from '@/shared/lib/utils';
+import { createTxStore } from '@/shared/transactions';
 import { balanceUtils } from '@/entities/balance';
 import { transactionService } from '@/entities/transaction';
 import { accountUtils, walletModel, walletUtils } from '@/entities/wallet';
 
-import { createTxStore } from './createTxStore';
-
 export type BasicFormParams = {
   account: Account | null;
   signatory: Account | null;

diff --git a/src/renderer/features/governance/lib/createTxStore.ts b/src/renderer/features/governance/lib/createTxStore.ts
diff --git a/src/renderer/shared/transactions/createTxStore.ts b/src/renderer/shared/transactions/createTxStore.ts
@@ -12,7 +12,7 @@ type Params = {
   $api: Store<ApiPromise | null>;
   $chain: Store<Chain | null>;
   $coreTx: Store<Transaction | null>;
-  $activeWallet: Store<Wallet | null>;
+  $activeWallet: Store<Wallet | null | undefined>;
   $wallets: Store<Wallet[]>;
   $account: Store<Account | null>;
   $signatory?: Store<Account | null>;