fix

devchenyan · Aug 16, 2023 · e89f913 · e89f913
1 parent d9fdce7
commit e89f913
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 5 deletions.
diff --git a/packages/neuron-ui/src/components/ApproveMultisigTxDialog/approveMultisigTx.module.scss b/packages/neuron-ui/src/components/ApproveMultisigTxDialog/approveMultisigTx.module.scss
@@ -141,6 +141,19 @@
       color: var(--primary-text-color);
     }
   }
+
+  .scriptTag {
+    line-height: 17px;
+    margin: auto 8px;
+    padding: 3px 8px;
+    background: var(--tag-background-color);
+    color: var(--script-tag-color);
+    cursor: auto;
+    @media (prefers-color-scheme: dark) {
+      color: var(--primary-color);
+      background: transparent;
+    }
+  }
 }
 
 .conciseData {

diff --git a/packages/neuron-ui/src/components/ApproveMultisigTxDialog/index.tsx b/packages/neuron-ui/src/components/ApproveMultisigTxDialog/index.tsx
@@ -25,7 +25,7 @@ const Cell = React.memo(
           {address.slice(0, 6)}...{address.slice(-6)}
           <span className={`${cell.type ? styles.activity : ''} ${styles.tag}`}>Type</span>
           <span className={`${cell.data && cell.data !== '0x' ? styles.activity : ''} ${styles.tag}`}>Data</span>
-          <ScriptTag script={cell.lock} isMainnet={isMainnet} />
+          <ScriptTag className={styles.scriptTag} script={cell.lock} isMainnet={isMainnet} />
         </div>
         <div>{`${shannonToCKBFormatter(cell.capacity ?? '0')} CKB`}</div>
       </div>

diff --git a/packages/neuron-wallet/src/controllers/multisig.ts b/packages/neuron-wallet/src/controllers/multisig.ts
@@ -105,7 +105,11 @@ export default class MultisigController {
       const json = fs.readFileSync(filePaths[0], 'utf-8')
       const configOutput: MultisigConfigOutput = JSON.parse(json)
       if (!validateImportConfig(configOutput)) {
-        dialog.showErrorBox(t('common.error'), t('messages.invalid-json'))
+        ShowGlobalDialogSubject.next({
+          type: 'failed',
+          title: t('common.error'),
+          message: t('messages.invalid-json'),
+        })
         return
       }
       const saveConfigs = Object.values(configOutput.multisig_configs).map(config => ({
@@ -137,7 +141,11 @@ export default class MultisigController {
         result: saveSuccessConfigs,
       }
     } catch {
-      dialog.showErrorBox(t('common.error'), t('messages.invalid-json'))
+      ShowGlobalDialogSubject.next({
+        type: 'failed',
+        title: t('common.error'),
+        message: t('messages.invalid-json'),
+      })
     }
   }
 

diff --git a/packages/neuron-wallet/src/services/offline-sign.ts b/packages/neuron-wallet/src/services/offline-sign.ts
@@ -3,6 +3,7 @@ import path from 'path'
 import { dialog } from 'electron'
 import { t } from 'i18next'
 import type { OfflineSignJSON } from '../models/offline-sign'
+import ShowGlobalDialogSubject from '../models/subjects/show-global-dialog'
 
 export default class OfflineSignService {
   public static async loadTransactionJSON() {
@@ -28,15 +29,23 @@ export default class OfflineSignService {
     try {
       const json: OfflineSignJSON = JSON.parse(file)
       if (!json.transaction) {
-        dialog.showErrorBox(t('common.error'), t('messages.invalid-json'))
+        ShowGlobalDialogSubject.next({
+          type: 'failed',
+          title: t('common.error'),
+          message: t('messages.invalid-json'),
+        })
         return
       }
       return {
         json,
         filePath: path.basename(filePath),
       }
     } catch (err) {
-      dialog.showErrorBox(t('common.error'), t('messages.invalid-json'))
+      ShowGlobalDialogSubject.next({
+        type: 'failed',
+        title: t('common.error'),
+        message: t('messages.invalid-json'),
+      })
     }
   }
 }