Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,7 @@ const MultisigAddress = () => {

{!daoDisabledMessage && daoWithdrawAction.withdrawFromMultisig && daoWithdrawAction.isDialogOpen ? (
<MultisigAddressNervosDAODialog
balance={multisigBanlances[daoWithdrawAction.withdrawFromMultisig.fullPayload]}
closeDialog={daoWithdrawAction.closeDialog}
multisigConfig={daoWithdrawAction.withdrawFromMultisig}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ import hooks from './hooks'
import styles from './multisigAddressNervosDAODialog.module.scss'

const MultisigAddressNervosDAODialog = ({
balance,
multisigConfig,
closeDialog,
}: {
balance: string
multisigConfig: MultisigConfig
closeDialog: () => void
}) => {
Expand Down Expand Up @@ -170,7 +172,7 @@ const MultisigAddressNervosDAODialog = ({
currentEpoch: epoch,
genesisBlockTimestamp,
connectionStatus,
hasCkbBalance: +wallet.balance > 0,
hasCkbBalance: +balance > 0,
showDetailInExplorer: true,
isMainnet,
}
Expand Down
12 changes: 6 additions & 6 deletions packages/neuron-ui/src/components/SUDTSend/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { SendType, UDTType } from 'utils/enums'
export enum AddressLockType {
secp256 = 'secp256',
acp = 'acp',
unknow = 'unknow',
unknown = 'unknown',
}

export function useAddressLockType(address: string, isMainnet: boolean) {
Expand All @@ -22,7 +22,7 @@ export function useAddressLockType(address: string, isMainnet: boolean) {
if (isAnyoneCanPayAddress(address, isMainnet)) {
return AddressLockType.acp
}
return AddressLockType.unknow
return AddressLockType.unknown
}, [address])
}

Expand Down Expand Up @@ -93,8 +93,8 @@ export function useOptions({
return [
{
label:
addressLockType === AddressLockType.acp ? 'extra-ckb-send-to-acp.label' : 'extra-ckb-send-to-unknow.label',
key: addressLockType === AddressLockType.acp ? SendType.acpNewCell : SendType.unknowNewCell,
addressLockType === AddressLockType.acp ? 'extra-ckb-send-to-acp.label' : 'extra-ckb-send-to-unknown.label',
key: addressLockType === AddressLockType.acp ? SendType.acpNewCell : SendType.unknownNewCell,
params: { assetName: accountInfo?.accountName, extraCKB: shannonToCKBFormatter(holdSUDTCellCapacity) },
},
]
Expand Down Expand Up @@ -123,7 +123,7 @@ export function useSendType({
case AddressLockType.acp:
setSendType(undefined)
break
case AddressLockType.unknow:
case AddressLockType.unknown:
setSendType(undefined)
break
default:
Expand Down Expand Up @@ -205,7 +205,7 @@ export function useOnSubmit({
break
case SendType.acpNewCell:
case SendType.secp256NewCell:
case SendType.unknowNewCell:
case SendType.unknownNewCell:
actionType = 'send-acp-sudt-to-new-cell'
break
default:
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-ui/src/locales/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@
"extra-ckb-send-to-acp": {
"label": "إرسال {{extraCKB}} CKBytes إضافية لإنشاء حساب أصل للمستلم"
},
"extra-ckb-send-to-unknow": {
"extra-ckb-send-to-unknown": {
"label": "عنوان الاستلام يحتوي على نص قفل غير معروف، يرجى التأكد من أن المستلم يعرف كيفية التعامل معه، وسيتم إرسال {{extraCKB}} CKBytes إضافية مع {{assetName}} للاحتفاظ بالأصل"
},
"select-option": "يرجى تأكيد الخيار أعلاه قبل الإرسال"
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-ui/src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@
"extra-ckb-send-to-acp": {
"label": "Send extra {{extraCKB}} CKBytes to create an asset account for receiver"
},
"extra-ckb-send-to-unknow": {
"extra-ckb-send-to-unknown": {
"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"
},
"select-option": "Please confirm the above option before submitting"
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-ui/src/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,7 @@
"extra-ckb-send-to-acp": {
"label": "Enviar {{extraCKB}} CKBytes adicionales para crear una cuenta de activo para el receptor"
},
"extra-ckb-send-to-unknow": {
"extra-ckb-send-to-unknown": {
"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"
},
"select-option": "Confirme la opción anterior antes de enviar"
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-ui/src/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1093,7 +1093,7 @@
"extra-ckb-send-to-acp": {
"label": "Envoyer {{extraCKB}} CKBytes supplémentaires pour créer un compte d'actif pour le destinataire"
},
"extra-ckb-send-to-unknow": {
"extra-ckb-send-to-unknown": {
"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"
},
"select-option": "Veuillez confirmer l'option ci-dessus avant de soumettre"
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-ui/src/locales/zh-tw.json
Original file line number Diff line number Diff line change
Expand Up @@ -1096,7 +1096,7 @@
"extra-ckb-send-to-acp": {
"label": "額外發送 {{extraCKB}} CKBytes 為收款方創建資產賬戶"
},
"extra-ckb-send-to-unknow": {
"extra-ckb-send-to-unknown": {
"label": "收款地址包含未知 Lock Script, 請確保接收者知道如何處理該資產, 額外 {{extraCKB}} CKBytes 將與 {{assetName}} 壹同發給收款方用於維持資產"
},
"select-option": "提交前請確認上述選項"
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-ui/src/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,7 @@
"extra-ckb-send-to-acp": {
"label": "额外发送 {{extraCKB}} CKBytes 为收款方创建资产账户"
},
"extra-ckb-send-to-unknow": {
"extra-ckb-send-to-unknown": {
"label": "收款地址包含未知 Lock Script, 请确保接收者知道如何处理该资产, 额外 {{extraCKB}} CKBytes 将与 {{assetName}} 一同发给收款方用于维持资产"
},
"select-option": "提交前请确认上述选项"
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-ui/src/types/App/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ declare namespace State {
secp256NewCell = 'secp256NewCell',
acpExistCell = 'acpExistCell',
acpNewCell = 'acpNewCell',
unknowNewCell = 'unknowNewCell',
unknownNewCell = 'unknownNewCell',
sendCKB = 'sendCKB',
}

Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-ui/src/utils/enums.ts
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ export enum SendType {
secp256NewCell = 'secp256NewCell',
acpExistCell = 'acpExistCell',
acpNewCell = 'acpNewCell',
unknowNewCell = 'unknowNewCell',
unknownNewCell = 'unknownNewCell',
sendCKB = 'sendCKB',
}

Expand Down
6 changes: 3 additions & 3 deletions packages/neuron-wallet/tests/services/anyone-can-pay.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ describe('anyone-can-pay-service', () => {
outPoint: targetLiveCell.outPoint(),
})
})
it('send to unknow address', async () => {
it('send to unknown address', async () => {
await expect(
//@ts-ignore private-method
AnyoneCanPayService.getCKBTargetOutput(
Expand Down Expand Up @@ -345,7 +345,7 @@ describe('anyone-can-pay-service', () => {
outPoint: targetLiveCell.outPoint(),
})
})
it('send to unknow address', async () => {
it('send to unknown address', async () => {
getOneByLockScriptAndTypeScriptMock.mockResolvedValue(undefined)
const args = `0x${'0'.repeat(40)}`
//@ts-ignore
Expand Down Expand Up @@ -396,7 +396,7 @@ describe('anyone-can-pay-service', () => {
)
expect(res).toBe(BigInt(MIN_SUDT_CAPACITY).toString())
})
it('unknow lock not exist', async () => {
it('unknown lock not exist', async () => {
getOneByLockScriptAndTypeScriptMock.mockResolvedValue(undefined)
const res = await AnyoneCanPayService.getHoldSUDTCellCapacity(
new AssetAccountInfo().generateChequeScript(assetAccount.blake160, assetAccount.blake160),
Expand Down
6 changes: 3 additions & 3 deletions packages/neuron-wallet/tests/services/cells.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1757,11 +1757,11 @@ describe('CellsService', () => {
expect(CellsService.getCellLockType(output)).toBe(LockScriptCategory.SECP256K1)
})
it('Unknown', () => {
const unknowScript = Script.fromObject(bob.lockScript)
unknowScript.codeHash = `0x${'00'.repeat(32)}`
const unknownScript = Script.fromObject(bob.lockScript)
unknownScript.codeHash = `0x${'00'.repeat(32)}`
const output = Output.fromObject({
capacity: '1000',
lock: unknowScript,
lock: unknownScript,
})
expect(CellsService.getCellLockType(output)).toBe(LockScriptCategory.Unknown)
})
Expand Down