From 5fce0f75593b5d541a610b2aab99e2c93ef433b7 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Thu, 9 May 2019 13:14:12 +0800
Subject: [PATCH 1/3] fix(neuron-ui): clear data when switch between wizard
 subviews

---
 .../src/components/History/index.tsx          | 19 +++++++++----------
 .../src/components/WalletWizard/index.tsx     | 13 +++++++++++++
 .../src/containers/Providers/hooks.ts         |  2 +-
 packages/neuron-ui/src/utils/parser.ts        |  2 +-
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/packages/neuron-ui/src/components/History/index.tsx b/packages/neuron-ui/src/components/History/index.tsx
index cdc4096d37..cb924e3979 100644
--- a/packages/neuron-ui/src/components/History/index.tsx
+++ b/packages/neuron-ui/src/components/History/index.tsx
@@ -60,15 +60,14 @@ const groupHistory = (items: Transaction[]): Transaction[][] => {
   }, [])
 }
 
-const History = (props: React.PropsWithoutRef<ContentProps & RouteComponentProps>) => {
-  const {
-    location: { search, pathname },
-    history,
-    loadings,
-    errorMsgs,
-    dispatch,
-    providerDispatch,
-  } = props
+const History = ({
+  location: { search, pathname },
+  history,
+  loadings,
+  errorMsgs,
+  dispatch,
+  providerDispatch,
+}: React.PropsWithoutRef<ContentProps & RouteComponentProps>) => {
   const {
     chain: {
       transactions: { pageNo, pageSize, totalCount, items, addresses },
@@ -131,7 +130,7 @@ const History = (props: React.PropsWithoutRef<ContentProps & RouteComponentProps
       </ContextMenuZone>
       <Row>
         <Col>
-          <Pagination currentPage={pageNo} pageSize={pageSize} total={totalCount} onChange={onPageChange} />
+          <Pagination currentPage={pageNo - 1} pageSize={pageSize} total={totalCount} onChange={onPageChange} />
         </Col>
       </Row>
     </Container>
diff --git a/packages/neuron-ui/src/components/WalletWizard/index.tsx b/packages/neuron-ui/src/components/WalletWizard/index.tsx
index 0b6066455e..d285d421e1 100644
--- a/packages/neuron-ui/src/components/WalletWizard/index.tsx
+++ b/packages/neuron-ui/src/components/WalletWizard/index.tsx
@@ -84,6 +84,11 @@ const Mnemonic = ({
         })
         // TODO: Better Error Handle
         .catch(err => console.error(err))
+    } else {
+      dispatch({
+        type: 'imported',
+        payload: '',
+      })
     }
   }, [dispatch, type])
 
@@ -139,6 +144,14 @@ const Submission = ({
       type: 'name',
       payload: `wallet @${Math.round(Math.random() * 100)}`,
     })
+    dispatch({
+      type: 'password',
+      payload: '',
+    })
+    dispatch({
+      type: 'confirmPassword',
+      payload: '',
+    })
   }, [dispatch])
 
   const onChange = useCallback(
diff --git a/packages/neuron-ui/src/containers/Providers/hooks.ts b/packages/neuron-ui/src/containers/Providers/hooks.ts
index 83a720717a..898578e11e 100644
--- a/packages/neuron-ui/src/containers/Providers/hooks.ts
+++ b/packages/neuron-ui/src/containers/Providers/hooks.ts
@@ -54,7 +54,7 @@ export const useChannelListeners = (i18n: any, chain: any, dispatch: React.Dispa
     UILayer.on(Channel.Transactions, (_e: Event, method: TransactionsMethod, args: ChannelResponse<any>) => {
       if (args.status) {
         switch (method) {
-          case TransactionsMethod.GetAll: {
+          case TransactionsMethod.GetAllByAddresses: {
             dispatch({
               type: ProviderActions.Chain,
               payload: { transactions: { ...chain.transactions, ...args.result } },
diff --git a/packages/neuron-ui/src/utils/parser.ts b/packages/neuron-ui/src/utils/parser.ts
index 31407c2365..f33f89a163 100644
--- a/packages/neuron-ui/src/utils/parser.ts
+++ b/packages/neuron-ui/src/utils/parser.ts
@@ -5,7 +5,7 @@ export const history = (search: string) => {
   const addresses = query.get('addresses')
   // use Object.fromEntries in ES10
   const params = {
-    pageNo: +(query.get('pageNo') || 0),
+    pageNo: +(query.get('pageNo') || 1),
     pageSize: +(query.get('pageSize') || PAGE_SIZE),
     addresses: addresses ? addresses.split(',') : [],
   }

From e969f318134b19840ad31852c29468488c289b2d Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Thu, 9 May 2019 16:48:53 +0800
Subject: [PATCH 2/3] refactor: add more response info in get history api

---
 .../src/components/History/index.tsx          | 36 +++++++++++--------
 .../src/components/Receive/index.tsx          |  2 +-
 packages/neuron-ui/src/locales/en.json        |  3 ++
 packages/neuron-ui/src/locales/zh.json        |  3 ++
 .../src/controllers/transactions.ts           |  2 +-
 5 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/packages/neuron-ui/src/components/History/index.tsx b/packages/neuron-ui/src/components/History/index.tsx
index cb924e3979..f6a5480854 100644
--- a/packages/neuron-ui/src/components/History/index.tsx
+++ b/packages/neuron-ui/src/components/History/index.tsx
@@ -63,7 +63,7 @@ const groupHistory = (items: Transaction[]): Transaction[][] => {
 const History = ({
   location: { search, pathname },
   history,
-  loadings,
+  // loadings,
   errorMsgs,
   dispatch,
   providerDispatch,
@@ -81,20 +81,24 @@ const History = ({
   const onPageChange = useOnChangePage(search, pathname, history, queryFormatter)
   const onAddressRemove = useOnAddressRemove(search, pathname, history, queryFormatter)
 
-  if (loadings.transactions) {
-    return <div>Loading</div>
-  }
+  // if (loadings.transactions) {
+  //   return <div>Loading</div>
+  // }
 
   return (
     <Container>
       <h1>{t('siderbar.history')}</h1>
       {errorMsgs.transaction ? <Alert variant="warning">{t(`messages.${errorMsgs.transactions}`)}</Alert> : null}
-      {addresses.map(address => (
-        <AddressBadge variant="primary" key={address}>
-          {address}
-          <CloseIcon size="small" color="#fff" onClick={onAddressRemove(address)} />
-        </AddressBadge>
-      ))}
+      {addresses.length > 0 ? (
+        addresses.map(address => (
+          <AddressBadge variant="primary" key={address}>
+            {address}
+            <CloseIcon size="small" color="#fff" onClick={onAddressRemove(address)} />
+          </AddressBadge>
+        ))
+      ) : (
+        <div>No Transactions Found</div>
+      )}
       <ContextMenuZone menuItems={menuItems}>
         {groupHistory(items).map(group => (
           <Table key={dayjs(group[0].time).format(TimeFormat.Day)} striped>
@@ -128,11 +132,13 @@ const History = ({
           </Table>
         ))}
       </ContextMenuZone>
-      <Row>
-        <Col>
-          <Pagination currentPage={pageNo - 1} pageSize={pageSize} total={totalCount} onChange={onPageChange} />
-        </Col>
-      </Row>
+      {addresses.length > 0 ? (
+        <Row>
+          <Col>
+            <Pagination currentPage={pageNo - 1} pageSize={pageSize} total={totalCount} onChange={onPageChange} />
+          </Col>
+        </Row>
+      ) : null}
     </Container>
   )
 }
diff --git a/packages/neuron-ui/src/components/Receive/index.tsx b/packages/neuron-ui/src/components/Receive/index.tsx
index 9d10e863bc..2f1842e9b4 100644
--- a/packages/neuron-ui/src/components/Receive/index.tsx
+++ b/packages/neuron-ui/src/components/Receive/index.tsx
@@ -50,7 +50,7 @@ const Receive = (props: React.PropsWithoutRef<RouteComponentProps<{ address: str
 
   if (!accountAddress) {
     // TODO: better error handling
-    throw new Error('Found no addresses')
+    return <div>{t('receive.address-not-found')}</div>
   }
 
   const copyAddress = () => {
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 04a46e2f39..a465fcd943 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -31,6 +31,9 @@
       "this-transfer-will-send": "This transfer will send",
       "scan-to-get-address": "scan the qrcode to get address"
     },
+    "receive": {
+      "address-not-found": "Address not found"
+    },
     "history": {
       "meta": "meta",
       "type": "type",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 2cc1d26c39..e13eb05ce9 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -31,6 +31,9 @@
       "this-transfer-will-send": "本次交易将发送",
       "scan-to-get-address": "扫码二维码以获取地址"
     },
+    "receive": {
+      "address-not-found": "未找到地址"
+    },
     "history": {
       "meta": "元信息",
       "type": "类型",
diff --git a/packages/neuron-wallet/src/controllers/transactions.ts b/packages/neuron-wallet/src/controllers/transactions.ts
index 3ba1421f85..3612b3cd73 100644
--- a/packages/neuron-wallet/src/controllers/transactions.ts
+++ b/packages/neuron-wallet/src/controllers/transactions.ts
@@ -35,7 +35,7 @@ export default class TransactionsController {
     if (transactions) {
       return {
         status: ResponseCode.Success,
-        result: transactions,
+        result: { ...params, ...transactions },
       }
     }
     return {

From 7f6980c25c9a7e80964a9a5f21bf3f417bdffc30 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Fri, 10 May 2019 10:16:17 +0800
Subject: [PATCH 3/3] refactor(neuron-ui): remove useless comment

---
 packages/neuron-ui/src/components/History/index.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/neuron-ui/src/components/History/index.tsx b/packages/neuron-ui/src/components/History/index.tsx
index f6a5480854..7f47224faa 100644
--- a/packages/neuron-ui/src/components/History/index.tsx
+++ b/packages/neuron-ui/src/components/History/index.tsx
@@ -81,10 +81,6 @@ const History = ({
   const onPageChange = useOnChangePage(search, pathname, history, queryFormatter)
   const onAddressRemove = useOnAddressRemove(search, pathname, history, queryFormatter)
 
-  // if (loadings.transactions) {
-  //   return <div>Loading</div>
-  // }
-
   return (
     <Container>
       <h1>{t('siderbar.history')}</h1>