Merge branch 'dev' into 94-event-tracking-add-mixpanel-event-tracking

src/background/controller/wallet.ts

@@ -47,7 +47,7 @@ import { INTERNAL_REQUEST_ORIGIN, EVENTS, KEYRING_TYPE } from 'consts';
 
 import { fclTestnetConfig, fclMainnetConfig } from '../fclConfig';
 import placeholder from '../images/placeholder.png';
-import type { CoinItem } from '../service/coinList';
+import { type CoinItem } from '../service/coinList';
 import DisplayKeyring from '../service/keyring/display';
 import type { NFTData, NFTModel, StorageInfo, WalletResponse } from '../service/networkModel';
 import type { ConnectedSite } from '../service/permission';
@@ -4017,10 +4017,12 @@ export class WalletController extends BaseController {
   // Check the storage status
   checkStorageStatus = async ({
     transferAmount,
+    coin,
     movingBetweenEVMAndFlow,
   }: {
-    transferAmount?: number;
-    movingBetweenEVMAndFlow?: boolean;
+    transferAmount?: number; // amount in coins
+    coin?: string; // coin name
+    movingBetweenEVMAndFlow?: boolean; // are we moving between EVM and Flow?
   } = {}): Promise<{
     isStorageSufficient: boolean;
     isStorageSufficientAfterAction: boolean;
@@ -4031,6 +4033,7 @@ export class WalletController extends BaseController {
       await this.storageEvaluator.evaluateStorage(
         address!,
         transferAmount,
+        coin,
         movingBetweenEVMAndFlow
       );
     return {

src/background/service/storage-evaluator.ts

@@ -17,6 +17,7 @@ export class StorageEvaluator {
   async evaluateStorage(
     address: string,
     sendAmount?: number,
+    coin?: string,
     movingBetweenEVMAndFlow?: boolean
   ): Promise<EvaluateStorageResult> {
     // Get storage info from openapi service
@@ -32,7 +33,7 @@ export class StorageEvaluator {
       if (sendAmount !== undefined) {
         // This is the amount of flow that will be used by the transaction
         const flowUsed =
-          sendAmount +
+          (coin === 'flow' ? sendAmount : 0) +
           (movingBetweenEVMAndFlow ? StorageEvaluator.FIXED_MOVE_FEE : 0) +
           StorageEvaluator.AVERAGE_TX_FEE;
 

src/ui/utils/useStorageCheck.ts

@@ -12,12 +12,14 @@ interface StorageCheckResult {
 }
 
 interface UseStorageCheckProps {
-  transferAmount?: number | undefined;
+  transferAmount?: number;
+  coin?: string;
   movingBetweenEVMAndFlow?: boolean;
 }
 export const useStorageCheck = ({
-  transferAmount,
-  movingBetweenEVMAndFlow,
+  transferAmount, // amount in coins
+  coin, // coin name
+  movingBetweenEVMAndFlow = false, // are we moving between EVM and Flow?
 }: UseStorageCheckProps = {}): StorageCheckResult => {
   const wallet = useWallet();
 
@@ -26,6 +28,7 @@ export const useStorageCheck = ({
     undefined
   );
   const [storageInfo, setStorageInfo] = useState<StorageInfo | undefined>(undefined);
+
   // Check general storage status
   const checkStorageStatus = useCallback(async (): Promise<{
     sufficient: boolean;
@@ -35,7 +38,8 @@ export const useStorageCheck = ({
     try {
       const { isStorageSufficient, isStorageSufficientAfterAction, storageInfo } =
         await wallet.checkStorageStatus({
-          transferAmount,
+          transferAmount: transferAmount,
+          coin,
           movingBetweenEVMAndFlow,
         });
 
@@ -52,7 +56,7 @@ export const useStorageCheck = ({
         storageInfo: { available: 0, used: 0, capacity: 0 },
       }; // Default to true to not block transactions on error
     }
-  }, [movingBetweenEVMAndFlow, transferAmount, wallet]);
+  }, [movingBetweenEVMAndFlow, transferAmount, wallet, coin]);
 
   // Initial storage check
   useEffect(() => {

src/ui/views/EvmMove/MoveFromChild/index.tsx

@@ -94,6 +94,7 @@ const MoveFromChild = (props: TransferConfirmationProps) => {
   const [minAmount, setMinAmount] = useState<any>(0.001);
   const { sufficient: isSufficient, sufficientAfterAction } = useStorageCheck({
     transferAmount: Number(amount) || 0,
+    coin: currentCoin,
     movingBetweenEVMAndFlow: true,
   });
 

src/ui/views/EvmMove/MoveFromEvm/index.tsx

@@ -79,6 +79,7 @@ const MoveFromEvm = (props: TransferConfirmationProps) => {
 
   const { sufficient: isSufficient, sufficientAfterAction } = useStorageCheck({
     transferAmount: Number(amount) || 0,
+    coin: currentCoin,
     movingBetweenEVMAndFlow: true,
   });
 

src/ui/views/EvmMove/MoveFromFlow/index.tsx

@@ -95,6 +95,7 @@ const MoveFromFlow = (props: TransferConfirmationProps) => {
 
   const { sufficient: isSufficient, sufficientAfterAction } = useStorageCheck({
     transferAmount: Number(amount) || 0,
+    coin: currentCoin,
     movingBetweenEVMAndFlow: true,
   });
 

src/ui/views/EvmMove/MoveFromParent/index.tsx

@@ -94,6 +94,7 @@ const MoveFromParent = (props: TransferConfirmationProps) => {
   const [minAmount, setMinAmount] = useState<any>(0.001);
   const { sufficient: isSufficient, sufficientAfterAction } = useStorageCheck({
     transferAmount: Number(amount) || 0,
+    coin: currentCoin,
     movingBetweenEVMAndFlow: true,
   });
 

src/ui/views/NFT/SendNFT/MovefromParent.tsx

@@ -36,6 +36,7 @@ const MovefromParent = (props: SendNFTConfirmationProps) => {
   const [selectedAccount, setSelectedChildAccount] = useState(null);
   const { sufficient: isSufficient, sufficientAfterAction } = useStorageCheck({
     transferAmount: 0,
+    coin: 'flow',
     movingBetweenEVMAndFlow: selectedAccount
       ? isValidEthereumAddress(selectedAccount!['address'])
       : false,

src/ui/views/Send/SendEth/EvmConfirmation.tsx

@@ -38,6 +38,7 @@ const ToEthConfirmation = (props: ToEthConfirmationProps) => {
   const movingBetweenEVMAndFlow = true;
   const { sufficient: isSufficient, sufficientAfterAction } = useStorageCheck({
     transferAmount,
+    coin: props.data?.coinInfo?.coin,
     movingBetweenEVMAndFlow,
   });
 

src/ui/views/Send/SendEth/ToEthConfirmation.tsx

@@ -33,6 +33,7 @@ const ToEthConfirmation = (props: ToEthConfirmationProps) => {
   const [count, setCount] = useState(0);
   const { sufficient: isSufficient, sufficientAfterAction } = useStorageCheck({
     transferAmount: 0,
+    coin: props.data?.coinInfo?.coin,
     movingBetweenEVMAndFlow: true,
   });
 

src/ui/views/Send/TransferConfirmation.tsx

@@ -38,6 +38,7 @@ const TransferConfirmation = (props: TransferConfirmationProps) => {
   const { sufficient: isSufficient, sufficientAfterAction: isSufficientAfterAction } =
     useStorageCheck({
       transferAmount,
+      coin: props.data?.coinInfo?.coin,
       movingBetweenEVMAndFlow,
     });