Skip to content

Commit

Permalink
feat: pending (#1843)
Browse files Browse the repository at this point in the history
* wip: pending

* feat: add pending detail

* chore

* chore

* fix: i18n

* fix: filter scam

* chore: fix some bugs

* chore: change some style

* chore: fix some bugs

* chore: fix some bugs

* feat: update rabby-api

* chore: fix some bugs

* chore: fix some style

* style: partial support for dark mode. (#1856)

* fix: count down

* chore: fix some bugs

* style: tuning for dark mode.

* style: tuning TxTimeline for dark mode.

* chore: fix.

* feat: update rabby-api

* chore: fix some bugs

* fix: stat

* chore: remove console

* chore: fix since time

* fix: format nft amount

* fix: style

---------

Co-authored-by: richardo2016x <[email protected]>
Co-authored-by: richardo2016x <[email protected]>
Co-authored-by: vvvvvv1vvvvvv <[email protected]>
  • Loading branch information
4 people authored Nov 10, 2023
1 parent 367a4df commit 0151ecc
Show file tree
Hide file tree
Showing 65 changed files with 2,753 additions and 46 deletions.
72 changes: 72 additions & 0 deletions _raw/locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,10 @@
},
"SkipNonceAlert": {
"alert": "Nonce #{{nonce}} skipped on {{chainName}} chain. This may cause pending transactions ahead. <5></5> <6>Submit a tx</6> <7></7> on chain to resolve"
},
"PredictTime": {
"time": "Predicted to be packed in {{time}}",
"noTime": "Packing time is being predicted"
}
},
"signedText": {
Expand Down Expand Up @@ -1586,6 +1590,74 @@
"importQrBase": {
"desc": "Scan the QR code on the {{brandName}} hardware wallet",
"btnText": "Try Again"
},
"pendingDetail": {
"Header": {
"predictTime": "Predicted to be packed in"
},
"TxStatus": {
"completed": "Completed",
"pendingBroadcasted": "Pending: Broadcasted",
"pendingBroadcast": "Pending: To be broadcast",
"reBroadcastBtn": "Re-broadcast"
},
"TxHash": {
"hash": "Tx Hash"
},
"TxTimeline": {
"pending": "Checking status...",
"created": "Transaction created",
"broadcasted": "Recently broadcasted"
},
"MempoolList": {
"col": {
"nodeName": "Node name",
"nodeOperator": "Node operator",
"txStatus": "Transaction status"
},
"txStatus": {
"appeared": "Appeared",
"appearedOnce": "Appeared once",
"notFound": "Not found"
},
"title": "Found in {{count}} RPC nodes"
},
"PendingTxList": {
"title": "GasPrice Ranks #{{rank}} in All Pending Txs",
"titleNotFound": "No Rank in All Pending Txs",
"filterBaseFee": {
"label": "Only meets Base fee requirement",
"tooltip": "Show only transactions whose Gas Price meets the block's Base fee requirements"
},
"col": {
"gasPrice": "Gas Price",
"action": "Transaction Action",
"balanceChange": "Balance change"
},
"titleSame": "GasPrice Ranks #{{rank}} in Same as Current",
"titleSameNotFound": "No Rank in Same as Current"
},
"Empty": {
"noData": "No data found"
},
"PrePackInfo": {
"col": {
"prePackContent": "Pre-pack content",
"expectations": "Expectations",
"prePackResults": "Pre-pack results",
"difference": "Check results"
},
"type": {
"pay": "Pay",
"receive": "Receive"
},
"noLoss": "No loss found",
"noError": "No error found",
"title": "Pre-pack Check",
"error": "{{count}} error found",
"loss": "{{lossCount}} loss found",
"desc": "Simulation executed in the latest block, updated {{time}}"
}
}
},
"component": {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@rabby-wallet/eth-watch-keyring": "^1.0.0",
"@rabby-wallet/gnosis-sdk": "^1.3.5",
"@rabby-wallet/page-provider": "^0.1.24-alpha.1",
"@rabby-wallet/rabby-api": "^0.6.25",
"@rabby-wallet/rabby-api": "^0.6.26",
"@rabby-wallet/rabby-security-engine": "^1.1.17",
"@rabby-wallet/rabby-swap": "^0.0.29",
"@rabby-wallet/widgets": "^1.0.9",
Expand All @@ -62,7 +62,7 @@
"@types/w3c-web-hid": "^1.0.3",
"@zxing/browser": "^0.0.10",
"@zxing/library": "0.8.0",
"ahooks": "^3.1.5",
"ahooks": "^3.7.8",
"antd": "^4.15.3",
"bignumber.js": "^9.0.1",
"bitbox02-api": "^0.15.1",
Expand Down
2 changes: 2 additions & 0 deletions src/background/controller/wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2740,6 +2740,8 @@ export class WalletController extends BaseController {

retryPushTx = transactionHistoryService.retryPushTx;

getTxGroup = transactionHistoryService.getTxGroup;

getPreference = (key?: string) => {
return preferenceService.getPreference(key);
};
Expand Down
7 changes: 7 additions & 0 deletions src/ui/assets/pending/bg-ball-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/ui/assets/pending/bg-ball-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/ui/assets/pending/empty.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/ui/assets/pending/header-bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/ui/assets/pending/icon-arrow-down-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/ui/assets/pending/icon-arrow-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/ui/assets/pending/icon-box.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/ui/assets/pending/icon-check-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/ui/assets/pending/icon-check-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/ui/assets/pending/icon-checkbox-checked.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/ui/assets/pending/icon-checkbox-uncheck.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/ui/assets/pending/icon-checked.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/ui/assets/pending/icon-clock-refresh.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/ui/assets/pending/icon-clock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/ui/assets/pending/icon-close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions src/ui/assets/pending/icon-contract.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/ui/assets/pending/icon-copy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/ui/assets/pending/icon-dot.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/ui/assets/pending/icon-error.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/ui/assets/pending/icon-external.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/ui/assets/pending/icon-help.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/ui/assets/pending/icon-speed-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/ui/assets/pending/icon-spin-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/ui/assets/pending/icon-spin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0151ecc

Please sign in to comment.