Skip to content

Commit 22d14e7

Browse files
committed
fix: Multisig dao withdraw hasCkbBalance search wallet balance is wrong
1 parent 7f3bc48 commit 22d14e7

File tree

9 files changed

+11
-8
lines changed

9 files changed

+11
-8
lines changed

packages/neuron-ui/src/components/MultisigAddress/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,7 @@ const MultisigAddress = () => {
621621

622622
{!daoDisabledMessage && daoWithdrawAction.withdrawFromMultisig && daoWithdrawAction.isDialogOpen ? (
623623
<MultisigAddressNervosDAODialog
624+
balance={multisigBanlances[daoWithdrawAction.withdrawFromMultisig.fullPayload]}
624625
closeDialog={daoWithdrawAction.closeDialog}
625626
multisigConfig={daoWithdrawAction.withdrawFromMultisig}
626627
/>

packages/neuron-ui/src/components/MultisigAddressNervosDAODialog/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ import hooks from './hooks'
1515
import styles from './multisigAddressNervosDAODialog.module.scss'
1616

1717
const MultisigAddressNervosDAODialog = ({
18+
balance,
1819
multisigConfig,
1920
closeDialog,
2021
}: {
22+
balance: string
2123
multisigConfig: MultisigConfig
2224
closeDialog: () => void
2325
}) => {
@@ -170,7 +172,7 @@ const MultisigAddressNervosDAODialog = ({
170172
currentEpoch: epoch,
171173
genesisBlockTimestamp,
172174
connectionStatus,
173-
hasCkbBalance: +wallet.balance > 0,
175+
hasCkbBalance: +balance > 0,
174176
showDetailInExplorer: true,
175177
isMainnet,
176178
}

packages/neuron-ui/src/components/SUDTSend/hooks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export function useOptions({
9393
return [
9494
{
9595
label:
96-
addressLockType === AddressLockType.acp ? 'extra-ckb-send-to-acp.label' : 'extra-ckb-send-to-unknow.label',
96+
addressLockType === AddressLockType.acp ? 'extra-ckb-send-to-acp.label' : 'extra-ckb-send-to-unknown.label',
9797
key: addressLockType === AddressLockType.acp ? SendType.acpNewCell : SendType.unknowNewCell,
9898
params: { assetName: accountInfo?.accountName, extraCKB: shannonToCKBFormatter(holdSUDTCellCapacity) },
9999
},

packages/neuron-ui/src/locales/ar.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@
11031103
"extra-ckb-send-to-acp": {
11041104
"label": "إرسال {{extraCKB}} CKBytes إضافية لإنشاء حساب أصل للمستلم"
11051105
},
1106-
"extra-ckb-send-to-unknow": {
1106+
"extra-ckb-send-to-unknown": {
11071107
"label": "عنوان الاستلام يحتوي على نص قفل غير معروف، يرجى التأكد من أن المستلم يعرف كيفية التعامل معه، وسيتم إرسال {{extraCKB}} CKBytes إضافية مع {{assetName}} للاحتفاظ بالأصل"
11081108
},
11091109
"select-option": "يرجى تأكيد الخيار أعلاه قبل الإرسال"

packages/neuron-ui/src/locales/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@
11031103
"extra-ckb-send-to-acp": {
11041104
"label": "Send extra {{extraCKB}} CKBytes to create an asset account for receiver"
11051105
},
1106-
"extra-ckb-send-to-unknow": {
1106+
"extra-ckb-send-to-unknown": {
11071107
"label": "Receive address has an unknown lock script, please make sure receiver knowns how to handle it, and extra {{extraCKB}} CKBytes will be sent along with {{assetName}} to hold the asset"
11081108
},
11091109
"select-option": "Please confirm the above option before submitting"

packages/neuron-ui/src/locales/es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,7 @@
10861086
"extra-ckb-send-to-acp": {
10871087
"label": "Enviar {{extraCKB}} CKBytes adicionales para crear una cuenta de activo para el receptor"
10881088
},
1089-
"extra-ckb-send-to-unknow": {
1089+
"extra-ckb-send-to-unknown": {
10901090
"label": "La dirección de recepción tiene un script de bloqueo desconocido, asegúrese de que el receptor sepa cómo manejarlo, y se enviarán {{extraCKB}} CKBytes adicionales junto con {{assetName}} para mantener el activo"
10911091
},
10921092
"select-option": "Confirme la opción anterior antes de enviar"

packages/neuron-ui/src/locales/fr.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@
10931093
"extra-ckb-send-to-acp": {
10941094
"label": "Envoyer {{extraCKB}} CKBytes supplémentaires pour créer un compte d'actif pour le destinataire"
10951095
},
1096-
"extra-ckb-send-to-unknow": {
1096+
"extra-ckb-send-to-unknown": {
10971097
"label": "L'adresse du destinataire a un script de verrouillage inconnu, assurez-vous que le destinataire sait comment le gérer, et {{extraCKB}} CKBytes supplémentaires seront envoyés avec {{assetName}} pour détenir l'actif"
10981098
},
10991099
"select-option": "Veuillez confirmer l'option ci-dessus avant de soumettre"

packages/neuron-ui/src/locales/zh-tw.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@
10961096
"extra-ckb-send-to-acp": {
10971097
"label": "額外發送 {{extraCKB}} CKBytes 為收款方創建資產賬戶"
10981098
},
1099-
"extra-ckb-send-to-unknow": {
1099+
"extra-ckb-send-to-unknown": {
11001100
"label": "收款地址包含未知 Lock Script, 請確保接收者知道如何處理該資產, 額外 {{extraCKB}} CKBytes 將與 {{assetName}} 壹同發給收款方用於維持資產"
11011101
},
11021102
"select-option": "提交前請確認上述選項"

packages/neuron-ui/src/locales/zh.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@
10951095
"extra-ckb-send-to-acp": {
10961096
"label": "额外发送 {{extraCKB}} CKBytes 为收款方创建资产账户"
10971097
},
1098-
"extra-ckb-send-to-unknow": {
1098+
"extra-ckb-send-to-unknown": {
10991099
"label": "收款地址包含未知 Lock Script, 请确保接收者知道如何处理该资产, 额外 {{extraCKB}} CKBytes 将与 {{assetName}} 一同发给收款方用于维持资产"
11001100
},
11011101
"select-option": "提交前请确认上述选项"

0 commit comments

Comments
 (0)