fix: Clear generate tx when close password request dialog.

nervosnetwork · Sep 25, 2023 · 47be893 · 47be893
1 parent a783599
commit 47be893
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/packages/neuron-ui/src/components/History/RowExtend.tsx b/packages/neuron-ui/src/components/History/RowExtend.tsx
@@ -51,7 +51,7 @@ const RowExtend = ({ column, columns, isMainnet, id, bestBlockNumber }: RowExten
   )
 
   const { blockNumber, hash, description } = column
-  const confirmations = 1 + bestBlockNumber - +blockNumber
+  const confirmations = blockNumber ? 1 + bestBlockNumber - +blockNumber : 0
   const confirmationsLabel = confirmations > 1000 ? '1,000+' : localNumberFormatter(confirmations)
   const isSelected = localDescription.key === column.hash
   const onCopy = useCallback(() => {

diff --git a/packages/neuron-ui/src/states/stateProvider/actionCreators/sudt.ts b/packages/neuron-ui/src/states/stateProvider/actionCreators/sudt.ts
@@ -10,10 +10,10 @@ import { addNotification } from './app'
 
 export const sendCreateSUDTAccountTransaction =
   (params: Controller.SendCreateSUDTAccountTransaction.Params) => async (dispatch: StateDispatch) =>
-    sendTxBaseAction(sendCreateAccountTx, params, dispatch, addNotification)
+    sendTxBaseAction(sendCreateAccountTx, params, dispatch)
 
 export const sendSUDTTransaction = (params: Controller.SendSUDTTransaction.Params) => async (dispatch: StateDispatch) =>
-  sendTxBaseAction(sendSUDTTx, params, dispatch, addNotification)
+  sendTxBaseAction(sendSUDTTx, params, dispatch)
 
 export const migrateAcp = (params: Controller.MigrateAcp.Params) => async (dispatch: StateDispatch) => {
   dispatch({

diff --git a/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts b/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts
@@ -74,7 +74,7 @@ export const setCurrentWallet = (id: string) => (dispatch: StateDispatch) => {
 }
 
 export const sendTransaction = (params: Controller.SendTransactionParams) => async (dispatch: StateDispatch) =>
-  sendTxBaseAction(sendTx, params, dispatch, addNotification)
+  sendTxBaseAction(sendTx, params, dispatch)
 
 export const updateAddressListAndBalance =
   (params: Controller.GetAddressesByWalletIDParams) => (dispatch: StateDispatch) => {

diff --git a/packages/neuron-ui/src/utils/baseActions.ts b/packages/neuron-ui/src/utils/baseActions.ts
@@ -1,23 +1,23 @@
-import { AppActions } from 'states'
+import { AppActions, showGlobalAlertDialog } from 'states'
 import { isSuccessResponse } from './is'
 import { ErrorCode, ResponseCode } from './enums'
 
-export const sendTxBaseAction = async (sendMethod: any, params: any, dispatch: any, addNotification: any) => {
+export const sendTxBaseAction = async (sendMethod: any, params: any, dispatch: any) => {
   dispatch({ type: AppActions.UpdateLoadings, payload: { sending: true } })
   try {
     const res = await sendMethod(params)
     if (isSuccessResponse(res)) {
       dispatch({ type: AppActions.DismissPasswordRequest })
     } else if (res.status !== ErrorCode.PasswordIncorrect && res.status !== ErrorCode.SignTransactionFailed) {
-      addNotification({
-        type: 'alert',
-        timestamp: +new Date(),
-        code: res.status,
-        content: typeof res.message === 'string' ? res.message : res.message.content,
-        meta: typeof res.message === 'string' ? undefined : res.message.meta,
+      showGlobalAlertDialog({
+        type: 'failed',
+        title: typeof res.message === 'string' ? res.message : res.message.content,
+        message: typeof res.message === 'string' ? undefined : res.message.meta,
+        action: 'ok',
       })(dispatch)
       dispatch({ type: AppActions.DismissPasswordRequest })
     }
+    dispatch({ type: AppActions.UpdateGeneratedTx })
     return res
   } catch (err) {
     console.warn(err)