Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement new transaction list design #8564

Merged
merged 16 commits into from
May 26, 2020
+1,899 −850
Merged

Implement new transaction list design #8564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5ca6361
implement new transaction history design
brad-decker May 13, 2020
b0940e7
Update ui/app/hooks/useTokenData.js
brad-decker May 14, 2020
6be76e5
changes
brad-decker May 14, 2020
cf22a07
Update ui/app/hooks/useTransactionDisplayData.js
brad-decker May 21, 2020
df66632
address change requests
brad-decker May 21, 2020
dea9843
add transferfrom, care for lack of origin on sig req
brad-decker May 22, 2020
a05cf75
add categories and tokens to integration tests
brad-decker May 22, 2020
e6cc7e8
use constants and I18n on strings
brad-decker May 22, 2020
3c4c26d
show the last page of results
brad-decker May 22, 2020
6a1c2d5
make token related logic clearer
brad-decker May 22, 2020
5a8f1b4
reword comment
brad-decker May 22, 2020
7ff0609
add fallback for missing token data
brad-decker May 22, 2020
93d59cc
use correct category for approve
brad-decker May 22, 2020
d9b4b83
approval uses tokenData
brad-decker May 22, 2020
b695366
resolving feedback items from 5/26
brad-decker May 26, 2020
7966975
restore original logic of setting selected token
brad-decker May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion app/_locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
"description": "The name of the application"
},
"approve": {
"message": "Approve"
"message": "Approve spend limit"
},
"approved": {
"message": "Approved"
Expand Down Expand Up @@ -663,6 +663,10 @@
"from": {
"message": "From"
},
"fromAddress": {
"message": "From: $1",
"description": "$1 is the address to include in the From label. It is typically shortened first using shortenAddress"
},
"functionApprove": {
"message": "Function: Approve"
},
Expand Down Expand Up @@ -1117,12 +1121,18 @@
"queue": {
"message": "Queue"
},
"queued": {
"message": "Queued"
},
"readdToken": {
"message": "You can add this token back in the future by going to “Add token” in your accounts options menu."
},
"recents": {
"message": "Recents"
},
"receive": {
"message": "Receive"
},
"recipientAddress": {
"message": "Recipient Address"
},
Expand Down Expand Up @@ -1301,6 +1311,10 @@
"sentTokens": {
"message": "sent tokens"
},
"sendSpecifiedTokens": {
"message": "Send $1",
"description": "Symbol of the specified token"
},
"separateEachWord": {
"message": "Separate each word with a single space"
},
Expand Down Expand Up @@ -1507,6 +1521,10 @@
"to": {
"message": "To"
},
"toAddress": {
"message": "To: $1",
"description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
},
"toWithColon": {
"message": "To:"
},
Expand Down
19 changes: 18 additions & 1 deletion development/states/tx-list-items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,17 @@
"name": "Address Book Account 1"
}
],
"tokens": [],
"tokens": [{
"name": "FakeTokenOne",
"address": "0x66f30b996a7d345cd00badcfe75e81e25dc5e1ec",
"symbol": "FTO",
"decimals": 2
}, {
"name": "FakeTokenTwo",
"address": "0x66f30b996a7d345cd00badcfe75e81e25dc5e1eb",
"symbol": "FTT",
"decimals": 2
}],
"transactions": {},
"incomingTransactions": {},
"currentNetworkTxList": [
Expand Down Expand Up @@ -208,6 +218,7 @@
"rawTx": "0xf8610384773594008094f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a052e5246c9a404f756a246b8cec545099741aeb4e6e0add935a5b7a366fa88f95a0538eaa2421e50377c534244dcdcd15ace00bf9c0adbd9eb162baae2b9e89a36f",
"status": "failed",
"time": 1522378334455,
"transactionCategory": "sentEther",
"txParams": {
"chainId": "0x3",
"from": "0xd85a4b6a394794842887b8284293d69163007bbb",
Expand All @@ -224,6 +235,7 @@
"status": "approved",
"metamaskNetworkId": "1",
"loadingDefaults": false,
"transactionCategory": "sentEther",
"txParams": {
"from": "0xd85a4b6a394794842887b8284293d69163007bbb",
"to": "0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3",
Expand Down Expand Up @@ -451,6 +463,7 @@
"status": "confirmed",
"submittedTime": 1522346282571,
"time": 1522348270251,
"transactionCategory": "transfer",
"txParams": {
"chainId": "0x3",
"data": "0xa9059cbb000000000000000000000000e7884118ee52ec3f4eef715cb022279d7d4181a9000000000000000000000000000000000000000000000000000000000000000b",
Expand Down Expand Up @@ -641,6 +654,7 @@
"status": "confirmed",
"submittedTime": 1522346282571,
"time": 1522346270251,
"transactionCategory": "transfer",
"txParams": {
"chainId": "0x3",
"data": "0xa9059cbb000000000000000000000000e7884118ee52ec3f4eef715cb022279d7d4181a9000000000000000000000000000000000000000000000000000000000000000b",
Expand All @@ -658,6 +672,7 @@
"status": "submitted",
"metamaskNetworkId": "1",
"loadingDefaults": false,
"transactionCategory": "sentEther",
"txParams": {
"from": "0xd85a4b6a394794842887b8284293d69163007bbb",
"to": "0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3",
Expand Down Expand Up @@ -819,6 +834,7 @@
"status": "unapproved",
"metamaskNetworkId": "1",
"loadingDefaults": false,
"transactionCategory": "sentEther",
"txParams": {
"from": "0xd85a4b6a394794842887b8284293d69163007bbb",
"to": "0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3",
Expand Down Expand Up @@ -858,6 +874,7 @@
"status": "unapproved",
"metamaskNetworkId": "1",
"loadingDefaults": false,
"transactionCategory": "sentEther",
"txParams": {
"from": "0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4",
"to": "0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3",
Expand Down
Loading