Skip to content

Commit 0080a0f

Browse files
NicolasMassartNicolasMassart
authored
Merge branch 'main' into chore/provider-middleware-filters-2
2 parents c027ead + 715476c commit 0080a0f

6 files changed

Lines changed: 87 additions & 25 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,68 @@
22

33
## Current Main Branch
44

5+
## 7.37.0 - Nov 28, 2024
6+
### Added
7+
- [#12091](https://github.com/MetaMask/metamask-mobile/pull/12091): feat: 2020 Add a performance test for iOS in Bitrise (#12091)
8+
- [#12148](https://github.com/MetaMask/metamask-mobile/pull/12148): feat: Enable smart transactions for new users (#12148)
9+
- [#12442](https://github.com/MetaMask/metamask-mobile/pull/12442): test: add a new unit test to cover for multichain feature flags ON (#12442)
10+
- [#12420](https://github.com/MetaMask/metamask-mobile/pull/12420): feat(3598): non permitted chain flow small improvements (#12420)
11+
- [#12198](https://github.com/MetaMask/metamask-mobile/pull/12198): feat: custom names for snap accounts (Flask only) (#12198)
12+
- [#12396](https://github.com/MetaMask/metamask-mobile/pull/12396): feat(ramp): enable buy button in asset overview (#12396)
13+
- [#11613](https://github.com/MetaMask/metamask-mobile/pull/11613): feat(ramp): improve amount editing formatting (#11613)
14+
- [#12393](https://github.com/MetaMask/metamask-mobile/pull/12393): feat: Creating data tree for signed type V1 signatures (#12393)
15+
- [#12160](https://github.com/MetaMask/metamask-mobile/pull/12160): feat: Integrate NFT api to display image & names in simulations includes `erc721`s (#12160)
16+
- [#12324](https://github.com/MetaMask/metamask-mobile/pull/12324): feat: confirmation re-designs add basic page for types sign V1 signature request (#12324)
17+
- [#11424](https://github.com/MetaMask/metamask-mobile/pull/11424): feat: add workflow for updating automated test results in TestRail (#11424)
18+
- [#12337](https://github.com/MetaMask/metamask-mobile/pull/12337): feat: updated staking events to use withMetaMetrics helper (#12337)
19+
- [#12363](https://github.com/MetaMask/metamask-mobile/pull/12363): feat: add PooledStaking slice for managing staking state (#12363)
20+
- [#12398](https://github.com/MetaMask/metamask-mobile/pull/12398): feat: limit input digits to 12 in useInputHandler (#12398)
21+
- [#12344](https://github.com/MetaMask/metamask-mobile/pull/12344): feat: upgrade assets controllers to v44 (#12344)
22+
- [#12340](https://github.com/MetaMask/metamask-mobile/pull/12340): feat: upgrade assets controllers to version 43 (#12340)
23+
- [#12270](https://github.com/MetaMask/metamask-mobile/pull/12270): feat: upgrade assets controllers to 42 with multichain token rates (#12270)
24+
- [#12452](https://github.com/MetaMask/metamask-mobile/pull/12452): feat: updated staking events to use withMetaMetrics helper (#12337) (#12452)
25+
26+
### Changed
27+
- [#12356](https://github.com/MetaMask/metamask-mobile/pull/12356): chore: Remove unnecessary event prop (#12356)
28+
- [#12425](https://github.com/MetaMask/metamask-mobile/pull/12425): ci: create ci workflow for multichain flow (#12425)
29+
- [#12350](https://github.com/MetaMask/metamask-mobile/pull/12350): chore: Bump Snaps packages (#12350)
30+
- [#11409](https://github.com/MetaMask/metamask-mobile/pull/11409): refactor: use `withKeyring` to batch account restore operation (#11409)
31+
- [#12339](https://github.com/MetaMask/metamask-mobile/pull/12339): chore: Update accounts-controller @v19.0.0 and keyring-controller @v18.0.0 (#12339)
32+
- [#12440](https://github.com/MetaMask/metamask-mobile/pull/12440): chore(ramp): upgrade sdk to 1.28.7 (#12440)
33+
- [#12351](https://github.com/MetaMask/metamask-mobile/pull/12351): refactor(ramp): remove anonymous events (#12351)
34+
- [#12355](https://github.com/MetaMask/metamask-mobile/pull/12355): chore: Add missing confirmation unit tests (#12355)
35+
- [#12369](https://github.com/MetaMask/metamask-mobile/pull/12369): chore: upgrade transaction controller to increase polling rate (#12369)
36+
- [#12202](https://github.com/MetaMask/metamask-mobile/pull/12202): refactor: update swaps quote poll count (#12202)
37+
- [#10743](https://github.com/MetaMask/metamask-mobile/pull/10743): chore: @metamask/swaps-controller v9 -> v10 (#10743)
38+
- [#12415](https://github.com/MetaMask/metamask-mobile/pull/12415): chore: Cherry pick 2506358 (merge in trackEvent work) (#12415)
39+
- [#12238](https://github.com/MetaMask/metamask-mobile/pull/12238): chore: update codeowners (#12238)
40+
- [#12416](https://github.com/MetaMask/metamask-mobile/pull/12416): chore: Chore/update accounts controller messenger code owner (#12416)
41+
- [#12366](https://github.com/MetaMask/metamask-mobile/pull/12366): chore: #12184 MVP split engine file (#12366)
42+
- [#12362](https://github.com/MetaMask/metamask-mobile/pull/12362): chore: Unit tests for tags approval controller undefined (#12362)
43+
- [#12343](https://github.com/MetaMask/metamask-mobile/pull/12343): chore: Cherry pick f35d583 (#12343)
44+
- [#12332](https://github.com/MetaMask/metamask-mobile/pull/12332): chore: do not show staked eth balance when balance is zero on homepage or asset detail (#12332)
45+
- [#12413](https://github.com/MetaMask/metamask-mobile/pull/12413): chore: simplify cicd rls script (#12413)
46+
- [#12334](https://github.com/MetaMask/metamask-mobile/pull/12334): chore: updating filter icon (#12334)
47+
48+
### Fixed
49+
- [#12313](https://github.com/MetaMask/metamask-mobile/pull/12313): fix: Remove run all tests section (#12313)
50+
- [#12489](https://github.com/MetaMask/metamask-mobile/pull/12489): fix: replace end of navigation init and UIStartup span (#12489)
51+
- [#12331](https://github.com/MetaMask/metamask-mobile/pull/12331): fix: tags pending approvals receiving undefined (#12331)
52+
- [#10486](https://github.com/MetaMask/metamask-mobile/pull/10486): fix: limit ReactNativeWebview message size (#10486)
53+
- [#12478](https://github.com/MetaMask/metamask-mobile/pull/12478): fix: incorrect event source in analytics and connection (#12478)
54+
- [#10786](https://github.com/MetaMask/metamask-mobile/pull/10786): fix: added icon to walletconnect metadata (#10786)
55+
- [#12455](https://github.com/MetaMask/metamask-mobile/pull/12455): fix: gas fee edit from swaps (#12455)
56+
- [#12370](https://github.com/MetaMask/metamask-mobile/pull/12370): fix: Fix copy of ""Network fee"" on approval (#12370)
57+
- [#12273](https://github.com/MetaMask/metamask-mobile/pull/12273): fix: Disable confirm button if `transactionMeta` is undefined (#12273)
58+
- [#12367](https://github.com/MetaMask/metamask-mobile/pull/12367): fix: app crashing after send or swap (#12367)
59+
- [#12446](https://github.com/MetaMask/metamask-mobile/pull/12446): fix: update wallet_addEthereumChain.js with correct MetricsEventBuilder (#12446)
60+
- [#12180](https://github.com/MetaMask/metamask-mobile/pull/12180): fix: trackevent enabled is undefined (#12180)
61+
- [#12315](https://github.com/MetaMask/metamask-mobile/pull/12315): fix: e2e: ensure Decrypt button is displayed (#12315)
62+
- [#12402](https://github.com/MetaMask/metamask-mobile/pull/12402): fix: fix missing variable patch (#12402)
63+
- [#12319](https://github.com/MetaMask/metamask-mobile/pull/12319): fix: hide rpc url selector for networks with one rpc (#12319)
64+
- [#12371](https://github.com/MetaMask/metamask-mobile/pull/12371): fix: fix patch missing variable sentry error (#12371)
65+
- [#12375](https://github.com/MetaMask/metamask-mobile/pull/12375): fix: breaking selector due to missing controller state (#12375)
66+
567
## 7.36.0 - Nov 15, 2024
668
### Added
769
- [#12015](https://github.com/MetaMask/metamask-mobile/pull/12015): feat: 1957 crash screen redesign (#12015)

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ android {
178178
applicationId "io.metamask"
179179
minSdkVersion rootProject.ext.minSdkVersion
180180
targetSdkVersion rootProject.ext.targetSdkVersion
181-
versionCode 1505
182-
versionName "7.36.0"
181+
versionName "7.37.0"
182+
versionCode 1512
183183
testBuildType System.getProperty('testBuildType', 'debug')
184184
missingDimensionStrategy 'react-native-camera', 'general'
185185
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

‎app/core/Engine/Engine.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,7 @@ export class Engine {
11731173

11741174
return Boolean(
11751175
hasProperty(showIncomingTransactions, currentChainId) &&
1176-
showIncomingTransactions?.[currentHexChainId],
1176+
showIncomingTransactions?.[currentHexChainId],
11771177
);
11781178
},
11791179
updateTransactions: true,
@@ -1780,7 +1780,7 @@ export class Engine {
17801780

17811781
const tokenBalances =
17821782
allTokenBalances?.[selectedInternalAccount.address as Hex]?.[
1783-
chainId
1783+
chainId
17841784
] ?? {};
17851785
tokens.forEach(
17861786
(item: { address: string; balance?: string; decimals: number }) => {
@@ -1791,9 +1791,9 @@ export class Engine {
17911791
item.balance ||
17921792
(item.address in tokenBalances
17931793
? renderFromTokenMinimalUnit(
1794-
tokenBalances[item.address as Hex],
1795-
item.decimals,
1796-
)
1794+
tokenBalances[item.address as Hex],
1795+
item.decimals,
1796+
)
17971797
: undefined);
17981798
const tokenBalanceFiat = balanceToFiatNumber(
17991799
// TODO: Fix this by handling or eliminating the undefined case

‎bitrise.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1781,16 +1781,16 @@ app:
17811781
PROJECT_LOCATION_IOS: ios
17821782
- opts:
17831783
is_expand: false
1784-
VERSION_NAME: 7.36.0
1784+
VERSION_NAME: 7.37.0
17851785
- opts:
17861786
is_expand: false
1787-
VERSION_NUMBER: 1505
1787+
VERSION_NUMBER: 1512
17881788
- opts:
17891789
is_expand: false
1790-
FLASK_VERSION_NAME: 7.36.0
1790+
FLASK_VERSION_NAME: 7.37.0
17911791
- opts:
17921792
is_expand: false
1793-
FLASK_VERSION_NUMBER: 1505
1793+
FLASK_VERSION_NUMBER: 1512
17941794
- opts:
17951795
is_expand: false
17961796
ANDROID_APK_LINK: ''

‎ios/MetaMask.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,7 +1380,7 @@
13801380
CODE_SIGN_IDENTITY = "Apple Development";
13811381
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
13821382
CODE_SIGN_STYLE = Manual;
1383-
CURRENT_PROJECT_VERSION = 1505;
1383+
CURRENT_PROJECT_VERSION = 1512;
13841384
DEAD_CODE_STRIPPING = YES;
13851385
DEBUG_INFORMATION_FORMAT = dwarf;
13861386
DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1418,7 +1418,7 @@
14181418
"${inherited}",
14191419
);
14201420
LLVM_LTO = YES;
1421-
MARKETING_VERSION = 7.36.0;
1421+
MARKETING_VERSION = 7.37.0;
14221422
ONLY_ACTIVE_ARCH = YES;
14231423
OTHER_CFLAGS = "$(inherited)";
14241424
OTHER_LDFLAGS = (
@@ -1449,7 +1449,7 @@
14491449
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
14501450
CODE_SIGN_IDENTITY = "iPhone Distribution";
14511451
CODE_SIGN_STYLE = Manual;
1452-
CURRENT_PROJECT_VERSION = 1505;
1452+
CURRENT_PROJECT_VERSION = 1512;
14531453
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
14541454
DEVELOPMENT_TEAM = 48XVW22RCG;
14551455
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1484,7 +1484,7 @@
14841484
"${inherited}",
14851485
);
14861486
LLVM_LTO = YES;
1487-
MARKETING_VERSION = 7.36.0;
1487+
MARKETING_VERSION = 7.37.0;
14881488
ONLY_ACTIVE_ARCH = NO;
14891489
OTHER_CFLAGS = "$(inherited)";
14901490
OTHER_LDFLAGS = (
@@ -1514,7 +1514,7 @@
15141514
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
15151515
CODE_SIGN_IDENTITY = "Apple Development";
15161516
CODE_SIGN_STYLE = Automatic;
1517-
CURRENT_PROJECT_VERSION = 1505;
1517+
CURRENT_PROJECT_VERSION = 1512;
15181518
DEAD_CODE_STRIPPING = YES;
15191519
DEBUG_INFORMATION_FORMAT = dwarf;
15201520
DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1547,7 +1547,7 @@
15471547
);
15481548
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
15491549
LLVM_LTO = YES;
1550-
MARKETING_VERSION = 7.36.0;
1550+
MARKETING_VERSION = 7.37.0;
15511551
ONLY_ACTIVE_ARCH = YES;
15521552
OTHER_CFLAGS = "$(inherited)";
15531553
OTHER_LDFLAGS = (
@@ -1576,7 +1576,7 @@
15761576
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
15771577
CODE_SIGN_IDENTITY = "iPhone Distribution";
15781578
CODE_SIGN_STYLE = Manual;
1579-
CURRENT_PROJECT_VERSION = 1505;
1579+
CURRENT_PROJECT_VERSION = 1512;
15801580
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
15811581
DEVELOPMENT_TEAM = 48XVW22RCG;
15821582
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1607,7 +1607,7 @@
16071607
);
16081608
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
16091609
LLVM_LTO = YES;
1610-
MARKETING_VERSION = 7.36.0;
1610+
MARKETING_VERSION = 7.37.0;
16111611
ONLY_ACTIVE_ARCH = NO;
16121612
OTHER_CFLAGS = "$(inherited)";
16131613
OTHER_LDFLAGS = (
@@ -1731,7 +1731,7 @@
17311731
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
17321732
CODE_SIGN_IDENTITY = "Apple Development";
17331733
CODE_SIGN_STYLE = Automatic;
1734-
CURRENT_PROJECT_VERSION = 1505;
1734+
CURRENT_PROJECT_VERSION = 1512;
17351735
DEAD_CODE_STRIPPING = YES;
17361736
DEBUG_INFORMATION_FORMAT = dwarf;
17371737
DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1768,7 +1768,7 @@
17681768
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
17691769
);
17701770
LLVM_LTO = YES;
1771-
MARKETING_VERSION = 7.36.0;
1771+
MARKETING_VERSION = 7.37.0;
17721772
ONLY_ACTIVE_ARCH = YES;
17731773
OTHER_CFLAGS = (
17741774
"$(inherited)",
@@ -1800,7 +1800,7 @@
18001800
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
18011801
CODE_SIGN_IDENTITY = "iPhone Distribution";
18021802
CODE_SIGN_STYLE = Manual;
1803-
CURRENT_PROJECT_VERSION = 1505;
1803+
CURRENT_PROJECT_VERSION = 1512;
18041804
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
18051805
DEVELOPMENT_TEAM = 48XVW22RCG;
18061806
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1835,7 +1835,7 @@
18351835
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
18361836
);
18371837
LLVM_LTO = YES;
1838-
MARKETING_VERSION = 7.36.0;
1838+
MARKETING_VERSION = 7.37.0;
18391839
ONLY_ACTIVE_ARCH = NO;
18401840
OTHER_CFLAGS = (
18411841
"$(inherited)",

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "metamask",
3-
"version": "7.36.0",
3+
"version": "7.37.0",
44
"private": true,
55
"scripts": {
66
"audit:ci": "./scripts/yarn-audit.sh",
@@ -605,4 +605,4 @@
605605
}
606606
},
607607
"packageManager": "yarn@1.22.22"
608-
}
608+
}

0 commit comments

Comments
 (0)