From 973981620a5ce9dbdae7e622c3b7da11bc9cba13 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:25:32 -0700 Subject: [PATCH] 7.18.0 (#8821) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the release candidate for version 7.18.0. Changelog & Team Breakdown: [7.18.0-changelog.csv](https://github.com/MetaMask/metamask-mobile/files/14470035/7.18.0-changelog.csv) --------- Signed-off-by: Akintayo A. Olusegun Co-authored-by: metamaskbot Co-authored-by: sethkfman Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Nico MASSART Co-authored-by: sahar-fehri Co-authored-by: MetaMask Bot <37885440+metamaskbot@users.noreply.github.com> Co-authored-by: seaona <54408225+seaona@users.noreply.github.com> Co-authored-by: Jyoti Puri Co-authored-by: salimtb Co-authored-by: Cal Leung Co-authored-by: yande <110056475+Andepande@users.noreply.github.com> Co-authored-by: Xiaoming Wang Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com> Co-authored-by: Kylan Hurt Co-authored-by: Omri Dan <61094771+omridan159@users.noreply.github.com> Co-authored-by: Mark Stacey Co-authored-by: Matthew Walsh Co-authored-by: Pedro Pablo Aste Kompen Co-authored-by: Jongsun Suh Co-authored-by: Vivek <106310394+vivek-consensys@users.noreply.github.com> Co-authored-by: abretonc7s <107169956+abretonc7s@users.noreply.github.com> Co-authored-by: Curtis David Co-authored-by: CW Co-authored-by: Sylva Elendu Co-authored-by: jiexi Co-authored-by: OGPoyraz Co-authored-by: Elliot Winkler Co-authored-by: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com> Co-authored-by: Timi Tejumola Co-authored-by: João Loureiro <1649425+jpcloureiro@users.noreply.github.com> Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com> Co-authored-by: SamuelSalas Co-authored-by: Victorien Gauch <85494462+VGau@users.noreply.github.com> Co-authored-by: Olusegun Akintayo --- CHANGELOG.md | 76 +++++++++++++++++++ README.md | 8 +- android/app/build.gradle | 4 +- .../confirmations/SendFlow/Confirm/index.js | 1 - app/core/Analytics/MetaMetrics.ts | 10 +++ bitrise.yml | 10 +-- ios/MetaMask.xcodeproj/project.pbxproj | 36 ++++----- jest.config.js | 2 + package.json | 2 +- 9 files changed, 121 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8dcdb7b76c..3a11d6bf861 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,82 @@ ## Current Main Branch +## 7.18.0 - Mar 2, 2024 +### Added +- [#8729](https://github.com/MetaMask/metamask-mobile/pull/8729): feat(ramp): add event when user expands quotes +- [#8787](https://github.com/MetaMask/metamask-mobile/pull/8787): feat: add MetaMetrics custom flush vars and log +- [#8680](https://github.com/MetaMask/metamask-mobile/pull/8680): feat(ramp): add previously used tag +- [#8627](https://github.com/MetaMask/metamask-mobile/pull/8627): feat(ramp): add bottom sheet quotes +- [#8755](https://github.com/MetaMask/metamask-mobile/pull/8755): feat: Remove gap from maxHeight calculation in bottomsheet +- [#8748](https://github.com/MetaMask/metamask-mobile/pull/8748): feat: segment migration update remaining files and remove legacy analytics +- [#8731](https://github.com/MetaMask/metamask-mobile/pull/8731): feat: Missing migration events +- [#8531](https://github.com/MetaMask/metamask-mobile/pull/8531): feat: sdk permissions system integration +- [#8607](https://github.com/MetaMask/metamask-mobile/pull/8607): feat: bump mobile snaps packages to bring new snaps architecture +- [#8700](https://github.com/MetaMask/metamask-mobile/pull/8700): feat: Snaps new architecture mobile integration +- [#8581](https://github.com/MetaMask/metamask-mobile/pull/8581): feat: support updated Linea gas fee estimation +- [#8712](https://github.com/MetaMask/metamask-mobile/pull/8712): feat: confirmations views components events migration +- [#8656](https://github.com/MetaMask/metamask-mobile/pull/8656): feat: Edit gas, Drawer, DeleteWallet, ComponentErrorBoundary, CollectilbleContracts, BrowsserBottomBar events migration +- [#8692](https://github.com/MetaMask/metamask-mobile/pull/8692): feat: T-C views components events migration +- [#8672](https://github.com/MetaMask/metamask-mobile/pull/8672): feat: Views folder migration events from W to R beginning letters +- [#8651](https://github.com/MetaMask/metamask-mobile/pull/8651): feat: tabs and swaps components events migration +- [#8658](https://github.com/MetaMask/metamask-mobile/pull/8658): feat: Approvals and Nav events migration +- [#8670](https://github.com/MetaMask/metamask-mobile/pull/8670): feat: ramp analytics segment migration +- [#8657](https://github.com/MetaMask/metamask-mobile/pull/8657): feat: AccountApproval, ACcountRightButton, AddCustomCollectible, AddCustomToken, AddressCopy, BackupAlert useGoToBridge events migration +- [#8655](https://github.com/MetaMask/metamask-mobile/pull/8655): feat: migration of analytics of NavBar, NavBarTitle, LedgerConfirmationModal +- [#8705](https://github.com/MetaMask/metamask-mobile/pull/8705): feat: segment migration of utils +- [#8637](https://github.com/MetaMask/metamask-mobile/pull/8637): feat: translate fake native tokens need better UX error handling +- [#8711](https://github.com/MetaMask/metamask-mobile/pull/8711): feat: c-a views components events migration to segment +- [#8067](https://github.com/MetaMask/metamask-mobile/pull/8067): feat: use Segment (batch 1) +- [#8608](https://github.com/MetaMask/metamask-mobile/pull/8608): feat: Signature controller update to v5.3.0 and removed unnecessary patch +- [#8653](https://github.com/MetaMask/metamask-mobile/pull/8653): feat: migration of AnimatedQrScanner, QRsigningDetails and onboarding flow +- [#8652](https://github.com/MetaMask/metamask-mobile/pull/8652): feat: Search token, screenshot deterrent and receive request events migration +- [#8642](https://github.com/MetaMask/metamask-mobile/pull/8642): feat: Update needed and toknes ui component events migration +- [#8635](https://github.com/MetaMask/metamask-mobile/pull/8635): feat: Move Security settings from Experimental Settings into Security Settings +- [#8677](https://github.com/MetaMask/metamask-mobile/pull/8677): feat: Add TagColored to component temp +- [#8673](https://github.com/MetaMask/metamask-mobile/pull/8673): feat: new trackErrorAsAnalytics for segment + +### Changed +- [#8803](https://github.com/MetaMask/metamask-mobile/pull/8803): chore: Remove unnecessary resolutions +- [#8792](https://github.com/MetaMask/metamask-mobile/pull/8792): test: Fix tag in regression test +- [#8791](https://github.com/MetaMask/metamask-mobile/pull/8791): test: add contact us e2e +- [#8495](https://github.com/MetaMask/metamask-mobile/pull/8495): ci: Post comment after e2e smoke +- [#8662](https://github.com/MetaMask/metamask-mobile/pull/8662): test: Update Swap token from USDC to USDT +- [#8542](https://github.com/MetaMask/metamask-mobile/pull/8542): chore: simplify ccache cache logic +- [#8664](https://github.com/MetaMask/metamask-mobile/pull/8664): refactor: consolidate accounts references to a single source of truth +- [#8366](https://github.com/MetaMask/metamask-mobile/pull/8366): chore: Create single functions to invoke Transaction Controller +- [#8709](https://github.com/MetaMask/metamask-mobile/pull/8709): test: cleanup networks e2e test +- [#8561](https://github.com/MetaMask/metamask-mobile/pull/8561): chore: modify dependency caching on bitrise +- [#8593](https://github.com/MetaMask/metamask-mobile/pull/8593): ci: enable security code scanner +- [#8492](https://github.com/MetaMask/metamask-mobile/pull/8492): docs: Improve README.md +- [#8646](https://github.com/MetaMask/metamask-mobile/pull/8646): test: Create detox setup script +- [#8644](https://github.com/MetaMask/metamask-mobile/pull/8644): test: Refactor settings page object +- [#8614](https://github.com/MetaMask/metamask-mobile/pull/8614): chore: resolve cherry-pick conflict and added a new migration 29 + +### Fixed +- [#8801](https://github.com/MetaMask/metamask-mobile/pull/8801): fix(ramp): undefined payment method +- [#8798](https://github.com/MetaMask/metamask-mobile/pull/8798): fix: remove unnecessary post message stream patch +- [#8572](https://github.com/MetaMask/metamask-mobile/pull/8572): fix: fake native tokens need better UX error handling +- [#8763](https://github.com/MetaMask/metamask-mobile/pull/8763): fix: PPOM version update to 1.4.2 +- [#8753](https://github.com/MetaMask/metamask-mobile/pull/8753): fix: Updated accessibility role for buttons +- [#8725](https://github.com/MetaMask/metamask-mobile/pull/8725): fix: change in blockaid alert message +- [#8625](https://github.com/MetaMask/metamask-mobile/pull/8625): fix: ethQuery is not defined when refresh is called +- [#8752](https://github.com/MetaMask/metamask-mobile/pull/8752): fix: Fixed underline issue with ButtonLink's pressed state +- [#8744](https://github.com/MetaMask/metamask-mobile/pull/8744): fix: fix infura key displayed +- [#8678](https://github.com/MetaMask/metamask-mobile/pull/8678): fix: fix metrics trackEvent compatibility with legacy events +- [#8742](https://github.com/MetaMask/metamask-mobile/pull/8742): fix: update origin passed to ppom for send transactions +- [#8727](https://github.com/MetaMask/metamask-mobile/pull/8727): fix: migration to enable Blockaid by default +- [#8567](https://github.com/MetaMask/metamask-mobile/pull/8567): fix: deprecate goerli network +- [#8734](https://github.com/MetaMask/metamask-mobile/pull/8734): fix: fix hex to BN conversion +- [#8738](https://github.com/MetaMask/metamask-mobile/pull/8738): fix: linting in Engine +- [#8515](https://github.com/MetaMask/metamask-mobile/pull/8515): fix: #1408 Native Alert Patch for Webview +- [#8707](https://github.com/MetaMask/metamask-mobile/pull/8707): fix: patch transaction controller in mobile to add fallback gas estimation +- [#8584](https://github.com/MetaMask/metamask-mobile/pull/8584): fix: filter SES from Sentry stack trace frames +- [#8636](https://github.com/MetaMask/metamask-mobile/pull/8636): fix: add warning for optimism and arbitrum goerli +- [#8663](https://github.com/MetaMask/metamask-mobile/pull/8663): fix: update podfile and project.pbxproj +- [#8650](https://github.com/MetaMask/metamask-mobile/pull/8650): fix: translate scam title modal +- [#8631](https://github.com/MetaMask/metamask-mobile/pull/8631): fix: remove inexistent style +- [#8615](https://github.com/MetaMask/metamask-mobile/pull/8615): fix: Fix add custom rpc detox test script + ## 7.17.1 - Mar 2, 2024 ## Fixed - [#8870](https://github.com/MetaMask/metamask-mobile/pull/8870): fix: update PPOM to v1.4.4 diff --git a/README.md b/README.md index 56d6a42e327..bbf332302e8 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ Before running the app, make sure your development environment has all the requi ### Building the app **Clone the project** + ```bash git clone git@github.com:MetaMask/metamask-mobile.git && \ cd metamask-mobile @@ -45,6 +46,7 @@ yarn setup _Not the usual install command, this will run scripts and a lengthy postinstall flow_ **Setup environment variables** + ```bash cp .ios.env.example .ios.env && \ cp .android.env.example .android.env && \ @@ -54,17 +56,21 @@ cp .js.env.example .js.env ### Running the app **Run Metro bundler** + ```bash yarn watch ``` + _Like a local server for the app_ **Run on a iOS device** + ```bash -yarn start:ios +yarn start:ios ``` **Run on an Android device** + ```bash yarn start:android ``` diff --git a/android/app/build.gradle b/android/app/build.gradle index 4eff1db990c..155a8fe85a2 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -181,8 +181,8 @@ android { applicationId "io.metamask" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1280 - versionName "7.17.1" + versionCode 1281 + versionName "7.18.0" testBuildType System.getProperty('testBuildType', 'debug') missingDimensionStrategy 'react-native-camera', 'general' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/components/Views/confirmations/SendFlow/Confirm/index.js b/app/components/Views/confirmations/SendFlow/Confirm/index.js index 03025241ad3..81886e1fb9a 100644 --- a/app/components/Views/confirmations/SendFlow/Confirm/index.js +++ b/app/components/Views/confirmations/SendFlow/Confirm/index.js @@ -862,7 +862,6 @@ class Confirm extends PureComponent { return; } - await this.persistTransactionParameters(transaction); await KeyringController.resetQRKeyringState(); await ApprovalController.accept(transactionMeta.id, undefined, { waitForResult: true, diff --git a/app/core/Analytics/MetaMetrics.ts b/app/core/Analytics/MetaMetrics.ts index 774631ad854..df5910f0e84 100644 --- a/app/core/Analytics/MetaMetrics.ts +++ b/app/core/Analytics/MetaMetrics.ts @@ -33,6 +33,8 @@ import { import { METAMETRICS_ANONYMOUS_ID } from './MetaMetrics.constants'; import { v4 as uuidv4 } from 'uuid'; import { Config } from '@segment/analytics-react-native/lib/typescript/src/types'; +import generateDeviceAnalyticsMetaData from '../../util/metrics/DeviceAnalyticsMetaData/generateDeviceAnalyticsMetaData'; +import generateUserSettingsAnalyticsMetaData from '../../util/metrics/UserSettingsAnalyticsMetaData/generateUserProfileAnalyticsMetaData'; /** * MetaMetrics using Segment as the analytics provider. @@ -521,6 +523,14 @@ class MetaMetrics implements IMetaMetrics { this.dataRecorded = await this.#getIsDataRecordedFromPrefs(); this.#isConfigured = true; + // identify user with the latest traits + // run only after the MetaMetrics is configured + const consolidatedTraits = { + ...generateDeviceAnalyticsMetaData(), + ...generateUserSettingsAnalyticsMetaData(), + }; + await this.addTraitsToUser(consolidatedTraits); + if (__DEV__) Logger.log(`MetaMetrics configured with ID: ${this.metametricsId}`); } catch (error: any) { diff --git a/bitrise.yml b/bitrise.yml index aa473391a7c..60229bc0d24 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -759,7 +759,7 @@ workflows: #!/usr/bin/env bash if [ -n "$TEST_SUITE_FOLDER" ]; then echo "TEST_SUITE_FOLDER value is: $TEST_SUITE_FOLDER" - fi + fi if [ "$TEST_SUITE" = "Regression" ]; then TEST_SUITE="Regression" else @@ -1308,16 +1308,16 @@ app: PROJECT_LOCATION_IOS: ios - opts: is_expand: false - VERSION_NAME: 7.17.1 + VERSION_NAME: 7.18.0 - opts: is_expand: false - VERSION_NUMBER: 1280 + VERSION_NUMBER: 1281 - opts: is_expand: false - FLASK_VERSION_NAME: 7.17.1 + FLASK_VERSION_NAME: 7.18.0 - opts: is_expand: false - FLASK_VERSION_NUMBER: 1280 + FLASK_VERSION_NUMBER: 1281 - opts: is_expand: false ANDROID_APK_LINK: '' diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index 483a11c8ff5..eba9b6072c9 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -9,7 +9,7 @@ /* Begin PBXBuildFile section */ 07CBADD9D4B441008304F8D3 /* EuclidCircularB-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = A98029A3662F4C1391489A6B /* EuclidCircularB-Light.otf */; }; 0C119A06A4353DD11451F541 /* libPods-MetaMask-Flask.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA078AF57878ABB05D063C8F /* libPods-MetaMask-Flask.a */; }; - 0FD509E0336BF221F6527B24 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + 0FD509E0336BF221F6527B24 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; @@ -131,7 +131,7 @@ B339FF2E289ABD70001B89FB /* EuclidCircularB-SemiboldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9499B01ECAC44DA29AC44E80 /* EuclidCircularB-SemiboldItalic.otf */; }; B339FF32289ABD70001B89FB /* Branch.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 153F84C92319B8DB00C19B63 /* Branch.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; B339FF3C289ABF2C001B89FB /* MetaMask-QA-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B339FEA72899852C001B89FB /* MetaMask-QA-Info.plist */; }; - B638844E306CAE9147B52C85 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + B638844E306CAE9147B52C85 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; BF39E5BAE0F34F9091FF6AC0 /* EuclidCircularB-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = A8DE9C5BC0714D648276E123 /* EuclidCircularB-Semibold.otf */; }; CD13D926E1E84D9ABFE672C0 /* Roboto-BlackItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3E2492C67CF345CABD7B8601 /* Roboto-BlackItalic.ttf */; }; CF9895772A3B49BE00B4C9B5 /* RCTMinimizer.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9895762A3B49BE00B4C9B5 /* RCTMinimizer.m */; }; @@ -139,7 +139,7 @@ CF98DA9C28D9FEB700096782 /* RCTScreenshotDetect.m in Sources */ = {isa = PBXBuildFile; fileRef = CF98DA9B28D9FEB700096782 /* RCTScreenshotDetect.m */; }; CFD8DFC828EDD4C800CC75F6 /* RCTScreenshotDetect.m in Sources */ = {isa = PBXBuildFile; fileRef = CF98DA9B28D9FEB700096782 /* RCTScreenshotDetect.m */; }; D171C39A8BD44DBEB6B68480 /* EuclidCircularB-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 42CBA652072F4BE2A8B815C1 /* EuclidCircularB-MediumItalic.otf */; }; - D45BF85DECACCB74EDCBE88A /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + D45BF85DECACCB74EDCBE88A /* (null) in Frameworks */ = {isa = PBXBuildFile; }; DC6A024F56DD43E1A83B47B1 /* Roboto-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D5FF0FF1DFB74B3C8BB99E09 /* Roboto-MediumItalic.ttf */; }; DDB2D8FF8BDA806A38D61B1B /* libPods-MetaMask-QA.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E0B857D61941CE8A3F59C662 /* libPods-MetaMask-QA.a */; }; E34DE917F6FC4438A6E88402 /* EuclidCircularB-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 13EE4910D3BD408A8FCCA5D7 /* EuclidCircularB-BoldItalic.otf */; }; @@ -321,9 +321,9 @@ 650F2B9D24DC5FF200C3B9C4 /* libRCTAesForked.a in Frameworks */, 153C1ABB2217BCDC0088EFE0 /* JavaScriptCore.framework in Frameworks */, 153F84CA2319B8FD00C19B63 /* Branch.framework in Frameworks */, - 0FD509E0336BF221F6527B24 /* BuildFile in Frameworks */, - D45BF85DECACCB74EDCBE88A /* BuildFile in Frameworks */, - B638844E306CAE9147B52C85 /* BuildFile in Frameworks */, + 0FD509E0336BF221F6527B24 /* (null) in Frameworks */, + D45BF85DECACCB74EDCBE88A /* (null) in Frameworks */, + B638844E306CAE9147B52C85 /* (null) in Frameworks */, 7CFB6EF0B7853F1C4E863E5E /* libPods-MetaMask.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1199,7 +1199,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1280; + CURRENT_PROJECT_VERSION = 1281; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 48XVW22RCG; @@ -1236,7 +1236,7 @@ "${inherited}", ); LLVM_LTO = YES; - MARKETING_VERSION = 7.17.1; + MARKETING_VERSION = 7.18.0; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( @@ -1264,7 +1264,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1280; + CURRENT_PROJECT_VERSION = 1281; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 48XVW22RCG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG; @@ -1299,7 +1299,7 @@ "${inherited}", ); LLVM_LTO = YES; - MARKETING_VERSION = 7.17.1; + MARKETING_VERSION = 7.18.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( @@ -1327,7 +1327,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1280; + CURRENT_PROJECT_VERSION = 1281; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 48XVW22RCG; @@ -1360,7 +1360,7 @@ ); LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)"; LLVM_LTO = YES; - MARKETING_VERSION = 7.17.1; + MARKETING_VERSION = 7.18.0; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( @@ -1388,7 +1388,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1280; + CURRENT_PROJECT_VERSION = 1281; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 48XVW22RCG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG; @@ -1419,7 +1419,7 @@ ); LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)"; LLVM_LTO = YES; - MARKETING_VERSION = 7.17.1; + MARKETING_VERSION = 7.18.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( @@ -1546,7 +1546,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1280; + CURRENT_PROJECT_VERSION = 1281; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 48XVW22RCG; @@ -1583,7 +1583,7 @@ "\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"", ); LLVM_LTO = YES; - MARKETING_VERSION = 7.17.1; + MARKETING_VERSION = 7.18.0; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", @@ -1614,7 +1614,7 @@ CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1280; + CURRENT_PROJECT_VERSION = 1281; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 48XVW22RCG; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG; @@ -1649,7 +1649,7 @@ "\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"", ); LLVM_LTO = YES; - MARKETING_VERSION = 7.17.1; + MARKETING_VERSION = 7.18.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( "$(inherited)", diff --git a/jest.config.js b/jest.config.js index 58650e0c7ea..f63655a3ed4 100644 --- a/jest.config.js +++ b/jest.config.js @@ -34,6 +34,8 @@ const config = { '\\.svg': '/app/__mocks__/svgMock.js', '\\.png': '/app/__mocks__/pngMock.js', }, + // Disable jest cache + cache: false, }; // eslint-disable-next-line import/no-commonjs diff --git a/package.json b/package.json index ef743f86516..172a2952ff0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask", - "version": "7.17.1", + "version": "7.18.0", "private": true, "scripts": { "audit:ci": "./scripts/yarn-audit.sh",