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

7.12.3 #8132

Merged
merged 21 commits into from
Dec 18, 2023
+18 −14
Merged

7.12.3 #8132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2a3df54
7.12.0
metamaskbot Nov 18, 2023
922b8dd
Merge branch 'main' into release/7.12.0
sethkfman Nov 18, 2023
922cd64
chore: cherry-pick #7864 (#7884)
sethkfman Nov 21, 2023
d82bc55
chore: cherry pick 7881 (#7883)
sethkfman Nov 21, 2023
60ab0be
fix: Cherry pick revert javascript disable on webview (#7898)
tommasini Nov 22, 2023
5f016c2
chore: cherry pick 7935 (#7944)
chrisleewilcox Nov 29, 2023
fce9c56
chore: cherry pick #7607 (#7945)
sethkfman Nov 29, 2023
04d2d8d
chore: build bump 1214 RC4 (#7939)
chrisleewilcox Nov 29, 2023
941f05f
7.12.1
metamaskbot Dec 4, 2023
e595c06
chore: cherry-pick: test: fix wallet test (#7966) (#7970)
chrisleewilcox Dec 1, 2023
4e38a07
chore: cherry-pick: test: Increase E2E test setup time (#7929) (#7977)
chrisleewilcox Dec 1, 2023
2e9430e
chore: Cherry-pick for solution in main to token rates (#8002)
sethkfman Dec 4, 2023
1ea9eb1
chore: update header key (#8007)
sethkfman Dec 5, 2023
7c97648
bump version and updated changelog
metamaskbot Dec 5, 2023
f326db7
7.12.2
metamaskbot Dec 8, 2023
94b149a
updated changelog
metamaskbot Dec 8, 2023
d0baa69
fix: Disable SES on iOS (#8057)
sethkfman Dec 8, 2023
b4e5883
7.12.3
metamaskbot Dec 15, 2023
007e524
chore: fix: prevent bad svg urls in react-native-svg (#8102) (#8134)
chrisleewilcox Dec 15, 2023
45a1328
updated changelog
metamaskbot Dec 18, 2023
7ebf469
merge main
metamaskbot Dec 18, 2023
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
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@

## Current Main Branch

## 7.12.3 - Dec 18, 2023
### Fixed
- [#8102](https://github.com/MetaMask/metamask-mobile/pull/8102): fix: prevent bad svg urls in react-native-svg

## 7.12.2 - Dec 8, 2023
### Fixed
- [#8057](https://github.com/MetaMask/metamask-mobile/pull/8057): fix: Disable SES on iOS

## 7.12.1 - Dec 5, 2023
### Fixed
### Fixed
- [#7991](https://github.com/MetaMask/metamask-mobile/pull/7991): fix: patch for token rates controller with coin gecko endpoint

## 7.12.0 - Dec 4, 2023
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 @@ -137,8 +137,8 @@ android {
applicationId "io.metamask"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1224
versionName "7.12.2"
versionCode 1230
versionName "7.12.3"
testBuildType System.getProperty('testBuildType', 'debug')
missingDimensionStrategy 'react-native-camera', 'general'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
4 changes: 2 additions & 2 deletions bitrise.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1140,10 +1140,10 @@ app:
PROJECT_LOCATION_IOS: ios
- opts:
is_expand: false
VERSION_NAME: 7.12.2
VERSION_NAME: 7.12.3
- opts:
is_expand: false
VERSION_NUMBER: 1224
VERSION_NUMBER: 1230
- opts:
is_expand: false
FLASK_VERSION_NAME: 0.0.4
Expand Down
16 changes: 8 additions & 8 deletions ios/MetaMask.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1343,7 +1343,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1224;
CURRENT_PROJECT_VERSION = 1230;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1377,7 +1377,7 @@
);
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
LLVM_LTO = YES;
MARKETING_VERSION = 7.12.2;
MARKETING_VERSION = 7.12.3;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1406,7 +1406,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1224;
CURRENT_PROJECT_VERSION = 1230;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1440,7 +1440,7 @@
);
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
LLVM_LTO = YES;
MARKETING_VERSION = 7.12.2;
MARKETING_VERSION = 7.12.3;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1693,7 +1693,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1224;
CURRENT_PROJECT_VERSION = 1230;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1731,7 +1731,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.12.2;
MARKETING_VERSION = 7.12.3;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
Expand Down Expand Up @@ -1763,7 +1763,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1224;
CURRENT_PROJECT_VERSION = 1230;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1801,7 +1801,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.12.2;
MARKETING_VERSION = 7.12.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.12.2",
"version": "7.12.3",
"private": true,
"scripts": {
"audit:ci": "./scripts/yarn-audit.sh",
Expand Down
Loading