Skip to content
Closed
Show file tree
Hide file tree
Changes from 10 commits
Commits
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 android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionName "7.63.0"
versionCode 3418
versionCode 3491
testBuildType System.getProperty('testBuildType', 'debug')
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
manifestPlaceholders.MM_BRANCH_KEY_TEST = "$System.env.MM_BRANCH_KEY_TEST"
Expand Down
8 changes: 8 additions & 0 deletions app/components/Views/Settings/AppInformation/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import {
getFeatureFlagAppEnvironment,
} from '../../../../core/Engine/controllers/remote-feature-flag-controller/utils';
import { getPreinstalledSnapsMetadata } from '../../../../selectors/snaps';
import { captureException } from '@sentry/react-native';

const createStyles = (colors) =>
StyleSheet.create({
Expand Down Expand Up @@ -192,6 +193,10 @@ class AppInformation extends PureComponent {
this.setState({ showEnvironmentInfo: true });
};

onSendSentryTestError = () => {
captureException(new Error('OTA update Sentry test error v4'));
Comment thread
cursor[bot] marked this conversation as resolved.
Outdated
};

render = () => {
const colors = this.context.colors || mockTheme.colors;
const styles = createStyles(colors);
Expand Down Expand Up @@ -222,6 +227,9 @@ class AppInformation extends PureComponent {
<Text style={styles.versionInfo}>
{getFullVersion(this.state.appInfo)}
</Text>
<TouchableOpacity onPress={this.onSendSentryTestError}>
<Text style={styles.link}>Send Sentry test error</Text>
</TouchableOpacity>
Comment thread
weitingsun marked this conversation as resolved.
{isQa ? (
<Text style={styles.branchInfo}>
{`Branch: ${process.env['GIT_BRANCH']}`}
Expand Down
4 changes: 4 additions & 0 deletions app/components/Views/Wallet/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1278,6 +1278,10 @@ const Wallet = ({
}
/>
) : null}
<BannerAlert
severity={BannerAlertSeverity.Info}
title="this is ota update banner v5"
/>
Comment thread
weitingsun marked this conversation as resolved.
<NetworkConnectionBanner />
</View>
<>
Expand Down
2 changes: 1 addition & 1 deletion app/constants/ota.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import otaConfig from '../../ota.config.js';
* Reset to v0 when releasing a new native build
* We keep this OTA_VERSION here to because changes in ota.config.js will affect the fingerprint and break the workflow in Github Actions
*/
export const OTA_VERSION: string = 'v0';
export const OTA_VERSION: string = 'v5';
export const RUNTIME_VERSION = otaConfig.RUNTIME_VERSION;
export const PROJECT_ID = otaConfig.PROJECT_ID;
export const UPDATE_URL = otaConfig.UPDATE_URL;
Expand Down
4 changes: 2 additions & 2 deletions bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3471,13 +3471,13 @@ app:
VERSION_NAME: 7.63.0
- opts:
is_expand: false
VERSION_NUMBER: 3418
VERSION_NUMBER: 3491
- opts:
is_expand: false
FLASK_VERSION_NAME: 7.63.0
- opts:
is_expand: false
FLASK_VERSION_NUMBER: 3418
FLASK_VERSION_NUMBER: 3491
- opts:
is_expand: false
ANDROID_APK_LINK: ''
Expand Down
12 changes: 6 additions & 6 deletions ios/MetaMask.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1281,7 +1281,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3418;
CURRENT_PROJECT_VERSION = 3491;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1350,7 +1350,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3418;
CURRENT_PROJECT_VERSION = 3491;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1416,7 +1416,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3418;
CURRENT_PROJECT_VERSION = 3491;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1483,7 +1483,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3418;
CURRENT_PROJECT_VERSION = 3491;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down Expand Up @@ -1646,7 +1646,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3418;
CURRENT_PROJECT_VERSION = 3491;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1716,7 +1716,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3418;
CURRENT_PROJECT_VERSION = 3491;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
Expand Down
Loading