Merge pull request #796 from Keith-CY/remove-quotation-mark-in-top-alert

fix(neuron-ui): remove the quotation mark around error message
nervosnetwork · Aug 1, 2019 · 630c6f1 · 630c6f1
2 parents c821894 + 5de8cba
commit 630c6f1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/packages/neuron-ui/src/services/remote/controllerMethodWrapper.ts b/packages/neuron-ui/src/services/remote/controllerMethodWrapper.ts
@@ -56,9 +56,17 @@ export const controllerMethodWrapper = (controllerName: string) => (
       result: res.result || null,
     }
   }
+
+  let title = ''
+
+  if (typeof res === 'string') {
+    title = res
+  } else if (typeof res.msg === 'string') {
+    title = res.msg
+  }
   return {
     status: 0,
-    message: { title: (res && res.msg) || '' },
+    message: { title },
   }
 }
 

diff --git a/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts b/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts
@@ -113,7 +113,8 @@ export const sendTransaction = (params: Controller.SendTransaction) => (dispatch
       if (res.status) {
         history.push(Routes.History)
       } else {
-        addNotification({ type: 'alert', content: JSON.stringify(res.message.title) })(dispatch)
+        // TODO: the pretreatment is unnecessary once the error code is implemented
+        addNotification({ type: 'alert', content: res.message.title.replace(/(\b"|"\b)/g, '') })(dispatch)
       }
       dispatch({
         type: AppActions.DismissPasswordRequest,