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.

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.3.0 #6747

Merged
merged 13 commits into from
Jul 13, 2023
33 changes: 33 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,39 @@

## Current Main Branch

## 7.3.0 - Jul 13, 2023
### Added
- [#6220](https://github.com/MetaMask/metamask-mobile/pull/6220): feat: Upgrade React Native to 0.71.6
- [#6596](https://github.com/MetaMask/metamask-mobile/pull/6596): feat: Memoise token balance controler hook
- [#6639](https://github.com/MetaMask/metamask-mobile/pull/6639): feat: approval flow for add & switch network
- [#6352](https://github.com/MetaMask/metamask-mobile/pull/6352): feat(action): github action to automatically add label "release-x.y.z" when PRs get merged
- [#6576](https://github.com/MetaMask/metamask-mobile/pull/6576): feat: New Ui for permissions dapp screen
- [#6212](https://github.com/MetaMask/metamask-mobile/pull/6212): feat: trigger qrsigning modal using approval controller
- [#6602](https://github.com/MetaMask/metamask-mobile/pull/6602): feat: Add BottomSheetContent
- [#6617](https://github.com/MetaMask/metamask-mobile/pull/6617): feat: Update Overlay and add BottomSheetOverlay
- [#6489](https://github.com/MetaMask/metamask-mobile/pull/6489): feat: [MC 0.75] Show test network toggle
- [#6499](https://github.com/MetaMask/metamask-mobile/pull/6499): feat: `eth_accounts` return all permitted accounts

### Changed
- [#6662](https://github.com/MetaMask/metamask-mobile/pull/6662): refactor: Remove dead network controller code
- [#6664](https://github.com/MetaMask/metamask-mobile/pull/6664): refactor: Simplify `isMainnet` utility function
- [#6723](https://github.com/MetaMask/metamask-mobile/pull/6723): refactor: Updated checkbox style and icon
- [#6552](https://github.com/MetaMask/metamask-mobile/pull/6552): refactor: Update MultiSelectItem to use ListItem
- [#6551](https://github.com/MetaMask/metamask-mobile/pull/6551): refactor: Update SelectItem to use ListItem
- [#6724](https://github.com/MetaMask/metamask-mobile/pull/6724): refactor: Updated Label Text Variant
- [#6673](https://github.com/MetaMask/metamask-mobile/pull/6673): refactor: Use selectors for network state access
- [#6666](https://github.com/MetaMask/metamask-mobile/pull/6666): refactor: Simplify engine service
- [#6641](https://github.com/MetaMask/metamask-mobile/pull/6641): refactor: approve and reject transactions using approval controller

### Fixed
- [#6741](https://github.com/MetaMask/metamask-mobile/pull/6741): fix: onPress prop added to SelectItem component
- [#6722](https://github.com/MetaMask/metamask-mobile/pull/6722): fix: WC2 error management and SDK 'authorized' event
- [#6729](https://github.com/MetaMask/metamask-mobile/pull/6729): fix: update multi select snapshot
- [#6714](https://github.com/MetaMask/metamask-mobile/pull/6714): fix: "Assets Overview" disclaimer text color
- [#6678](https://github.com/MetaMask/metamask-mobile/pull/6678): fix: Update Confirmation Sign Message detox spec file
- [#6671](https://github.com/MetaMask/metamask-mobile/pull/6671): fix: added contact alias to destination address on send flow
- [#6637](https://github.com/MetaMask/metamask-mobile/pull/6637): fix: Support Decimal Comma for Token Custom Spend Cap

## 7.2.0 - Jun 05, 2023
### Added
- [#6632](https://github.com/MetaMask/metamask-mobile/pull/6632): feat: add linea mainnet alert message
Expand Down
6 changes: 3 additions & 3 deletions android/app/build.gradle
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 1142
versionName "7.2.0"
versionCode 1144
versionName "7.3.0"
testBuildType System.getProperty('testBuildType', 'debug')
missingDimensionStrategy 'react-native-camera', 'general'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -217,7 +217,7 @@ android {
variant.outputs.each { output ->
// For each separate APK per architecture, set a unique version code as described here:
// https://developer.android.com/studio/build/configure-apk-splits.html
// Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
// Example: versionCode 1143 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
def abi = output.getFilter(OutputFile.ABI)
if (abi != null) { // null for the universal-debug, universal-release variants
Expand Down
38 changes: 22 additions & 16 deletions app/components/Nav/Main/RootRPCMethodsUI.js
Original file line number Diff line number Diff line change
Expand Up @@ -391,22 +391,28 @@ const RootRPCMethodsUI = (props) => {
],
);

const renderApprovalFlowModal = () => (
<Modal
isVisible={showPendingApprovalFlow}
animationIn="slideInUp"
animationOut="slideOutDown"
style={styles.bottomModal}
backdropColor={colors.overlay.default}
backdropOpacity={1}
animationInTiming={600}
animationOutTiming={600}
swipeDirection={'down'}
propagateSwipe
>
<ApprovalFlowLoader loadingText={approvalFlowLoadingText} />
</Modal>
);
const renderApprovalFlowModal = () => {
if (!showPendingApprovalFlow || showPendingApproval) {
return null;
}

return (
<Modal
isVisible
animationIn="slideInUp"
animationOut="slideOutDown"
style={styles.bottomModal}
backdropColor={colors.overlay.default}
backdropOpacity={1}
animationInTiming={600}
animationOutTiming={600}
swipeDirection={'down'}
propagateSwipe
>
<ApprovalFlowLoader loadingText={approvalFlowLoadingText} />
</Modal>
);
};

const onApprovalResultConfirm = () => {
setShowPendingApproval(false);
Expand Down
6 changes: 4 additions & 2 deletions app/core/Analytics/MetaMetrics.events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,8 @@ enum EVENT_NAME {
SCREENSHOT_OK = 'Clicked Screenshot Warning OK',

//Terms of Use
USER_TERMS = 'Terms of Use',
USER_TERMS_SHOWN = 'Terms of Use Shown',
USER_TERMS_ACCEPTED = 'Terms of Use Accepted',
// Reveal SRP Quiz
SRP_REVEAL_QUIZ_PROMPT_SEEN = 'SRP reveal quiz prompt seen',
SRP_REVEAL_START_CTA_SELECTED = 'SRP reveal get started CTA selected',
Expand Down Expand Up @@ -590,7 +591,8 @@ const events = {
SCREENSHOT_WARNING: generateOpt(EVENT_NAME.SCREENSHOT_WARNING),
SCREENSHOT_LEARN_MORE: generateOpt(EVENT_NAME.SCREENSHOT_LEARN_MORE),
SCREENSHOT_OK: generateOpt(EVENT_NAME.SCREENSHOT_OK),
USER_TERMS: generateOpt(EVENT_NAME.USER_TERMS),
USER_TERMS_SHOWN: generateOpt(EVENT_NAME.USER_TERMS_SHOWN),
USER_TERMS_ACCEPTED: generateOpt(EVENT_NAME.USER_TERMS_ACCEPTED),
SRP_REVEAL_QUIZ_PROMPT_SEEN: generateOpt(
EVENT_NAME.SRP_REVEAL_QUIZ_PROMPT_SEEN,
),
Expand Down
8 changes: 2 additions & 6 deletions app/util/termsOfUse/termsOfUse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,11 @@ import {

const onConfirmUseTerms = async () => {
await AsyncStorage.setItem(USE_TERMS, TRUE);
trackEvent(MetaMetricsEvents.USER_TERMS, {
value: AppConstants.TERMS_OF_USE.TERMS_ACCEPTED,
});
trackEvent(MetaMetricsEvents.USER_TERMS_ACCEPTED, {});
};

const useTermsDisplayed = () => {
trackEvent(MetaMetricsEvents.USER_TERMS, {
value: AppConstants.TERMS_OF_USE.TERMS_DISPLAYED,
});
trackEvent(MetaMetricsEvents.USER_TERMS_SHOWN, {});
};

export default async function navigateTermsOfUse(
Expand Down
4 changes: 2 additions & 2 deletions bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -740,10 +740,10 @@ app:
PROJECT_LOCATION_IOS: ios
- opts:
is_expand: false
VERSION_NAME: 7.2.0
VERSION_NAME: 7.3.0
- opts:
is_expand: false
VERSION_NUMBER: 1142
VERSION_NUMBER: 1144
- opts:
is_expand: false
ANDROID_APK_LINK: ''
Expand Down
2 changes: 1 addition & 1 deletion e2e/pages/Drawer/Settings/SettingsView.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default class SettingsView {
}

static async tapLock() {
await TestHelpers.swipe(NETWORKS_SETTINGS, 'up', 'fast');
await TestHelpers.swipe(CONTACTS_SETTINGS, 'up', 'fast');
await TestHelpers.waitAndTap(LOCK_SETTINGS);
}

Expand Down
6 changes: 3 additions & 3 deletions e2e/specs/delete-wallet.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ describe(
}
});

it('should delete wallet from settings and privacy view', async () => {
it('should lock wallet from Settings', async () => {
await device.disableSynchronization(); // because the SRP tutorial video prevents the test from moving forward
await SecurityAndPrivacyView.tapBackButton();

await TestHelpers.delay(5000);
await device.enableSynchronization();
await SettingsView.tapLock();
await SettingsView.tapYesAlertButton();
await LoginView.isVisible();
Expand Down
25 changes: 17 additions & 8 deletions ios/MetaMask.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1039,10 +1039,11 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1142;
CURRENT_PROJECT_VERSION = 1144;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1072,7 +1073,7 @@
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
LLVM_LTO = YES;
MARKETING_VERSION = 7.2.0;
MARKETING_VERSION = 7.3.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
Expand All @@ -1086,6 +1087,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "io.metamask.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = MetaMask;
PROVISIONING_PROFILE_SPECIFIER = "match Development io.metamask.MetaMask";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.metamask.MetaMask";
SWIFT_OBJC_BRIDGING_HEADER = "MetaMask-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand All @@ -1103,9 +1105,10 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1142;
CURRENT_PROJECT_VERSION = 1144;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1136,7 +1139,7 @@
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
LLVM_LTO = YES;
MARKETING_VERSION = 7.2.0;
MARKETING_VERSION = 7.3.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = (
"$(inherited)",
Expand All @@ -1150,6 +1153,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "io.metamask.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = MetaMask;
PROVISIONING_PROFILE_SPECIFIER = "Bitrise AppStore io.metamask.MetaMask";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Bitrise AppStore io.metamask.MetaMask";
SWIFT_OBJC_BRIDGING_HEADER = "MetaMask-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -1245,11 +1249,13 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1142;
CURRENT_PROJECT_VERSION = 1144;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1282,7 +1288,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.2.0;
MARKETING_VERSION = 7.3.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
Expand All @@ -1296,6 +1302,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "io.metamask.MetaMask-QA";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "match Development io.metamask.MetaMask";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Bitrise Internal Release Wildcard";
SWIFT_OBJC_BRIDGING_HEADER = "MetaMask-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand All @@ -1313,9 +1320,10 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1142;
CURRENT_PROJECT_VERSION = 1144;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1349,7 +1357,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.2.0;
MARKETING_VERSION = 7.3.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = (
"$(inherited)",
Expand All @@ -1363,6 +1371,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "io.metamask.MetaMask-QA";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Bitrise Internal Release - MetaMask-QA";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Bitrise Internal Release - MetaMask-QA";
SWIFT_OBJC_BRIDGING_HEADER = "MetaMask-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "metamask",
"version": "7.2.0",
"version": "7.3.0",
"private": true,
"scripts": {
"audit:ci": "./scripts/yarn-audit.sh",
Expand Down
Loading