diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json index c09d821e65..5fae21346b 100644 --- a/packages/neuron-ui/src/locales/zh.json +++ b/packages/neuron-ui/src/locales/zh.json @@ -333,8 +333,8 @@ "interest-accumulated": "已累计 {{blockNumber}} 个块的利息", "blocks-left": " 还需等待 {{epochs}} epochs {{blocks}} 个块(~{{days}} 天)", "withdraw-alert": "风险提示:距离 NervosDAO 规定的最近一个允许提现 epoch 仅剩下 {{epochs}} 个 epoch,存在提现交易拥堵无法上链从而导致只能在下一个提现周期(约 {{days}} 天)的风险", - "insufficient-alert-title": "未达到要求周期", - "insufficient-alert-message": "Nervos DAO 要求您在至少 4 个 epochs 后执行此操作" + "insufficient-period-alert-title": "未达到要求周期", + "insufficient-period-alert-message": "Nervos DAO 要求您在至少 4 个 epochs 后执行此操作" } } } diff --git a/packages/neuron-wallet/src/services/cells.ts b/packages/neuron-wallet/src/services/cells.ts index 96c1041196..c57912479f 100644 --- a/packages/neuron-wallet/src/services/cells.ts +++ b/packages/neuron-wallet/src/services/cells.ts @@ -4,6 +4,7 @@ import { Cell, OutPoint, Input } from 'types/cell-types' import { CapacityNotEnough, CapacityNotEnoughForChange } from 'exceptions' import { OutputStatus } from './tx/params' import FeeMode from 'models/fee-mode' +import { TransactionStatus } from 'types/cell-types' export const MIN_CELL_CAPACITY = '6100000000' @@ -43,9 +44,10 @@ export default class CellsService { .getRepository(OutputEntity) .createQueryBuilder('output') .leftJoinAndSelect('output.transaction', 'tx') - .where(`output.status <> :deadStatus AND output.daoData IS NOT NULL AND output.lockHash in (:...lockHashes) AND tx.blockNumber IS NOT NULL`, { + .where(`(output.status = :liveStatus OR tx.status = :failedStatus) AND output.daoData IS NOT NULL AND output.lockHash in (:...lockHashes) AND tx.blockNumber IS NOT NULL`, { lockHashes, - deadStatus: OutputStatus.Dead, + liveStatus: OutputStatus.Live, + failedStatus: TransactionStatus.Failed, }) .orderBy(`CASE output.daoData WHEN '0x0000000000000000' THEN 1 ELSE 0 END`, 'ASC') .addOrderBy('tx.timestamp', 'ASC')