Skip to content

Commit 7a3d9e2

Browse files
matthewwalsh0matthewwalsh0
authored
Cancel transaction signing from activity list (#22676)
Transactions that are being signed are displayed with the `Signing` status in the activity list for additional clarity. The standard `Cancel` button in the activity list will now cancel the signing process for a transaction and mark it as failed. While a transaction is being signed and submitted, subsequent transactions will display an error in the confirmation and the `Confirm` button will be disabled.
1 parent bd34bc5 commit 7a3d9e2

File tree

26 files changed

+386
-277
lines changed

26 files changed

+386
-277
lines changed

‎app/_locales/en/messages.json‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/scripts/metamask-controller.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3015,6 +3015,8 @@ export default class MetamaskController extends EventEmitter {
30153015
txController.updateTransactionSendFlowHistory.bind(txController),
30163016
updatePreviousGasParams:
30173017
txController.updatePreviousGasParams.bind(txController),
3018+
abortTransactionSigning:
3019+
txController.abortTransactionSigning.bind(txController),
30183020

30193021
// decryptMessageController
30203022
decryptMessage: this.decryptMessageController.decryptMessage.bind(

‎lavamoat/browserify/beta/policy.json‎

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@
725725
"packages": {
726726
"@metamask/address-book-controller>@metamask/controller-utils>@metamask/utils": true,
727727
"@metamask/controller-utils>@spruceid/siwe-parser": true,
728-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
728+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": true,
729729
"browserify>buffer": true,
730730
"eslint>fast-deep-equal": true,
731731
"eth-ens-namehash": true,
@@ -1434,6 +1434,12 @@
14341434
"immer": true
14351435
}
14361436
},
1437+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": {
1438+
"packages": {
1439+
"@metamask/ethjs>number-to-bn": true,
1440+
"bn.js": true
1441+
}
1442+
},
14371443
"@metamask/logo": {
14381444
"globals": {
14391445
"addEventListener": true,
@@ -1450,8 +1456,8 @@
14501456
},
14511457
"@metamask/message-manager": {
14521458
"packages": {
1453-
"@metamask/message-manager>@metamask/base-controller": true,
1454-
"@metamask/message-manager>@metamask/controller-utils": true,
1459+
"@metamask/base-controller": true,
1460+
"@metamask/controller-utils": true,
14551461
"@metamask/message-manager>@metamask/eth-sig-util": true,
14561462
"@metamask/message-manager>jsonschema": true,
14571463
"browserify>buffer": true,
@@ -1460,37 +1466,6 @@
14601466
"webpack>events": true
14611467
}
14621468
},
1463-
"@metamask/message-manager>@metamask/base-controller": {
1464-
"globals": {
1465-
"setTimeout": true
1466-
},
1467-
"packages": {
1468-
"immer": true
1469-
}
1470-
},
1471-
"@metamask/message-manager>@metamask/controller-utils": {
1472-
"globals": {
1473-
"URL": true,
1474-
"console.error": true,
1475-
"fetch": true,
1476-
"setTimeout": true
1477-
},
1478-
"packages": {
1479-
"@metamask/controller-utils>@spruceid/siwe-parser": true,
1480-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
1481-
"@metamask/utils": true,
1482-
"browserify>buffer": true,
1483-
"eslint>fast-deep-equal": true,
1484-
"eth-ens-namehash": true,
1485-
"ethereumjs-util": true
1486-
}
1487-
},
1488-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": {
1489-
"packages": {
1490-
"@metamask/ethjs>number-to-bn": true,
1491-
"bn.js": true
1492-
}
1493-
},
14941469
"@metamask/message-manager>@metamask/eth-sig-util": {
14951470
"packages": {
14961471
"@ethereumjs/tx>@ethereumjs/util": true,
@@ -1802,7 +1777,7 @@
18021777
},
18031778
"packages": {
18041779
"@metamask/controller-utils>@spruceid/siwe-parser": true,
1805-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
1780+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": true,
18061781
"@metamask/utils": true,
18071782
"browserify>buffer": true,
18081783
"eslint>fast-deep-equal": true,
@@ -1847,7 +1822,7 @@
18471822
},
18481823
"packages": {
18491824
"@metamask/controller-utils>@spruceid/siwe-parser": true,
1850-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
1825+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": true,
18511826
"@metamask/utils": true,
18521827
"browserify>buffer": true,
18531828
"eslint>fast-deep-equal": true,

‎lavamoat/browserify/desktop/policy.json‎

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@
725725
"packages": {
726726
"@metamask/address-book-controller>@metamask/controller-utils>@metamask/utils": true,
727727
"@metamask/controller-utils>@spruceid/siwe-parser": true,
728-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
728+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": true,
729729
"browserify>buffer": true,
730730
"eslint>fast-deep-equal": true,
731731
"eth-ens-namehash": true,
@@ -1511,6 +1511,12 @@
15111511
"immer": true
15121512
}
15131513
},
1514+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": {
1515+
"packages": {
1516+
"@metamask/ethjs>number-to-bn": true,
1517+
"bn.js": true
1518+
}
1519+
},
15141520
"@metamask/logo": {
15151521
"globals": {
15161522
"addEventListener": true,
@@ -1527,8 +1533,8 @@
15271533
},
15281534
"@metamask/message-manager": {
15291535
"packages": {
1530-
"@metamask/message-manager>@metamask/base-controller": true,
1531-
"@metamask/message-manager>@metamask/controller-utils": true,
1536+
"@metamask/base-controller": true,
1537+
"@metamask/controller-utils": true,
15321538
"@metamask/message-manager>@metamask/eth-sig-util": true,
15331539
"@metamask/message-manager>jsonschema": true,
15341540
"browserify>buffer": true,
@@ -1537,37 +1543,6 @@
15371543
"webpack>events": true
15381544
}
15391545
},
1540-
"@metamask/message-manager>@metamask/base-controller": {
1541-
"globals": {
1542-
"setTimeout": true
1543-
},
1544-
"packages": {
1545-
"immer": true
1546-
}
1547-
},
1548-
"@metamask/message-manager>@metamask/controller-utils": {
1549-
"globals": {
1550-
"URL": true,
1551-
"console.error": true,
1552-
"fetch": true,
1553-
"setTimeout": true
1554-
},
1555-
"packages": {
1556-
"@metamask/controller-utils>@spruceid/siwe-parser": true,
1557-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
1558-
"@metamask/utils": true,
1559-
"browserify>buffer": true,
1560-
"eslint>fast-deep-equal": true,
1561-
"eth-ens-namehash": true,
1562-
"ethereumjs-util": true
1563-
}
1564-
},
1565-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": {
1566-
"packages": {
1567-
"@metamask/ethjs>number-to-bn": true,
1568-
"bn.js": true
1569-
}
1570-
},
15711546
"@metamask/message-manager>@metamask/eth-sig-util": {
15721547
"packages": {
15731548
"@ethereumjs/tx>@ethereumjs/util": true,
@@ -1943,7 +1918,7 @@
19431918
},
19441919
"packages": {
19451920
"@metamask/controller-utils>@spruceid/siwe-parser": true,
1946-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
1921+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": true,
19471922
"@metamask/utils": true,
19481923
"browserify>buffer": true,
19491924
"eslint>fast-deep-equal": true,
@@ -1988,7 +1963,7 @@
19881963
},
19891964
"packages": {
19901965
"@metamask/controller-utils>@spruceid/siwe-parser": true,
1991-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
1966+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": true,
19921967
"@metamask/utils": true,
19931968
"browserify>buffer": true,
19941969
"eslint>fast-deep-equal": true,

‎lavamoat/browserify/flask/policy.json‎

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@
725725
"packages": {
726726
"@metamask/address-book-controller>@metamask/controller-utils>@metamask/utils": true,
727727
"@metamask/controller-utils>@spruceid/siwe-parser": true,
728-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
728+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": true,
729729
"browserify>buffer": true,
730730
"eslint>fast-deep-equal": true,
731731
"eth-ens-namehash": true,
@@ -1511,6 +1511,12 @@
15111511
"immer": true
15121512
}
15131513
},
1514+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": {
1515+
"packages": {
1516+
"@metamask/ethjs>number-to-bn": true,
1517+
"bn.js": true
1518+
}
1519+
},
15141520
"@metamask/logo": {
15151521
"globals": {
15161522
"addEventListener": true,
@@ -1527,8 +1533,8 @@
15271533
},
15281534
"@metamask/message-manager": {
15291535
"packages": {
1530-
"@metamask/message-manager>@metamask/base-controller": true,
1531-
"@metamask/message-manager>@metamask/controller-utils": true,
1536+
"@metamask/base-controller": true,
1537+
"@metamask/controller-utils": true,
15321538
"@metamask/message-manager>@metamask/eth-sig-util": true,
15331539
"@metamask/message-manager>jsonschema": true,
15341540
"browserify>buffer": true,
@@ -1537,37 +1543,6 @@
15371543
"webpack>events": true
15381544
}
15391545
},
1540-
"@metamask/message-manager>@metamask/base-controller": {
1541-
"globals": {
1542-
"setTimeout": true
1543-
},
1544-
"packages": {
1545-
"immer": true
1546-
}
1547-
},
1548-
"@metamask/message-manager>@metamask/controller-utils": {
1549-
"globals": {
1550-
"URL": true,
1551-
"console.error": true,
1552-
"fetch": true,
1553-
"setTimeout": true
1554-
},
1555-
"packages": {
1556-
"@metamask/controller-utils>@spruceid/siwe-parser": true,
1557-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
1558-
"@metamask/utils": true,
1559-
"browserify>buffer": true,
1560-
"eslint>fast-deep-equal": true,
1561-
"eth-ens-namehash": true,
1562-
"ethereumjs-util": true
1563-
}
1564-
},
1565-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": {
1566-
"packages": {
1567-
"@metamask/ethjs>number-to-bn": true,
1568-
"bn.js": true
1569-
}
1570-
},
15711546
"@metamask/message-manager>@metamask/eth-sig-util": {
15721547
"packages": {
15731548
"@ethereumjs/tx>@ethereumjs/util": true,
@@ -1979,7 +1954,7 @@
19791954
},
19801955
"packages": {
19811956
"@metamask/controller-utils>@spruceid/siwe-parser": true,
1982-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
1957+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": true,
19831958
"@metamask/utils": true,
19841959
"browserify>buffer": true,
19851960
"eslint>fast-deep-equal": true,
@@ -2024,7 +1999,7 @@
20241999
},
20252000
"packages": {
20262001
"@metamask/controller-utils>@spruceid/siwe-parser": true,
2027-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
2002+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": true,
20282003
"@metamask/utils": true,
20292004
"browserify>buffer": true,
20302005
"eslint>fast-deep-equal": true,

‎lavamoat/browserify/main/policy.json‎

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@
725725
"packages": {
726726
"@metamask/address-book-controller>@metamask/controller-utils>@metamask/utils": true,
727727
"@metamask/controller-utils>@spruceid/siwe-parser": true,
728-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
728+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": true,
729729
"browserify>buffer": true,
730730
"eslint>fast-deep-equal": true,
731731
"eth-ens-namehash": true,
@@ -1434,6 +1434,12 @@
14341434
"immer": true
14351435
}
14361436
},
1437+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": {
1438+
"packages": {
1439+
"@metamask/ethjs>number-to-bn": true,
1440+
"bn.js": true
1441+
}
1442+
},
14371443
"@metamask/logo": {
14381444
"globals": {
14391445
"addEventListener": true,
@@ -1450,8 +1456,8 @@
14501456
},
14511457
"@metamask/message-manager": {
14521458
"packages": {
1453-
"@metamask/message-manager>@metamask/base-controller": true,
1454-
"@metamask/message-manager>@metamask/controller-utils": true,
1459+
"@metamask/base-controller": true,
1460+
"@metamask/controller-utils": true,
14551461
"@metamask/message-manager>@metamask/eth-sig-util": true,
14561462
"@metamask/message-manager>jsonschema": true,
14571463
"browserify>buffer": true,
@@ -1460,37 +1466,6 @@
14601466
"webpack>events": true
14611467
}
14621468
},
1463-
"@metamask/message-manager>@metamask/base-controller": {
1464-
"globals": {
1465-
"setTimeout": true
1466-
},
1467-
"packages": {
1468-
"immer": true
1469-
}
1470-
},
1471-
"@metamask/message-manager>@metamask/controller-utils": {
1472-
"globals": {
1473-
"URL": true,
1474-
"console.error": true,
1475-
"fetch": true,
1476-
"setTimeout": true
1477-
},
1478-
"packages": {
1479-
"@metamask/controller-utils>@spruceid/siwe-parser": true,
1480-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
1481-
"@metamask/utils": true,
1482-
"browserify>buffer": true,
1483-
"eslint>fast-deep-equal": true,
1484-
"eth-ens-namehash": true,
1485-
"ethereumjs-util": true
1486-
}
1487-
},
1488-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": {
1489-
"packages": {
1490-
"@metamask/ethjs>number-to-bn": true,
1491-
"bn.js": true
1492-
}
1493-
},
14941469
"@metamask/message-manager>@metamask/eth-sig-util": {
14951470
"packages": {
14961471
"@ethereumjs/tx>@ethereumjs/util": true,
@@ -1902,7 +1877,7 @@
19021877
},
19031878
"packages": {
19041879
"@metamask/controller-utils>@spruceid/siwe-parser": true,
1905-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
1880+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": true,
19061881
"@metamask/utils": true,
19071882
"browserify>buffer": true,
19081883
"eslint>fast-deep-equal": true,
@@ -1947,7 +1922,7 @@
19471922
},
19481923
"packages": {
19491924
"@metamask/controller-utils>@spruceid/siwe-parser": true,
1950-
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
1925+
"@metamask/logging-controller>@metamask/controller-utils>ethjs-unit": true,
19511926
"@metamask/utils": true,
19521927
"browserify>buffer": true,
19531928
"eslint>fast-deep-equal": true,

0 commit comments

Comments
 (0)