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

Jump to bottom

7.24.3 #10043

Merged
merged 46 commits into from
Jun 21, 2024
Merged

7.24.3 #10043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
9cbca83
7.24.0
metamaskbot May 29, 2024
edee6ef
updated changelog
sethkfman May 29, 2024
083fac4
chore: cherry-pick #9781 (#9806)
github-actions[bot] May 30, 2024
6e6495f
chore: merge 7.23.0 tag (#9809)
sethkfman May 31, 2024
df78df3
chore: cherry-pick #9674 (#9822)
github-actions[bot] Jun 3, 2024
2c1c85e
chore: cherry-pick #9831 (#9837)
github-actions[bot] Jun 3, 2024
4625592
fix: cherry-pick balance issue (#9835)
tommasini Jun 3, 2024
a401ab3
chore: cherry-pick #9755 (#9846)
github-actions[bot] Jun 4, 2024
be3f9b1
chore: swap view crash fetching quotes (#9865)
tommasini Jun 5, 2024
2b84a9f
Cherry-pick: feat: Add the "Manage in settings" link for the STX Opt …
dan437 Jun 5, 2024
f954e56
fix: Cherry pick of e2e fixes from main (#9869)
Andepande Jun 5, 2024
7554fd4
fix: yarn deduplicate release/7.24.0 to fix dupe in #9864 (#9870)
dbrans Jun 5, 2024
b6a486e
fix: Release/7.24.0 cherry missing chain (#9872)
Andepande Jun 5, 2024
19c01f7
chore: cherry-pick #9867 (#9892)
github-actions[bot] Jun 6, 2024
112007d
fix: upgrade test failure fix for 7.24.0 release branch (#9903)
Andepande Jun 7, 2024
a03be02
feat: release-7.24.0 RC-2 cut build increment (#9907)
Andepande Jun 7, 2024
47761d9
7.24.1
metamaskbot Jun 11, 2024
0f7aa2c
update changelog
sethkfman Jun 11, 2024
c3292f5
chore: cherry-pick #9687 (#9948)
github-actions[bot] Jun 11, 2024
b1de3ab
chore: cherry-pick #9946 (#9959)
github-actions[bot] Jun 12, 2024
40b8ed1
chore: cherry-pick #9926 (#9967)
github-actions[bot] Jun 13, 2024
9d467b3
fix: cherry pick Duplicate accounts fix (#9943) (#9963)
owencraston Jun 13, 2024
9c028ed
bump version code 1340 RC 1
sethkfman Jun 13, 2024
4c75dc3
fix(ramp): memoize asset before passing it to balance hook (#9968) (#…
wachunei Jun 13, 2024
44f03bd
fix: Engine does not exist, network controller is missing ids (#9978)
tommasini Jun 13, 2024
f9c42eb
bump version 1342 RC 2
sethkfman Jun 13, 2024
321436f
Revert "chore: cherry-pick #9687" (#9981)
NicolasMassart Jun 13, 2024
57a7545
fix: migration 43 stringify to type of (#9982)
tommasini Jun 13, 2024
5443c9e
7.24.2
metamaskbot Jun 13, 2024
81d9dd8
chore: cherry-pick #9687 (#9987)
github-actions[bot] Jun 13, 2024
2c0a009
resovled coflicts
sethkfman Jun 13, 2024
41374bb
update changelog
sethkfman Jun 14, 2024
23855ab
fix upgrade test version
sethkfman Jun 14, 2024
27911ef
fix: fixed snapshots (#9991)
sethkfman Jun 14, 2024
c3d20fc
test: marketing optin date trigger testing. (#9998)
NicolasMassart Jun 14, 2024
85f6a87
chore: bump 1347 RC 2 (#10010)
sethkfman Jun 15, 2024
e32f46f
chore: revert data change PR for marketing toggle #9998 (#10012)
sethkfman Jun 15, 2024
9bd819b
chore: merge 7.24.1 into 7.24.2 (#10013)
sethkfman Jun 15, 2024
2566af2
7.24.3
metamaskbot Jun 19, 2024
6e38cfb
chore: Chore/cherry pick ppom 1.4.8 (#10041) (#10045)
Cal-L Jun 19, 2024
a7870cf
chore: Chore/update 7.24.3 changelog (#10047)
Cal-L Jun 19, 2024
18b91c1
Merge main into 7.24.3
Cal-L Jun 21, 2024
a6593eb
Merge branch 'main' into release/7.24.3
sethkfman Jun 21, 2024
c5aa24b
Add new line to blockaid file
Cal-L Jun 21, 2024
4712cbf
Merge branch 'main' into release/7.24.3
Cal-L Jun 21, 2024
cb79fc2
Take blockaid file from main
Cal-L Jun 21, 2024
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Current Main Branch

## 7.24.3 - Jun 19, 2024
### Fixed
- [#10045](https://github.com/MetaMask/metamask-mobile/pull/10045): fix: Update ppom package to 1.4.8 (#10041)

## 7.24.2 - Jun 13, 2024
### Added
- [#9687](https://github.com/MetaMask/metamask-mobile/pull/9687): feat: adds "data collection for marketing" toggles
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ android {
applicationId "io.metamask"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1348
versionName "7.24.2"
versionCode 1351
versionName "7.24.3"
testBuildType System.getProperty('testBuildType', 'debug')
missingDimensionStrategy 'react-native-camera', 'general'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
12 changes: 6 additions & 6 deletions bitrise.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,8 @@ workflows:
machine_type_id: elite-xl
envs:
- PRODUCTION_APP_URL: 'bs://ba40e5b7b4210a06c659b5c6818a3efec2624513' # Last production's QA build
- PRODUCTION_BUILD_VERSION_NAME: 7.22.0
- PRODUCTION_BUILD_VERSION_NUMBER: 1325
- PRODUCTION_BUILD_VERSION_NAME: 7.24.3
- PRODUCTION_BUILD_VERSION_NUMBER: 1351
- CUCUMBER_TAG_EXPRESSION: '@upgrade and @androidApp'
- PRODUCTION_BUILD_STRING: 'MetaMask-QA v$PRODUCTION_BUILD_VERSION_NAME ($PRODUCTION_BUILD_VERSION_NUMBER)'
- NEW_BUILD_STRING: 'MetaMask-QA v$VERSION_NAME ($VERSION_NUMBER)'
Expand Down Expand Up @@ -1401,16 +1401,16 @@ app:
PROJECT_LOCATION_IOS: ios
- opts:
is_expand: false
VERSION_NAME: 7.24.2
VERSION_NAME: 7.24.3
- opts:
is_expand: false
VERSION_NUMBER: 1348
VERSION_NUMBER: 1351
- opts:
is_expand: false
FLASK_VERSION_NAME: 7.24.2
FLASK_VERSION_NAME: 7.24.3
- opts:
is_expand: false
FLASK_VERSION_NUMBER: 1348
FLASK_VERSION_NUMBER: 1351
- opts:
is_expand: false
ANDROID_APK_LINK: ''
Expand Down
24 changes: 12 additions & 12 deletions ios/MetaMask.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,7 +1207,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1348;
CURRENT_PROJECT_VERSION = 1351;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1244,7 +1244,7 @@
"${inherited}",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.24.2;
MARKETING_VERSION = 7.24.3;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1272,7 +1272,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1348;
CURRENT_PROJECT_VERSION = 1351;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1307,7 +1307,7 @@
"${inherited}",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.24.2;
MARKETING_VERSION = 7.24.3;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1335,7 +1335,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1348;
CURRENT_PROJECT_VERSION = 1351;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1368,7 +1368,7 @@
);
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
LLVM_LTO = YES;
MARKETING_VERSION = 7.24.2;
MARKETING_VERSION = 7.24.3;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1396,7 +1396,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1348;
CURRENT_PROJECT_VERSION = 1351;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1427,7 +1427,7 @@
);
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
LLVM_LTO = YES;
MARKETING_VERSION = 7.24.2;
MARKETING_VERSION = 7.24.3;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1554,7 +1554,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1348;
CURRENT_PROJECT_VERSION = 1351;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1591,7 +1591,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.24.2;
MARKETING_VERSION = 7.24.3;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
Expand Down Expand Up @@ -1622,7 +1622,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1348;
CURRENT_PROJECT_VERSION = 1351;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1657,7 +1657,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.24.2;
MARKETING_VERSION = 7.24.3;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = (
"$(inherited)",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "metamask",
"version": "7.24.2",
"version": "7.24.3",
"private": true,
"scripts": {
"audit:ci": "./scripts/yarn-audit.sh",
Expand Down
Loading