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

[FEAT] Improve transaction state management for custom networks #3155

Merged
merged 21 commits into from
Sep 23, 2021
Merged

[FEAT] Improve transaction state management for custom networks #3155

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6cb9ea4
Add transaction controller update
Sep 21, 2021
200d46f
Update tarball
Sep 21, 2021
b3c122c
Rm outdated tarball
Sep 21, 2021
3a58b68
Merge branch 'develop' into feat/tx-state-custom-chains
Sep 21, 2021
416cd47
Merge branch 'develop' into feat/tx-state-custom-chains
Sep 21, 2021
866d377
Merge branch 'develop' into feat/tx-state-custom-chains
Sep 21, 2021
b67d530
Update tarball
Sep 21, 2021
77792ea
feat(Transactions): Add gasUsed to transactions history
Sep 21, 2021
d76a4ea
Merge branch 'develop' into feat/tx-state-custom-chains
Sep 21, 2021
e9f4e5a
Merge branch 'develop' into feat/tx-state-custom-chains
Sep 22, 2021
ab9eb25
Update tarball
Sep 22, 2021
2354712
Merge branch 'feat/tx-state-custom-chains' of https://github.com/Meta…
Sep 22, 2021
211ba7d
Update tarball
Sep 22, 2021
9f85070
Merge branch 'develop' into feat/tx-state-custom-chains
Sep 22, 2021
02ff553
Rm tarball
Sep 23, 2021
d6a9f1d
Rm unwanted change
Sep 23, 2021
1d882ac
Merge branch 'develop' into feat/tx-state-custom-chains
Sep 23, 2021
1781058
Merge branch 'develop' into feat/tx-state-custom-chains
Sep 23, 2021
36db15a
Change controllers version
Sep 23, 2021
819ea1f
Merge branch 'feat/tx-state-custom-chains' of https://github.com/Meta…
Sep 23, 2021
e3ab3c8
Change controllers version
Sep 23, 2021
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
2 changes: 1 addition & 1 deletion app/components/UI/TransactionElement/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function calculateTotalGas(transaction) {

if (isEIP1559Transaction(transaction)) {
const eip1559GasHex = calculateEIP1559GasFeeHexes({
gasLimitHex: gas,
gasLimitHex: gasUsed || gas,
estimatedBaseFeeHex: estimatedBaseFee || '0x0',
suggestedMaxPriorityFeePerGasHex: maxPriorityFeePerGas,
suggestedMaxFeePerGasHex: maxFeePerGas,
Expand Down
Binary file added metamask-controllers-v15.1.0-tx-state-v9.tgz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"dependencies": {
"@exodus/react-native-payments": "https://github.com/wachunei/react-native-payments.git#package-json-hack",
"@metamask/contract-metadata": "^1.29.0",
"@metamask/controllers": "^15.1.0",
"@metamask/controllers": "./metamask-controllers-v15.1.0-tx-state-v9.tgz",
"@metamask/etherscan-link": "^2.0.0",
"@metamask/swaps-controller": "^6.3.0",
"@react-native-clipboard/clipboard": "^1.8.4",
Expand Down