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.16.0 #8464

Merged
merged 30 commits into from
Feb 28, 2024
Merged

7.16.0 #8464

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0867e47
7.16.0
metamaskbot Jan 30, 2024
d8df54c
update changelog
sethkfman Jan 30, 2024
a6bae2d
chore: cherry-pick #8413 (#8475)
github-actions[bot] Jan 30, 2024
ee451e4
chore: cherry pick 8373 (#8477)
sethkfman Jan 30, 2024
bc9cab7
bump version for RC 1 1248
sethkfman Jan 30, 2024
adc647e
chore: cherry-pick #8486 (#8487)
github-actions[bot] Jan 31, 2024
6996c3e
chore: cherry-pick #8157 (#8497)
github-actions[bot] Feb 1, 2024
c1aebaa
chore: cherry-pick #8491 (#8498)
github-actions[bot] Feb 1, 2024
32dd416
chore: cherry-pick #8469 (#8499)
github-actions[bot] Feb 1, 2024
d59979e
chore: cherry-pick #8503 (#8506)
github-actions[bot] Feb 1, 2024
e71ee43
chore: cherry-pick #8504 (#8507)
github-actions[bot] Feb 1, 2024
fb1f417
chore: cherry-pick #8509 - fix Sentry stack traces (#8511)
Cal-L Feb 2, 2024
a07606c
bumped up build to 1249 (#8505)
Andepande Feb 2, 2024
e03d2c7
chore: cherry-pick #8526 (#8530)
github-actions[bot] Feb 6, 2024
8c1d175
chore: cherry-pick #8532 (#8535)
github-actions[bot] Feb 6, 2024
13c3328
fix: Revert/8081 engine slice (#8576)
Cal-L Feb 13, 2024
f544ac2
fix: Fix/1539 patch root file with controller data (#8578)
Cal-L Feb 15, 2024
e4538fc
Bump up build 7.16 build to 1263 (#8590)
Andepande Feb 15, 2024
503140f
chore: cherry-pick #8605 (#8609)
github-actions[bot] Feb 16, 2024
5455a6e
version bump to 1265 (#8610)
Andepande Feb 16, 2024
54e4f98
chore: merge main into 7.16.0 - resolve conflicts (#8679)
Cal-L Feb 22, 2024
047fca5
chore: chore/7.16.0 revert merge mainmerge (#8682)
Cal-L Feb 22, 2024
7948614
chore: 7.16.0 merge conflicts from main (#8684)
Cal-L Feb 22, 2024
ec51f71
chore: Fix more merge conflicts with main (#8686)
Cal-L Feb 22, 2024
74e9eb9
chore: chore/7.16.0 revert more prs (#8687)
Cal-L Feb 22, 2024
2cd8783
merge 'main' into release
sethkfman Feb 26, 2024
73771cb
Merge branch 'main' into release/7.16.0
sethkfman Feb 27, 2024
1225bfd
Merge branch 'main' into release/7.16.0
sethkfman Feb 27, 2024
b3f356b
remove duplicate functions added in merge
sethkfman Feb 28, 2024
e7c3c4b
Merge branch 'main' into release/7.16.0
Cal-L Feb 28, 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
156 changes: 91 additions & 65 deletions CHANGELOG.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ yarn start:ios
**Run on an Android device**
```bash
yarn start:android
```
```
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 1245
versionName "7.15.0"
versionCode 1265
versionName "7.16.0"
testBuildType System.getProperty('testBuildType', 'debug')
missingDimensionStrategy 'react-native-camera', 'general'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
55 changes: 55 additions & 0 deletions app/components/Views/Settings/ExperimentalSettings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ const ExperimentalSettings = ({ navigation, route }: Props) => {
setSesEnabled(!sesEnabled);
};

const [sesEnabled, setSesEnabled] = useState(
storage.getBoolean('is-ses-enabled'),
);

const toggleSesEnabled = () => {
storage.set('is-ses-enabled', !sesEnabled);
setSesEnabled(!sesEnabled);
};

const isFullScreenModal = route?.params?.isFullScreenModal;

const theme = useTheme();
Expand Down Expand Up @@ -94,6 +103,52 @@ const ExperimentalSettings = ({ navigation, route }: Props) => {
</>
);

const SesSettings: FC = () => (
<>
{Device.isAndroid() && (
<Text
color={TextColor.Default}
variant={TextVariant.HeadingLG}
style={styles.heading}
>
{strings('app_settings.security_heading')}
</Text>
)}
<View style={styles.setting}>
<View style={styles.switchElement}>
<Text color={TextColor.Default} variant={TextVariant.BodyLGMedium}>
{strings('app_settings.ses_heading')}
</Text>
<Switch
value={sesEnabled}
onValueChange={toggleSesEnabled}
trackColor={{
true: colors.primary.default,
false: colors.border.muted,
}}
thumbColor={importedColors.white}
style={styles.switch}
ios_backgroundColor={colors.border.muted}
/>
</View>
<Text
color={TextColor.Alternative}
variant={TextVariant.BodyMD}
style={styles.desc}
>
{strings('app_settings.ses_description')}{' '}
<Button
variant={ButtonVariants.Link}
size={ButtonSize.Auto}
onPress={openSesLink}
label={strings('app_settings.ses_link')}
/>
.
</Text>
</View>
</>
);

const SesSettings: FC = () => (
<>
<Text
Expand Down
8 changes: 4 additions & 4 deletions bitrise.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1232,16 +1232,16 @@ app:
PROJECT_LOCATION_IOS: ios
- opts:
is_expand: false
VERSION_NAME: 7.15.0
VERSION_NAME: 7.16.0
- opts:
is_expand: false
VERSION_NUMBER: 1245
VERSION_NUMBER: 1265
- opts:
is_expand: false
FLASK_VERSION_NAME: 7.15.0
FLASK_VERSION_NAME: 7.16.0
- opts:
is_expand: false
FLASK_VERSION_NUMBER: 1243
FLASK_VERSION_NUMBER: 1248
- 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 @@ -1341,7 +1341,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1245;
CURRENT_PROJECT_VERSION = 1265;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1378,7 +1378,7 @@
"${inherited}",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.15.0;
MARKETING_VERSION = 7.16.0;
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 = 1245;
CURRENT_PROJECT_VERSION = 1265;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1444,7 +1444,7 @@
"${inherited}",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.15.0;
MARKETING_VERSION = 7.16.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1472,7 +1472,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1245;
CURRENT_PROJECT_VERSION = 1265;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1505,7 +1505,7 @@
);
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
LLVM_LTO = YES;
MARKETING_VERSION = 7.15.0;
MARKETING_VERSION = 7.16.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1533,7 +1533,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1245;
CURRENT_PROJECT_VERSION = 1265;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1567,7 +1567,7 @@
);
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
LLVM_LTO = YES;
MARKETING_VERSION = 7.15.0;
MARKETING_VERSION = 7.16.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1694,7 +1694,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1245;
CURRENT_PROJECT_VERSION = 1265;
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.15.0;
MARKETING_VERSION = 7.16.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
Expand Down Expand Up @@ -1762,7 +1762,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1245;
CURRENT_PROJECT_VERSION = 1265;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1800,7 +1800,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.15.0;
MARKETING_VERSION = 7.16.0;
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.15.0",
"version": "7.16.0",
"private": true,
"scripts": {
"audit:ci": "./scripts/yarn-audit.sh",
Expand Down
Empty file modified scripts/ios/bundle-js-and-sentry-upload.sh
100755 → 100644
View file
Open in desktop
Empty file.
Loading