fix

Author: devchenyan

packages/neuron-ui/src/components/MultisigAddress/index.tsx

@@ -10,7 +10,7 @@ import {
   useClearGeneratedTx,
 } from 'utils'
 import appState from 'states/init/app'
-import { useState as useGlobalState, useDispatch, showPageNotice } from 'states'
+import { useState as useGlobalState, useDispatch } from 'states'
 import MultisigAddressCreateDialog from 'components/MultisigAddressCreateDialog'
 import MultisigAddressInfo from 'components/MultisigAddressInfo'
 import SendFromMultisigDialog from 'components/SendFromMultisigDialog'
@@ -21,6 +21,7 @@ import MultisigAddressNervosDAODialog from 'components/MultisigAddressNervosDAOD
 import Dialog from 'widgets/Dialog'
 import Table from 'widgets/Table'
 import Tooltip from 'widgets/Tooltip'
+import Toast from 'widgets/Toast'
 import AlertDialog from 'widgets/AlertDialog'
 import {
   Download,
@@ -151,6 +152,7 @@ const MultisigAddress = () => {
   const dispatch = useDispatch()
   const [globalAPC, setGlobalAPC] = useState(0)
   const [genesisBlockTimestamp, setGenesisBlockTimestamp] = useState<number | undefined>(undefined)
+  const [notice, setNotice] = useState('')
 
   const onClickItem = useCallback(
     (multisigConfig: MultisigConfig) => (e: React.SyntheticEvent<HTMLButtonElement>) => {
@@ -270,8 +272,11 @@ const MultisigAddress = () => {
 
   const onDepositSuccess = useCallback(() => {
     daoDepositAction.closeDialog()
-    showPageNotice('nervos-dao.deposit-submitted')(dispatch)
-  }, [dispatch, daoDepositAction.closeDialog])
+    setNotice(t('nervos-dao.deposit-submitted'))
+    if (daoDepositAction.depositFromMultisig) {
+      daoWithdrawAction.action(daoDepositAction.depositFromMultisig)
+    }
+  }, [t, setNotice, daoDepositAction, daoWithdrawAction])
 
   return (
     <div>
@@ -488,6 +493,8 @@ const MultisigAddress = () => {
               noDataContent={t('multisig-address.no-data')}
             />
           </div>
+
+          <Toast content={notice} onDismiss={() => setNotice('')} />
         </div>
       </Dialog>
 

packages/neuron-ui/src/components/NervosDAORecord/index.tsx

@@ -217,7 +217,7 @@ export const DAORecord = ({
           <Button
             className={styles.txRecordBtn}
             onClick={() => {
-              openExternal(`${getExplorerUrl(isMainnet)}/transaction/${depositOutPoint?.txHash}`)
+              openExternal(`${getExplorerUrl(isMainnet)}/transaction/${txHash}`)
             }}
             type="default"
             label={t('nervos-dao.deposit-record.view-tx-detail')}

packages/neuron-ui/src/components/PasswordRequest/hooks.ts

@@ -152,7 +152,11 @@ export default ({
             await sendTransaction({ walletID, tx: generatedTx, description, password, multisigConfig })(dispatch).then(
               (res: { result?: string; status: number; message: string | { content: string } }) => {
                 if (isSuccessResponse(res)) {
-                  requestOpenInExplorer({ type: 'transaction', key: res.result })
+                  if (onSuccess) {
+                    onSuccess()
+                  } else {
+                    requestOpenInExplorer({ type: 'transaction', key: res.result })
+                  }
                 } else if (res.status === ErrorCode.PasswordIncorrect) {
                   throw new PasswordIncorrectException()
                 } else {

packages/neuron-wallet/src/services/cells.ts

@@ -229,10 +229,7 @@ export default class CellsService {
       .createQueryBuilder('output')
       .leftJoinAndSelect('output.transaction', 'tx')
       .where(
-        lockArgs
-          ? `
-        output.daoData IS NOT NULL AND
-        output.lockArgs = :lockArgs AND
+        `output.daoData IS NOT NULL AND
         (
           output.status = :liveStatus OR
           output.status = :sentStatus OR
@@ -244,26 +241,14 @@ export default class CellsService {
             ) AND
             output.depositTxHash is not null
           )
-        )`
-          : `
-        output.daoData IS NOT NULL AND
-        (
-          output.status = :liveStatus OR
-          output.status = :sentStatus OR
-          tx.status = :failedStatus OR
-          (
-            (
-              output.status = :deadStatus OR
-              output.status = :pendingStatus
-            ) AND
-            output.depositTxHash is not null
-          )
-        ) AND
-        output.lockArgs in (
+        ) AND ${
+          lockArgs
+            ? `output.lockArgs = :lockArgs`
+            : `output.lockArgs in (
           SELECT publicKeyInBlake160
           FROM hd_public_key_info
-          WHERE walletId = :walletId
-        )`,
+          WHERE walletId = :walletId)`
+        }`,
         {
           walletId,
           lockArgs,