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

Refactor and redesign confirm transaction views #4691

Merged
merged 19 commits into from
Jul 12, 2018
Merged

Refactor and redesign confirm transaction views #4691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ea9d51e
Refactor and redesign confirm transaction views
alextsg Jun 23, 2018
e895498
Refactor data flow, signature request routing
alextsg Jun 25, 2018
7732cd4
Display newest transaction
alextsg Jun 26, 2018
9cde5ab
Use eth-method-registry to get method data
alextsg Jun 28, 2018
a2d9c43
Various fixes from PR comments
alextsg Jul 6, 2018
7d691c7
Fix existing unit tests
alextsg Jul 8, 2018
f6e90bb
Add unit tests for confirmTransaction duck and util
alextsg Jul 10, 2018
76e80f6
Fix multiple signature requests showing an infinite spinner
alextsg Jul 10, 2018
1a0a701
Handles window indeterminancy issues for external dapps in e2e beta t…
danjm Jul 6, 2018
228b807
Fix existing e2e tests
danjm Jul 9, 2018
f81676f
Update e2e beta tests to cover confirm refactor changes.
danjm Jul 10, 2018
a7a6617
Fix signature request tests for compatability with confirm refactor.
danjm Jul 11, 2018
91eca55
Fix send integration tests for compatability with confirm refactor.
danjm Jul 11, 2018
e91d87e
Fix bug in test mock signature request methods.
danjm Jul 11, 2018
8912955
Wait for submitted tx list item amounts to match the expected before …
danjm Jul 11, 2018
05ee2b7
Reattempt to find network selector; wait for network selector dropdow…
danjm Jul 11, 2018
07322bc
Wait for an element with a .tx-list-pending-item-container to be rend…
danjm Jul 11, 2018
92fc87a
Merge pull request #4764 from MetaMask/i4404-confirm-refactor-with-e2…
danjm Jul 11, 2018
6701771
Fix font sizes, colors. Include data tab for send-eth transaction con…
alextsg Jul 12, 2018
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
24 changes: 24 additions & 0 deletions app/_locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
"message": "MetaMask",
"description": "The name of the application"
},
"approve": {
"message": "Approve"
},
"approved": {
"message": "Approved"
},
Expand Down Expand Up @@ -89,6 +92,9 @@
"buyCoinbaseExplainer": {
"message": "Coinbase is the world’s most popular way to buy and sell bitcoin, ethereum, and litecoin."
},
"bytes": {
"message": "Bytes"
},
"ok": {
"message": "Ok"
},
Expand Down Expand Up @@ -149,6 +155,9 @@
"copyContractAddress": {
"message": "Copy Contract Address"
},
"copyAddress": {
"message": "Copy address to clipboard"
},
"copyToClipboard": {
"message": "Copy to clipboard"
},
Expand Down Expand Up @@ -277,6 +286,9 @@
"enterPasswordContinue": {
"message": "Enter password to continue"
},
"parameters": {
"message": "Parameters"
},
"passwordNotLongEnough": {
"message": "Password not long enough"
},
Expand Down Expand Up @@ -318,6 +330,9 @@
"fromShapeShift": {
"message": "From ShapeShift"
},
"functionType": {
"message": "Function Type"
},
"gas": {
"message": "Gas",
"description": "Short indication of gas cost"
Expand Down Expand Up @@ -370,6 +385,9 @@
"hereList": {
"message": "Here's a list!!!!"
},
"hexData": {
"message": "Hex Data"
},
"hide": {
"message": "Hide"
},
Expand Down Expand Up @@ -582,6 +600,9 @@
"message": "or",
"description": "choice between creating or importing a new account"
},
"origin": {
"message": "Origin"
},
"password": {
"message": "Password"
},
Expand Down Expand Up @@ -911,6 +932,9 @@
"transactionNumber": {
"message": "Transaction Number"
},
"transfer": {
"message": "Transfer"
},
"transfers": {
"message": "Transfers"
},
Expand Down
14 changes: 14 additions & 0 deletions app/images/alert-red.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions app/images/alert.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions app/images/caret-left.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion app/scripts/controllers/network/enums.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const KOVAN = 'kovan'
const MAINNET = 'mainnet'
const LOCALHOST = 'localhost'

const MAINNET_CODE = 1
const ROPSTEN_CODE = 3
const RINKEYBY_CODE = 4
const KOVAN_CODE = 42
Expand All @@ -13,13 +14,13 @@ const RINKEBY_DISPLAY_NAME = 'Rinkeby'
const KOVAN_DISPLAY_NAME = 'Kovan'
const MAINNET_DISPLAY_NAME = 'Main Ethereum Network'


module.exports = {
ROPSTEN,
RINKEBY,
KOVAN,
MAINNET,
LOCALHOST,
MAINNET_CODE,
ROPSTEN_CODE,
RINKEYBY_CODE,
KOVAN_CODE,
Expand Down
2 changes: 1 addition & 1 deletion development/backGroundConnectionModifiers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = {
signPersonalMessage: (msgData, cb) => {
const stateUpdate = {
unapprovedPersonalMsgs: {},
unapprovedPersonalMsgsCount: 0,
unapprovedPersonalMsgCount: 0,
}
return cb(null, stateUpdate)
},
Expand Down
18 changes: 18 additions & 0 deletions development/states/confirm-new-ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,5 +156,23 @@
"fromDropdownOpen": false,
"toDropdownOpen": false,
"errors": {}
},
"confirmTransaction": {
"txData": {},
"tokenData": {},
"methodData": {},
"tokenProps": {
"tokenDecimals": "",
"tokenSymbol": ""
},
"fiatTransactionAmount": "",
"fiatTransactionFee": "",
"fiatTransactionTotal": "",
"ethTransactionAmount": "",
"ethTransactionFee": "",
"ethTransactionTotal": "",
"hexGasTotal": "",
"nonce": "",
"fetchingMethodData": false
}
}
37 changes: 32 additions & 5 deletions development/states/confirm-sig-requests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"from": "0x0d0c7188d9c72b019a5da9bca0d127680c22e658"
},
"status": "unapproved",
"time": 1537889069339,
"time": 1537889070000,
"type": "eth_sign"
}
},
Expand All @@ -86,11 +86,11 @@
"from": "0x0d0c7188d9c72b019a5da9bca0d127680c22e659"
},
"status": "unapproved",
"time": 1517889069339,
"time": 1537889065000,
"type": "personal_sign"
}
},
"unapprovedPersonalMsgCount": 0,
"unapprovedPersonalMsgCount": 1 ,
"unapprovedTypedMessages": {
"8997167822566869": {
"id": 8997167822566869,
Expand All @@ -102,7 +102,7 @@
"from": "0x0d0c7188d9c72b019a5da9bca0d127680c22e659"
},
"status": "unapproved",
"time": 1617889069339,
"time": 1537889060000,
"type": "eth_signTypedData"
}
},
Expand Down Expand Up @@ -172,5 +172,32 @@
"scrollToBottom": false,
"forgottenPassword": null
},
"identities": {}
"identities": {},
"confirmTransaction": {
"txData": {
"id": 8927167822566864,
"msgParams": {
"data": "0x879a053d4800c6354e76c7985a865d2922c82fb5b3f4577b2fe08b998954f2e0",
"from": "0x0d0c7188d9c72b019a5da9bca0d127680c22e658"
},
"status": "unapproved",
"time": 1537889069339,
"type": "eth_sign"
},
"tokenData": {},
"methodData": {},
"tokenProps": {
"tokenDecimals": "",
"tokenSymbol": ""
},
"fiatTransactionAmount": "",
"fiatTransactionFee": "",
"fiatTransactionTotal": "",
"ethTransactionAmount": "",
"ethTransactionFee": "",
"ethTransactionTotal": "",
"hexGasTotal": "",
"nonce": "",
"fetchingMethodData": false
}
}
20 changes: 19 additions & 1 deletion development/states/currency-localization.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,5 +130,23 @@
"scrollToBottom": false,
"forgottenPassword": null
},
"identities": {}
"identities": {},
"confirmTransaction": {
"txData": {},
"tokenData": {},
"methodData": {},
"tokenProps": {
"tokenDecimals": "",
"tokenSymbol": ""
},
"fiatTransactionAmount": "",
"fiatTransactionFee": "",
"fiatTransactionTotal": "",
"ethTransactionAmount": "",
"ethTransactionFee": "",
"ethTransactionTotal": "",
"hexGasTotal": "",
"nonce": "",
"fetchingMethodData": false
}
}
20 changes: 19 additions & 1 deletion development/states/first-time.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,23 @@
}
},
"identities": {},
"computedBalances": {}
"computedBalances": {},
"confirmTransaction": {
"txData": {},
"tokenData": {},
"methodData": {},
"tokenProps": {
"tokenDecimals": "",
"tokenSymbol": ""
},
"fiatTransactionAmount": "",
"fiatTransactionFee": "",
"fiatTransactionTotal": "",
"ethTransactionAmount": "",
"ethTransactionFee": "",
"ethTransactionTotal": "",
"hexGasTotal": "",
"nonce": "",
"fetchingMethodData": false
}
}
18 changes: 18 additions & 0 deletions development/states/send-edit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,5 +156,23 @@
"fromDropdownOpen": false,
"toDropdownOpen": false,
"errors": {}
},
"confirmTransaction": {
"txData": {},
"tokenData": {},
"methodData": {},
"tokenProps": {
"tokenDecimals": "",
"tokenSymbol": ""
},
"fiatTransactionAmount": "",
"fiatTransactionFee": "",
"fiatTransactionTotal": "",
"ethTransactionAmount": "",
"ethTransactionFee": "",
"ethTransactionTotal": "",
"hexGasTotal": "",
"nonce": "",
"fetchingMethodData": false
}
}
18 changes: 18 additions & 0 deletions development/states/send-new-ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,23 @@
"fromDropdownOpen": false,
"toDropdownOpen": false,
"errors": {}
},
"confirmTransaction": {
"txData": {},
"tokenData": {},
"methodData": {},
"tokenProps": {
"tokenDecimals": "",
"tokenSymbol": ""
},
"fiatTransactionAmount": "",
"fiatTransactionFee": "",
"fiatTransactionTotal": "",
"ethTransactionAmount": "",
"ethTransactionFee": "",
"ethTransactionTotal": "",
"hexGasTotal": "",
"nonce": "",
"fetchingMethodData": false
}
}
Loading