From 460f2d49dffd133e19fd116a3e7e00c6a29f2410 Mon Sep 17 00:00:00 2001 From: metamaskbot Date: Wed, 5 Jul 2023 21:36:46 +0000 Subject: [PATCH 01/10] 7.3.0 --- CHANGELOG.md | 34 ++++++++++++++++++++++++++ android/app/build.gradle | 6 ++--- bitrise.yml | 4 +-- ios/MetaMask.xcodeproj/project.pbxproj | 16 ++++++------ package.json | 2 +- 5 files changed, 48 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2688a9e67bb..2fe61b4ca02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,40 @@ # Changelog ## Current Main Branch +- [#6651](https://github.com/MetaMask/metamask-mobile/pull/6651): 7.2.0 +- [#6741](https://github.com/MetaMask/metamask-mobile/pull/6741): fix: onPress prop added to SelectItem component +- [#6220](https://github.com/MetaMask/metamask-mobile/pull/6220): Upgrade React Native to 0.71.6 +- [#6722](https://github.com/MetaMask/metamask-mobile/pull/6722): fix: WC2 error management and SDK 'authorized' event +- [#6596](https://github.com/MetaMask/metamask-mobile/pull/6596): feat: Memoise token balance controler hook +- [#6729](https://github.com/MetaMask/metamask-mobile/pull/6729): fix: update multi select snapshot +- [#6639](https://github.com/MetaMask/metamask-mobile/pull/6639): feat: approval flow for add & switch network +- [#6723](https://github.com/MetaMask/metamask-mobile/pull/6723): Updated checkbox style and icon +- [#6552](https://github.com/MetaMask/metamask-mobile/pull/6552): Update MultiSelectItem to use ListItem +- [#6602](https://github.com/MetaMask/metamask-mobile/pull/6602): feat: Add BottomSheetContent +- [#6551](https://github.com/MetaMask/metamask-mobile/pull/6551): Update SelectItem to use ListItem +- [#6617](https://github.com/MetaMask/metamask-mobile/pull/6617): feat: Update Overlay and add BottomSheetOverlay +- [#6649](https://github.com/MetaMask/metamask-mobile/pull/6649): New Crowdin translations by Github Action +- [#6724](https://github.com/MetaMask/metamask-mobile/pull/6724): Updated Label Text Variant +- [#6489](https://github.com/MetaMask/metamask-mobile/pull/6489): feat: [MC 0.75] Show test network toggle +- [#6673](https://github.com/MetaMask/metamask-mobile/pull/6673): refactor: Use selectors for network state access +- [#6499](https://github.com/MetaMask/metamask-mobile/pull/6499): feat: `eth_accounts` return all permitted accounts +- [#6714](https://github.com/MetaMask/metamask-mobile/pull/6714): ix: "Assets Overview" disclaimer text color +- [#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 +- chore: fix typo in index.js +- [#6646](https://github.com/MetaMask/metamask-mobile/pull/6646): test: add Send ERC721 token from a dapp +- [#6689](https://github.com/MetaMask/metamask-mobile/pull/6689): fix(bitrise): bump project bitrise version +- [#6683](https://github.com/MetaMask/metamask-mobile/pull/6683): fix(action): add required permissions to remove labels +- [#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 +- [#6685](https://github.com/MetaMask/metamask-mobile/pull/6685): Move test/dev tools to `devDependencies` +- [#6678](https://github.com/MetaMask/metamask-mobile/pull/6678): fix: Update Confirmation Sign Message detox spec file +- [#6681](https://github.com/MetaMask/metamask-mobile/pull/6681): Resolve yarn audit failure +- [#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 +- [#6671](https://github.com/MetaMask/metamask-mobile/pull/6671): fix: added contact alias to destination address on send flow +- [#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 +- [#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 diff --git a/android/app/build.gradle b/android/app/build.gradle index c35e65edbc1..6ba3fd31506 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -137,8 +137,8 @@ android { applicationId "io.metamask" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1142 - versionName "7.2.0" + versionCode 1143 + versionName "7.3.0" testBuildType System.getProperty('testBuildType', 'debug') missingDimensionStrategy 'react-native-camera', 'general' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -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 diff --git a/bitrise.yml b/bitrise.yml index 71db0162f99..a50bfe1180f 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -726,10 +726,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: 1143 - opts: is_expand: false ANDROID_APK_LINK: '' diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index 9e7c2d6c73d..e44ddb6aced 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -1039,7 +1039,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1142; + CURRENT_PROJECT_VERSION = 1143; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 48XVW22RCG; @@ -1072,7 +1072,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)", @@ -1103,7 +1103,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1142; + CURRENT_PROJECT_VERSION = 1143; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 48XVW22RCG; ENABLE_BITCODE = NO; @@ -1136,7 +1136,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)", @@ -1246,7 +1246,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1142; + CURRENT_PROJECT_VERSION = 1143; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 48XVW22RCG; @@ -1282,7 +1282,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)", @@ -1313,7 +1313,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1142; + CURRENT_PROJECT_VERSION = 1143; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 48XVW22RCG; ENABLE_BITCODE = NO; @@ -1349,7 +1349,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)", diff --git a/package.json b/package.json index 6c29e6be1c1..1c59858e9a5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask", - "version": "7.2.0", + "version": "7.3.0", "private": true, "scripts": { "audit:ci": "./scripts/yarn-audit.sh", From c66d002c948a8bb5d479fea647ffa807a4781f43 Mon Sep 17 00:00:00 2001 From: sethkfman Date: Fri, 7 Jul 2023 12:34:40 -0600 Subject: [PATCH 02/10] update provisioning profile for builds --- ios/MetaMask.xcodeproj/project.pbxproj | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index e44ddb6aced..aa95650450d 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -1043,6 +1043,7 @@ DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 48XVW22RCG; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -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; @@ -1106,6 +1108,7 @@ CURRENT_PROJECT_VERSION = 1143; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 48XVW22RCG; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -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"; @@ -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 = 1143; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 48XVW22RCG; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -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; @@ -1316,6 +1323,7 @@ CURRENT_PROJECT_VERSION = 1143; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 48XVW22RCG; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -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"; From 6742c44e722ddef937f1a29ba67c232aa8732b46 Mon Sep 17 00:00:00 2001 From: Matthew Walsh Date: Mon, 10 Jul 2023 09:31:48 +0100 Subject: [PATCH 03/10] Hide approval flow loader if pending approval (#6767) --- app/components/Nav/Main/RootRPCMethodsUI.js | 38 ++++++++++++--------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/app/components/Nav/Main/RootRPCMethodsUI.js b/app/components/Nav/Main/RootRPCMethodsUI.js index 2500c634865..6ad71ba3e95 100644 --- a/app/components/Nav/Main/RootRPCMethodsUI.js +++ b/app/components/Nav/Main/RootRPCMethodsUI.js @@ -386,22 +386,28 @@ const RootRPCMethodsUI = (props) => { ], ); - const renderApprovalFlowModal = () => ( - - - - ); + const renderApprovalFlowModal = () => { + if (!showPendingApprovalFlow || showPendingApproval) { + return null; + } + + return ( + + + + ); + }; const renderQRSigningModal = () => { const { isSigningQRObject, QRState } = props; From 45fa068038205d341b584e388e47ac3fbc54b059 Mon Sep 17 00:00:00 2001 From: tommasini <46944231+tommasini@users.noreply.github.com> Date: Tue, 11 Jul 2023 13:12:51 +0100 Subject: [PATCH 04/10] fix: 7.3.0 - update terms of use metrics (#6761) --- app/core/Analytics/MetaMetrics.events.ts | 6 ++++-- app/util/termsOfUse/termsOfUse.ts | 8 ++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/core/Analytics/MetaMetrics.events.ts b/app/core/Analytics/MetaMetrics.events.ts index 51d3df284e8..0a01dc1b140 100644 --- a/app/core/Analytics/MetaMetrics.events.ts +++ b/app/core/Analytics/MetaMetrics.events.ts @@ -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', @@ -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, ), diff --git a/app/util/termsOfUse/termsOfUse.ts b/app/util/termsOfUse/termsOfUse.ts index 04ce8cdeb0a..686477a0014 100644 --- a/app/util/termsOfUse/termsOfUse.ts +++ b/app/util/termsOfUse/termsOfUse.ts @@ -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( From ccbcdba091e98289237eb4c226854885e25ec315 Mon Sep 17 00:00:00 2001 From: tommasini <46944231+tommasini@users.noreply.github.com> Date: Tue, 11 Jul 2023 16:41:21 +0100 Subject: [PATCH 05/10] fix: update cookie-tough dependency (#6772) --- package.json | 3 ++- yarn.lock | 21 ++++----------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 1c59858e9a5..e78486f707c 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,8 @@ "detox/**/moment": "^2.29.4", "oss-attribution-generator/**/debug": "^2.6.9", "d3-color": "3.1.0", - "**/fast-xml-parser": "4.2.4" + "**/fast-xml-parser": "4.2.4", + "tough-cookie": "4.1.3" }, "dependencies": { "@consensys/on-ramp-sdk": "1.20.0", diff --git a/yarn.lock b/yarn.lock index aeb4620eb74..9448a95835b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22581,11 +22581,6 @@ pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= -psl@^1.1.28: - version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" - integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== - psl@^1.1.33: version "1.9.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" @@ -26176,18 +26171,10 @@ toposort@^2.0.2: resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330" integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg== -tough-cookie@^2.3.3, tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - -tough-cookie@^4.0.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" - integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== +tough-cookie@4.1.3, tough-cookie@^2.3.3, tough-cookie@^4.0.0, tough-cookie@~2.5.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" + integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== dependencies: psl "^1.1.33" punycode "^2.1.1" From 965daf8cd57d6d5760c6b01f2045de34c4bfd233 Mon Sep 17 00:00:00 2001 From: Chris Wilcox Date: Tue, 11 Jul 2023 12:54:42 -0700 Subject: [PATCH 06/10] adjust steps for UI changes (#6768) --- e2e/pages/Drawer/Settings/SettingsView.js | 2 +- e2e/specs/delete-wallet.spec.js | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/e2e/pages/Drawer/Settings/SettingsView.js b/e2e/pages/Drawer/Settings/SettingsView.js index 7ff2aec3fff..64c00abf229 100644 --- a/e2e/pages/Drawer/Settings/SettingsView.js +++ b/e2e/pages/Drawer/Settings/SettingsView.js @@ -30,7 +30,7 @@ export default class SettingsView { } static async tapLock() { - await TestHelpers.swipe(LOCK_SETTINGS, 'up', 'fast'); + await TestHelpers.swipe(CONTACTS_SETTINGS, 'up', 'fast'); await TestHelpers.waitAndTap(LOCK_SETTINGS); } diff --git a/e2e/specs/delete-wallet.spec.js b/e2e/specs/delete-wallet.spec.js index f2a6d32dbdf..d8c58a9f5bd 100644 --- a/e2e/specs/delete-wallet.spec.js +++ b/e2e/specs/delete-wallet.spec.js @@ -23,7 +23,7 @@ import { acceptTermOfUse } from '../viewHelper'; import Accounts from '../../wdio/helpers/Accounts'; import TabBarComponent from '../pages/TabBarComponent'; -describe.skip( +describe( Smoke( 'Import wallet with 24 word SRP, change password then delete wallet flow', ), @@ -113,14 +113,10 @@ describe.skip( await ChangePasswordView.tapResetPasswordButton(); }); - it('should open drawer and log out', 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 device.enableSynchronization(); - - await SettingsView.tapCloseButton(); - - await TabBarComponent.tapActions(); await SettingsView.tapLock(); await SettingsView.tapYesAlertButton(); await LoginView.isVisible(); From eb3c3237f16ffff99d8d1934a3d3dd5f85fe7585 Mon Sep 17 00:00:00 2001 From: sethkfman <10342624+sethkfman@users.noreply.github.com> Date: Tue, 11 Jul 2023 17:24:30 -0600 Subject: [PATCH 07/10] fix: update snapshot for linea mainnet (#6790) --- .../NetworkSelector.test.tsx.snap | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/app/components/Views/NetworkSelector/__snapshots__/NetworkSelector.test.tsx.snap b/app/components/Views/NetworkSelector/__snapshots__/NetworkSelector.test.tsx.snap index e89399e7a38..54b7be5ae23 100644 --- a/app/components/Views/NetworkSelector/__snapshots__/NetworkSelector.test.tsx.snap +++ b/app/components/Views/NetworkSelector/__snapshots__/NetworkSelector.test.tsx.snap @@ -552,6 +552,94 @@ exports[`Network Selector renders correctly 1`] = ` /> + + + + + + + + + Linea Main Network + + + + + Date: Wed, 12 Jul 2023 13:20:55 -0700 Subject: [PATCH 08/10] build 1144 (#6793) --- android/app/build.gradle | 2 +- bitrise.yml | 2 +- ios/MetaMask.xcodeproj/project.pbxproj | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 6ba3fd31506..a1a365647ae 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -137,7 +137,7 @@ android { applicationId "io.metamask" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1143 + versionCode 1144 versionName "7.3.0" testBuildType System.getProperty('testBuildType', 'debug') missingDimensionStrategy 'react-native-camera', 'general' diff --git a/bitrise.yml b/bitrise.yml index a50bfe1180f..301d62bed07 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -729,7 +729,7 @@ app: VERSION_NAME: 7.3.0 - opts: is_expand: false - VERSION_NUMBER: 1143 + VERSION_NUMBER: 1144 - opts: is_expand: false ANDROID_APK_LINK: '' diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index aa95650450d..ef19a100ff6 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -1039,7 +1039,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1143; + CURRENT_PROJECT_VERSION = 1144; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 48XVW22RCG; @@ -1105,7 +1105,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1143; + CURRENT_PROJECT_VERSION = 1144; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 48XVW22RCG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG; @@ -1251,7 +1251,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1143; + CURRENT_PROJECT_VERSION = 1144; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 48XVW22RCG; @@ -1320,7 +1320,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1143; + CURRENT_PROJECT_VERSION = 1144; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 48XVW22RCG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG; From 298cbe135dfa1fcc97bf949dcca3a3558e6ddef0 Mon Sep 17 00:00:00 2001 From: sethkfman Date: Thu, 13 Jul 2023 14:37:05 -0600 Subject: [PATCH 09/10] update changelog --- CHANGELOG.md | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fe61b4ca02..cb0c20f58b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,39 +1,38 @@ # Changelog ## Current Main Branch -- [#6651](https://github.com/MetaMask/metamask-mobile/pull/6651): 7.2.0 -- [#6741](https://github.com/MetaMask/metamask-mobile/pull/6741): fix: onPress prop added to SelectItem component -- [#6220](https://github.com/MetaMask/metamask-mobile/pull/6220): Upgrade React Native to 0.71.6 -- [#6722](https://github.com/MetaMask/metamask-mobile/pull/6722): fix: WC2 error management and SDK 'authorized' event + +## 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 -- [#6729](https://github.com/MetaMask/metamask-mobile/pull/6729): fix: update multi select snapshot - [#6639](https://github.com/MetaMask/metamask-mobile/pull/6639): feat: approval flow for add & switch network -- [#6723](https://github.com/MetaMask/metamask-mobile/pull/6723): Updated checkbox style and icon -- [#6552](https://github.com/MetaMask/metamask-mobile/pull/6552): Update MultiSelectItem to use ListItem +- [#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 -- [#6551](https://github.com/MetaMask/metamask-mobile/pull/6551): Update SelectItem to use ListItem - [#6617](https://github.com/MetaMask/metamask-mobile/pull/6617): feat: Update Overlay and add BottomSheetOverlay -- [#6649](https://github.com/MetaMask/metamask-mobile/pull/6649): New Crowdin translations by Github Action -- [#6724](https://github.com/MetaMask/metamask-mobile/pull/6724): Updated Label Text Variant - [#6489](https://github.com/MetaMask/metamask-mobile/pull/6489): feat: [MC 0.75] Show test network toggle -- [#6673](https://github.com/MetaMask/metamask-mobile/pull/6673): refactor: Use selectors for network state access - [#6499](https://github.com/MetaMask/metamask-mobile/pull/6499): feat: `eth_accounts` return all permitted accounts -- [#6714](https://github.com/MetaMask/metamask-mobile/pull/6714): ix: "Assets Overview" disclaimer text color + +### 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 -- chore: fix typo in index.js -- [#6646](https://github.com/MetaMask/metamask-mobile/pull/6646): test: add Send ERC721 token from a dapp -- [#6689](https://github.com/MetaMask/metamask-mobile/pull/6689): fix(bitrise): bump project bitrise version -- [#6683](https://github.com/MetaMask/metamask-mobile/pull/6683): fix(action): add required permissions to remove labels -- [#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 -- [#6685](https://github.com/MetaMask/metamask-mobile/pull/6685): Move test/dev tools to `devDependencies` + +### 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 -- [#6681](https://github.com/MetaMask/metamask-mobile/pull/6681): Resolve yarn audit failure -- [#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 - [#6671](https://github.com/MetaMask/metamask-mobile/pull/6671): fix: added contact alias to destination address on send flow -- [#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 - [#6637](https://github.com/MetaMask/metamask-mobile/pull/6637): fix: Support Decimal Comma for Token Custom Spend Cap ## 7.2.0 - Jun 05, 2023 From 912f0311be79612ee52342c81e4f863b4ecd8021 Mon Sep 17 00:00:00 2001 From: Curtis David Date: Thu, 13 Jul 2023 17:04:12 -0400 Subject: [PATCH 10/10] accept current merge changes (#6803) --- e2e/pages/Drawer/Settings/SettingsView.js | 4 ---- e2e/specs/delete-wallet.spec.js | 7 ------- 2 files changed, 11 deletions(-) diff --git a/e2e/pages/Drawer/Settings/SettingsView.js b/e2e/pages/Drawer/Settings/SettingsView.js index 22259f7fa41..64c00abf229 100644 --- a/e2e/pages/Drawer/Settings/SettingsView.js +++ b/e2e/pages/Drawer/Settings/SettingsView.js @@ -30,11 +30,7 @@ export default class SettingsView { } static async tapLock() { -<<<<<<< HEAD await TestHelpers.swipe(CONTACTS_SETTINGS, 'up', 'fast'); -======= - await TestHelpers.swipe(NETWORKS_SETTINGS, 'up', 'fast'); ->>>>>>> main await TestHelpers.waitAndTap(LOCK_SETTINGS); } diff --git a/e2e/specs/delete-wallet.spec.js b/e2e/specs/delete-wallet.spec.js index 2c6993272ad..eb1edb88556 100644 --- a/e2e/specs/delete-wallet.spec.js +++ b/e2e/specs/delete-wallet.spec.js @@ -75,17 +75,10 @@ describe( } }); -<<<<<<< HEAD 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 device.enableSynchronization(); -======= - it('should delete wallet from settings and privacy view', async () => { - await SecurityAndPrivacyView.tapBackButton(); - - await TestHelpers.delay(5000); ->>>>>>> main await SettingsView.tapLock(); await SettingsView.tapYesAlertButton(); await LoginView.isVisible();