Merge pull request #1045 from nervosnetwork/confirmation-threshold

Confirmation update
nervosnetwork · Nov 3, 2019 · 6a099dc · 6a099dc
2 parents d513498 + f5cad48
commit 6a099dc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/packages/neuron-ui/src/components/Overview/index.tsx b/packages/neuron-ui/src/components/Overview/index.tsx
@@ -129,19 +129,21 @@ const Overview = ({
 
           if (status === 'success' && confirmationCount < CONFIRMATION_THRESHOLD) {
             status = 'pending'
+
+            if (confirmationCount === 1) {
+              confirmations = t('overview.confirmation', {
+                confirmationCount: localNumberFormatter(confirmationCount),
+                threshold: CONFIRMATION_THRESHOLD,
+              })
+            } else if (confirmationCount > 1) {
+              confirmations = `${t('overview.confirmations', {
+                confirmationCount: localNumberFormatter(confirmationCount),
+                threshold: CONFIRMATION_THRESHOLD,
+              })}`
+            }
           }
 
           typeLabel = genTypeLabel(item.type, confirmationCount, status)
-
-          if (confirmationCount === 1) {
-            confirmations = t('overview.confirmation', {
-              confirmationCount: localNumberFormatter(confirmationCount),
-            })
-          } else if (confirmationCount > 1) {
-            confirmations = `${t('overview.confirmations', {
-              confirmationCount: localNumberFormatter(confirmationCount),
-            })}`
-          }
         }
 
         return {

diff --git a/packages/neuron-ui/src/components/TransactionList/index.tsx b/packages/neuron-ui/src/components/TransactionList/index.tsx
@@ -116,7 +116,7 @@ const TransactionList = ({
             const confirmationCount = 1 + +tipBlockNumber - +item.blockNumber
             if (confirmationCount < CONFIRMATION_THRESHOLD) {
               return t(`history.confirming-with-count`, {
-                confirmations: `${Math.max(0, confirmationCount)} / ${CONFIRMATION_THRESHOLD}`,
+                confirmations: `${Math.max(0, confirmationCount)}/${CONFIRMATION_THRESHOLD}`,
               })
             }
             const confirmations = localNumberFormatter(confirmationCount)

diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
@@ -26,8 +26,8 @@
       "epoch": "Epoch",
       "difficulty": "Difficulty",
       "address": "Address",
-      "confirmation": "{{confirmationCount}} Confirmation",
-      "confirmations": "{{confirmationCount}} Confirmations",
+      "confirmation": "{{confirmationCount}}/{{threshold}} Confirmation",
+      "confirmations": "{{confirmationCount}}/{{threshold}} Confirmations",
       "sent": "Sent",
       "sending": "Sending",
       "received": "Received",
@@ -137,7 +137,7 @@
         "placeholder": "Search tx hash, address or date (yyyy-mm-dd)"
       },
       "confirmations": "Confirmations",
-      "confirming-with-count": "{{confirmations}} confirmations"
+      "confirming-with-count": "{{confirmations}} Confirmations"
     },
     "transaction": {
       "date": "Date",

diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
@@ -26,8 +26,8 @@
       "epoch": "Epoch",
       "difficulty": "难度",
       "address": "地址",
-      "confirmation": "{{confirmationCount}} 个确认",
-      "confirmations": "{{confirmationCount}} 个确认",
+      "confirmation": "{{confirmationCount}}/{{threshold}} 个确认",
+      "confirmations": "{{confirmationCount}}{{threshold}} 个确认",
       "sent": "已发送",
       "sending": "正在发送",
       "received": "已收款",

diff --git a/packages/neuron-ui/src/utils/const.ts b/packages/neuron-ui/src/utils/const.ts
@@ -7,7 +7,7 @@ export const MIN_AMOUNT = 61
 export const PAGE_SIZE = 15
 export const UNREMOVABLE_NETWORK = 'Testnet'
 export const UNREMOVABLE_NETWORK_ID = '0'
-export const CONFIRMATION_THRESHOLD = 10
+export const CONFIRMATION_THRESHOLD = 30
 
 export const MAX_DECIMAL_DIGITS = 8