From d6843d23af8ddbd5460a5e797cfca7c25742a756 Mon Sep 17 00:00:00 2001
From: chaojun <chaojun@opensquare.network>
Date: Mon, 2 Feb 2026 17:49:57 +0800
Subject: [PATCH 1/2] fix: transferable amount displaying in popup

---
 .../foreignAssets/table/transferPopup/content.jsx            | 1 -
 .../assethubMigrationAssets/transferPopup/index.jsx          | 1 -
 .../actions/composeCallPopup/templates/batchTransfer.jsx     | 1 -
 .../actions/composeCallPopup/templates/transfer.jsx          | 1 -
 .../overview/accountInfo/hook/useAccountTransferPopup.jsx    | 1 -
 .../paraChainTeleportPopup/useNativeTransferAmount.js        | 1 -
 .../components/popup/fields/transferAmountField.js           | 5 ++---
 .../next-common/components/popup/fields/useTransferAmount.js | 4 +---
 8 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/packages/next-common/components/assethubMigrationAssets/foreignAssets/table/transferPopup/content.jsx b/packages/next-common/components/assethubMigrationAssets/foreignAssets/table/transferPopup/content.jsx
index c353542a5c..b03251024b 100644
--- a/packages/next-common/components/assethubMigrationAssets/foreignAssets/table/transferPopup/content.jsx
+++ b/packages/next-common/components/assethubMigrationAssets/foreignAssets/table/transferPopup/content.jsx
@@ -30,7 +30,6 @@ function PopupContent() {
     transferrable: asset.transferable,
     decimals: asset.decimals,
     symbol: asset.symbol,
-    transferFromAddress: address,
   });
 
   const { value: transferToAddress, component: transferToAddressField } =
diff --git a/packages/next-common/components/assethubMigrationAssets/transferPopup/index.jsx b/packages/next-common/components/assethubMigrationAssets/transferPopup/index.jsx
index e17156dbe3..b16954d72b 100644
--- a/packages/next-common/components/assethubMigrationAssets/transferPopup/index.jsx
+++ b/packages/next-common/components/assethubMigrationAssets/transferPopup/index.jsx
@@ -29,7 +29,6 @@ function PopupContent() {
     transferrable: asset.transferrable,
     decimals: asset.decimals,
     symbol: asset.symbol,
-    transferFromAddress: address,
   });
 
   const { value: transferToAddress, component: transferToAddressField } =
diff --git a/packages/next-common/components/multisigs/actions/composeCallPopup/templates/batchTransfer.jsx b/packages/next-common/components/multisigs/actions/composeCallPopup/templates/batchTransfer.jsx
index bc342cef26..8d28d81d84 100644
--- a/packages/next-common/components/multisigs/actions/composeCallPopup/templates/batchTransfer.jsx
+++ b/packages/next-common/components/multisigs/actions/composeCallPopup/templates/batchTransfer.jsx
@@ -165,7 +165,6 @@ function TransferField({ extensionAccounts = [], onTransferChange = noop }) {
       />
       <TransferAmount
         showBalance={false}
-        transferFromAddress={targetAddress}
         decimals={decimals}
         symbol={symbol}
         transferAmount={transferAmount}
diff --git a/packages/next-common/components/multisigs/actions/composeCallPopup/templates/transfer.jsx b/packages/next-common/components/multisigs/actions/composeCallPopup/templates/transfer.jsx
index d8c73c0f09..7b7fab3d09 100644
--- a/packages/next-common/components/multisigs/actions/composeCallPopup/templates/transfer.jsx
+++ b/packages/next-common/components/multisigs/actions/composeCallPopup/templates/transfer.jsx
@@ -50,7 +50,6 @@ function TransferContent() {
       />
       <TransferAmount
         showBalance={false}
-        transferFromAddress={targetAddress}
         transferAmount={transferAmount}
         setTransferAmount={setTransferAmount}
         decimals={decimals}
diff --git a/packages/next-common/components/overview/accountInfo/hook/useAccountTransferPopup.jsx b/packages/next-common/components/overview/accountInfo/hook/useAccountTransferPopup.jsx
index d13636a68a..9c89d39c24 100644
--- a/packages/next-common/components/overview/accountInfo/hook/useAccountTransferPopup.jsx
+++ b/packages/next-common/components/overview/accountInfo/hook/useAccountTransferPopup.jsx
@@ -98,7 +98,6 @@ function PopupContent() {
     decimals,
     symbol,
     isLoading: loading,
-    transferFromAddress: address,
   });
   const { value: transferToAddress, component: transferToAddressField } =
     useAddressComboField({ title: "To" });
diff --git a/packages/next-common/components/paraChainTeleportPopup/useNativeTransferAmount.js b/packages/next-common/components/paraChainTeleportPopup/useNativeTransferAmount.js
index 9615a24b69..aa87c007ff 100644
--- a/packages/next-common/components/paraChainTeleportPopup/useNativeTransferAmount.js
+++ b/packages/next-common/components/paraChainTeleportPopup/useNativeTransferAmount.js
@@ -21,7 +21,6 @@ export default function useNativeTransferAmount({ api, transferFromAddress }) {
       decimals={decimals}
       symbol={symbol}
       isLoading={isLoading}
-      transferFromAddress={transferFromAddress}
       transferAmount={transferAmount}
       setTransferAmount={setTransferAmount}
     />
diff --git a/packages/next-common/components/popup/fields/transferAmountField.js b/packages/next-common/components/popup/fields/transferAmountField.js
index 81b3c277e1..b4d875a54e 100644
--- a/packages/next-common/components/popup/fields/transferAmountField.js
+++ b/packages/next-common/components/popup/fields/transferAmountField.js
@@ -24,14 +24,13 @@ export default function TransferAmount({
   decimals,
   symbol,
   isLoading,
-  transferFromAddress,
   transferAmount,
   setTransferAmount,
   showBalance = true,
 }) {
-  const balanceStatus = !!transferFromAddress && showBalance && (
+  const balanceStatus = showBalance && (
     <TransferrableBalance
-      value={transferrable}
+      value={transferrable || 0}
       isLoading={isLoading}
       decimals={decimals}
     />
diff --git a/packages/next-common/components/popup/fields/useTransferAmount.js b/packages/next-common/components/popup/fields/useTransferAmount.js
index 7ff59e1e3c..06f7ebb526 100644
--- a/packages/next-common/components/popup/fields/useTransferAmount.js
+++ b/packages/next-common/components/popup/fields/useTransferAmount.js
@@ -6,8 +6,7 @@ import { checkTransferAmount } from "next-common/utils/checkTransferAmount";
  * @param {Omit<Parameters<typeof TransferAmount>[0], "transferAmount" | "setTransferAmount">} props
  */
 export function useTransferAmount(props = {}) {
-  const { transferrable, decimals, symbol, transferFromAddress, isLoading } =
-    props;
+  const { transferrable, decimals, symbol, isLoading } = props;
 
   const [transferAmount, setTransferAmount] = useState("");
 
@@ -17,7 +16,6 @@ export function useTransferAmount(props = {}) {
       decimals={decimals}
       symbol={symbol}
       isLoading={isLoading}
-      transferFromAddress={transferFromAddress}
       transferAmount={transferAmount}
       setTransferAmount={setTransferAmount}
     />

From b4c2cf127f7afbb3782ea458ee23b07625adf224 Mon Sep 17 00:00:00 2001
From: chaojun <chaojun@opensquare.network>
Date: Mon, 2 Feb 2026 18:06:35 +0800
Subject: [PATCH 2/2] Display -- for NaN transferable value

---
 .../components/popup/fields/transferAmountField.js            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/next-common/components/popup/fields/transferAmountField.js b/packages/next-common/components/popup/fields/transferAmountField.js
index b4d875a54e..8d356a92ef 100644
--- a/packages/next-common/components/popup/fields/transferAmountField.js
+++ b/packages/next-common/components/popup/fields/transferAmountField.js
@@ -12,6 +12,8 @@ export function TransferrableBalance({ value, isLoading, decimals }) {
       </span>
       {isLoading ? (
         <Loading size={12} />
+      ) : isNaN(value) ? (
+        <span className="text-textTertiary">--</span>
       ) : (
         <BalanceDisplay balance={formatBalance(value, decimals)} />
       )}
@@ -30,7 +32,7 @@ export default function TransferAmount({
 }) {
   const balanceStatus = showBalance && (
     <TransferrableBalance
-      value={transferrable || 0}
+      value={transferrable}
       isLoading={isLoading}
       decimals={decimals}
     />