Skip to content

Commit 9dcef03

Browse files
committed
fix: dao
1 parent 75e775a commit 9dcef03

File tree

14 files changed

+25
-10
lines changed

14 files changed

+25
-10
lines changed

packages/neuron-ui/src/components/MultisigAddress/multisigAddress.module.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
height: 44px;
1616
border-bottom: 1px solid var(--warn-border-color);
1717
padding: 0 16px;
18-
max-width: 780px;
1918
& > svg {
2019
width: 16px;
2120
flex-shrink: 0;
2221
}
22+
& > div {
23+
max-width: 90%;
24+
}
2325
button {
2426
color: var(--warn-text-color);
2527
font-size: 12px;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ const MultisigAddressNervosDAODialog = ({
221221
return (
222222
<Dialog
223223
show
224-
title={t('multisig-address.send-ckb.title')}
224+
title={t('multisig-address.nervos-dao')}
225225
onCancel={closeDialog}
226226
showFooter={false}
227227
contentClassName={styles.dialogContainer}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const ScriptTag = ({
5151
if (LegacyMultiSigLockInfo.TagName === foundLock.TagName || MultiSigLockInfo.TagName === foundLock.TagName) {
5252
const isLegacy = LegacyMultiSigLockInfo.TagName === foundLock.TagName
5353
return (
54-
<div className={clsx(styles.tagWrap, className)}>
54+
<div className={styles.tagWrap}>
5555
<Tooltip
5656
tip={
5757
<div>
@@ -68,9 +68,8 @@ const ScriptTag = ({
6868
</div>
6969
}
7070
showTriangle
71-
placement="top"
7271
>
73-
<button type="button" className={styles.tag} onClick={onClick}>
72+
<button type="button" className={clsx(styles.tag, className)} onClick={onClick}>
7473
Multisig
7574
<span className={clsx(!isLegacy && styles.highlight)}>(@{foundLock.CodeHash.slice(0, 8)})</span>
7675
</button>

packages/neuron-ui/src/components/ScriptTag/scriptTag.module.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@
4242

4343
.highlight {
4444
color: var(--primary-color);
45+
margin-left: 2px;
4546
}
4647
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,6 +1194,7 @@
11941194
"cancel": "إلغاء",
11951195
"export": "تصدير المعاملة"
11961196
},
1197+
"nervos-dao": "نيرفوس DAO",
11971198
"multisig-script-update-notice": "نظرًا لـ<0>ترقية برنامج النص المتعدد التوقيعات</0>، نوصي بإعادة إنشاء عناوين التوقيع المتعدد ونقل الأصول من العنوان القديم لضمان الأداء السليم.",
11981199
"regenerate-dialog": {
11991200
"title": "إعادة الإنشاء",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,6 +1194,7 @@
11941194
"cancel": "Cancel",
11951195
"export": "Export Tx"
11961196
},
1197+
"nervos-dao": "Nervos DAO",
11971198
"multisig-script-update-notice": "Due to the <0>multisig script upgrade</0>, we recommend regenerating the multisig addresses and transferring assets from the legacy one to ensure proper functionality. ",
11981199
"regenerate-dialog": {
11991200
"title": "Regenerate",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,6 +1177,7 @@
11771177
"cancel": "Cancelar",
11781178
"export": "Exportar Tx"
11791179
},
1180+
"nervos-dao": "Nervos DAO",
11801181
"multisig-script-update-notice": "Debido a la <0>actualización del script multisig</0>, recomendamos regenerar las direcciones multisig y transferir los activos desde la antigua para garantizar el funcionamiento adecuado.",
11811182
"regenerate-dialog": {
11821183
"title": "Regenerar",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,6 +1184,7 @@
11841184
"cancel": "Annuler",
11851185
"export": "Exporter Tx"
11861186
},
1187+
"nervos-dao": "Nervos DAO",
11871188
"multisig-script-update-notice": "En raison de la <0>mise à jour du script multisig</0>, nous recommandons de régénérer les adresses multisig et de transférer les actifs depuis l’ancienne adresse pour garantir un bon fonctionnement.",
11881189
"regenerate-dialog": {
11891190
"title": "Régénérer",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,6 +1187,7 @@
11871187
"cancel": "取消",
11881188
"export": "導出交易"
11891189
},
1190+
"nervos-dao": "Nervos DAO",
11901191
"multisig-script-update-notice": "由於<0>多簽腳本升級</0>,我們建議重新生成多簽地址,並將資產從舊地址轉移,以確保正常功能。",
11911192
"regenerate-dialog": {
11921193
"title": "重新生成",

packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@ export default class LightSynchronizer extends Synchronizer {
251251
if (!multisigScripts.length) {
252252
return
253253
}
254-
const existSyncArgses = await SyncProgressService.getExistingSyncArgses()
254+
const existSyncProgressScripts = await SyncProgressService.getExistingSyncScripts()
255255
const syncScripts = await this.lightRpc.getScripts()
256-
const retainedSyncScripts = syncScripts.filter(v => existSyncArgses.has(v.script.args))
256+
const retainedSyncScripts = syncScripts.filter(v => existSyncProgressScripts.has(scriptToHash(v.script)))
257257
const existSyncScripts: Record<string, LightScriptFilter> = {}
258258
retainedSyncScripts.forEach(v => {
259259
existSyncScripts[scriptToHash(v.script)] = v

0 commit comments

Comments
 (0)