Merge pull request #748 from nervosnetwork/rc/v0.16.0-alpha.2

[ᚬmaster] Rc/v0.16.0 alpha.2

Author: ashchan

CHANGELOG.md

@@ -1,3 +1,13 @@
+# [0.16.0-alpha.2](https://github.com/nervosnetwork/neuron/compare/v0.16.0-alpha.1...v0.16.0-alpha.2) (2019-07-26)
+
+
+### Features
+
+* Update app icon ([17936c4](https://github.com/nervosnetwork/neuron/commit/17936c4))
+* **neuron-ui:** display balance with thousandth delimiter ([07e4370](https://github.com/nervosnetwork/neuron/commit/07e4370))
+
+
+
 # [0.16.0-alpha.1](https://github.com/nervosnetwork/neuron/compare/v0.16.0-alpha.0...v0.16.0-alpha.1) (2019-07-26)
 
 
@@ -19,4 +29,3 @@
 * subscribe network list from neuron-wallet in neuron-ui ([b56ae1c](https://github.com/nervosnetwork/neuron/commit/b56ae1c))
 
 
-

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.16.0-alpha.1",
+  "version": "0.16.0-alpha.2",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

package.json

@@ -2,7 +2,7 @@
   "name": "@nervosnetwork/neuron",
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
-  "version": "0.16.0-alpha.1",
+  "version": "0.16.0-alpha.2",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

packages/neuron-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nervosnetwork/neuron-ui",
-  "version": "0.16.0-alpha.1",
+  "version": "0.16.0-alpha.2",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

packages/neuron-ui/public/favicon.ico

@@ -144,15 +144,15 @@ describe(`formatters`, () => {
         },
         {
           source: `1234567890123456789012345678901234567890123456789012345678901234567890123400000000`,
-          target: `12345678901234567890123456789012345678901234567890123456789012345678901234`,
+          target: `12,345,678,901,234,567,890,123,456,789,012,345,678,901,234,567,890,123,456,789,012,345,678,901,234`,
         },
         {
           source: `12345678901234567890123456789012345678901234567890123456789012345678901234`,
-          target: `123456789012345678901234567890123456789012345678901234567890123456.78901234`,
+          target: `123,456,789,012,345,678,901,234,567,890,123,456,789,012,345,678,901,234,567,890,123,456.78901234`,
         },
         {
           source: `1234567890123456789012345678901234567890123456789012345678901234567890123400`,
-          target: `12345678901234567890123456789012345678901234567890123456789012345678.901234`,
+          target: `12,345,678,901,234,567,890,123,456,789,012,345,678,901,234,567,890,123,456,789,012,345,678.901234`,
         },
 
         {
@@ -173,15 +173,15 @@ describe(`formatters`, () => {
         },
         {
           source: `-1234567890123456789012345678901234567890123456789012345678901234567890123400000000`,
-          target: `-12345678901234567890123456789012345678901234567890123456789012345678901234`,
+          target: `-12,345,678,901,234,567,890,123,456,789,012,345,678,901,234,567,890,123,456,789,012,345,678,901,234`,
         },
         {
           source: `-12345678901234567890123456789012345678901234567890123456789012345678901234`,
-          target: `-123456789012345678901234567890123456789012345678901234567890123456.78901234`,
+          target: `-123,456,789,012,345,678,901,234,567,890,123,456,789,012,345,678,901,234,567,890,123,456.78901234`,
         },
         {
           source: `-1234567890123456789012345678901234567890123456789012345678901234567890123400`,
-          target: `-12345678901234567890123456789012345678901234567890123456789012345678.901234`,
+          target: `-12,345,678,901,234,567,890,123,456,789,012,345,678,901,234,567,890,123,456,789,012,345,678.901234`,
         },
         {
           source: `0`,

packages/neuron-ui/public/icon.png

@@ -83,23 +83,26 @@ export const CKBToShannonFormatter = (amount: string, uint: CapacityUnit) => {
 
 export const shannonToCKBFormatter = (shannon: string) => {
   const sign = shannon.startsWith('-') ? '-' : ''
-  const unsignedShannon = shannon.replace(/^-/, '')
-  let unsignedCkbStr = [...unsignedShannon.padStart(8, '0')]
-    .map((char, idx) => {
-      if (idx === Math.max(unsignedShannon.length - 8, 0)) {
-        return `.${char}`
-      }
-      return char
-    })
-    .join('')
-    .replace(/(^0+|\.?0+$)/g, '')
-  if (!unsignedCkbStr) {
-    return '0'
+  const unsignedShannon = shannon.replace(/^-?0*/, '')
+  let unsignedCKB = ''
+  if (unsignedShannon.length <= 8) {
+    unsignedCKB = `0.${unsignedShannon.padStart(8, '0')}`.replace(/\.?0+$/, '')
+  } else {
+    const decimal = `.${unsignedShannon.slice(-8)}`.replace(/\.?0+$/, '')
+    const int = unsignedShannon.slice(0, -8).replace(/\^0+/, '')
+    unsignedCKB = `${(
+      int
+        .split('')
+        .reverse()
+        .join('')
+        .match(/\d{1,3}/g) || ['0']
+    )
+      .join(',')
+      .split('')
+      .reverse()
+      .join('')}${decimal}`
   }
-  if (unsignedCkbStr.startsWith('.')) {
-    unsignedCkbStr = `0${unsignedCkbStr}`
-  }
-  return sign + unsignedCkbStr
+  return +unsignedCKB === 0 ? '0' : `${sign}${unsignedCKB}`
 }
 
 export const localNumberFormatter = (num: string | number = 0) => {