Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into jongsun/chore/bump/sm…
Browse files Browse the repository at this point in the history
…art-transactions-controller-13.0.0
  • Loading branch information
cryptodev-2s committed Sep 20, 2024
2 parents 9be130a + 5646b91 commit 44b108d
Show file tree
Hide file tree
Showing 122 changed files with 16,699 additions and 14,354 deletions.
2 changes: 2 additions & 0 deletions .js.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,5 @@ export MM_ENABLE_SETTINGS_PAGE_DEV_OPTIONS="true"

# Multichain Feature flag
export MULTICHAIN_V1=""
#Multichain feature flag specific to UI changes
export MM_MULTICHAIN_V1_ENABLED=""
99 changes: 99 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,105 @@

## Current Main Branch

## 7.31.0 - Sep 6, 2024
### Added
- [#10747](https://github.com/MetaMask/metamask-mobile/pull/10747): feat: 2805 grant permission to network with missmatching rpc url (#10747)
- [#10715](https://github.com/MetaMask/metamask-mobile/pull/10715): feat: 2795 disconnect all account permission multichain edit account screen (#10715)
- [#10347](https://github.com/MetaMask/metamask-mobile/pull/10347): feat: refactor WalletConnect v2 and add unit tests (#10347)
- [#10695](https://github.com/MetaMask/metamask-mobile/pull/10695): feat: sdk async key exchange (#10695)
- [#10562](https://github.com/MetaMask/metamask-mobile/pull/10562): feat: New token detail view (#10562)
- [#10876](https://github.com/MetaMask/metamask-mobile/pull/10876): feat: js bundle size ci gate (#10876)
- [#10847](https://github.com/MetaMask/metamask-mobile/pull/10847): feat: add pooled staking feature flag (#10847)
- [#2796](https://github.com/MetaMask/metamask-mobile/pull/2796): feat(2796): permission settings for multichain
- [#10727](https://github.com/MetaMask/metamask-mobile/pull/10727): feat: add ledger live deviation path support (#10727)

### Changed
- [#10749](https://github.com/MetaMask/metamask-mobile/pull/10749): chore(deps): bump rexml from 3.3.3 to 3.3.6 in the bundler group across 1 directory (#10749)
- [#10794](https://github.com/MetaMask/metamask-mobile/pull/10794): Release-update-BS-URL (#10794)
- [#11088](https://github.com/MetaMask/metamask-mobile/pull/11088): chore: add new track events for enabling/disabling basic functionality (#11088)
- [#10781](https://github.com/MetaMask/metamask-mobile/pull/10781): chore: update gitignore (#10781)
- [#11080](https://github.com/MetaMask/metamask-mobile/pull/11080): chore: fix flipper pod compilation with pika 15.3 toolchain (#11080)
- [#11077](https://github.com/MetaMask/metamask-mobile/pull/11077): chore: disable api spec pipeline (#11077)
- [#11075](https://github.com/MetaMask/metamask-mobile/pull/11075): test: disable flakey accounts test (#11075)
- [#11074](https://github.com/MetaMask/metamask-mobile/pull/11074): test: set baseline for app launch times (#11074)
- [#11039](https://github.com/MetaMask/metamask-mobile/pull/11039): test: Update swap test to handle the details modal (#11039)
- [#11070](https://github.com/MetaMask/metamask-mobile/pull/11070): test: remove duplicate push_branch in trigger map (#11070)
- [#11037](https://github.com/MetaMask/metamask-mobile/pull/11037): test: enable launch times pipeline on main (#11037)
- [#10983](https://github.com/MetaMask/metamask-mobile/pull/10983): chore: Metrics on download logs on login screen (#10983)
- [#11012](https://github.com/MetaMask/metamask-mobile/pull/11012): chore: revert splash screen PR (#11012)
- [#11003](https://github.com/MetaMask/metamask-mobile/pull/11003): chore: update swaps controller to 9.0.12 (#11003)
- [#11000](https://github.com/MetaMask/metamask-mobile/pull/11000): chore: merge release 7.29.1 into main (#11000)
- [#10937](https://github.com/MetaMask/metamask-mobile/pull/10937): chore: remove prefer default export eslint rule (#10937)
- [#10958](https://github.com/MetaMask/metamask-mobile/pull/10958): test: Increase cold start bench marks (#10958)
- [#10908](https://github.com/MetaMask/metamask-mobile/pull/10908): chore: Cherry pick reCaptcha fix (#10908)
- [#10016](https://github.com/MetaMask/metamask-mobile/pull/10016): chore: Update Keystone and NGRAVE dependencies (#10016)
- [#10866](https://github.com/MetaMask/metamask-mobile/pull/10866): chore: update typescript version to v~5.4.5 (#10866)
- [#10745](https://github.com/MetaMask/metamask-mobile/pull/10745): chore: Enable typescript coverage for all the files (#10745)
- [#10830](https://github.com/MetaMask/metamask-mobile/pull/10830): chore: Bump old pod checksums (#10830)
- [#10835](https://github.com/MetaMask/metamask-mobile/pull/10835): test: Remove Redundant Steps in WDIO to Fix Upgrade Test Failures (#10835)
- [#10813](https://github.com/MetaMask/metamask-mobile/pull/10813): chore: Remove react-native-splash-screen from Android (#10813)
- [#10828](https://github.com/MetaMask/metamask-mobile/pull/10828): chore: Add troubleshoot for missing simulators (#10828)
- [#10736](https://github.com/MetaMask/metamask-mobile/pull/10736): chore: Update permission controller to v^11 & utils to v^9 (#10736)
- [#10814](https://github.com/MetaMask/metamask-mobile/pull/10814): test:update-bs-url-to-correct-url (#10814)
- [#10744](https://github.com/MetaMask/metamask-mobile/pull/10744): chore: typescript coverage (#10744)
- [#10785](https://github.com/MetaMask/metamask-mobile/pull/10785): test: Refactor swaps page object files (#10785)
- [#10723](https://github.com/MetaMask/metamask-mobile/pull/10723): docs: Clean up testing readme (#10723)
- [#10751](https://github.com/MetaMask/metamask-mobile/pull/10751): chore: chore/7.30.0-Changelog (#10751)
- [#11017](https://github.com/MetaMask/metamask-mobile/pull/11017): refactor: updated button primary to use light theme colors (#11017)
- [#11018](https://github.com/MetaMask/metamask-mobile/pull/11018): refactor: updated wallet action icons to be light themed (#11018)
- [#10325](https://github.com/MetaMask/metamask-mobile/pull/10325): chore: updated avatargroup to take in all avatars (#10325)
- [#10616](https://github.com/MetaMask/metamask-mobile/pull/10616): chore: upgrade network controller to version 19.0.0 (#10616)
- [#11001](https://github.com/MetaMask/metamask-mobile/pull/11001): test: Fix swap smoke tests (#11001)
- [#10953](https://github.com/MetaMask/metamask-mobile/pull/10953): test: replaced TestHelpers function call with equivalent from Assertions (#10953)
- [#10897](https://github.com/MetaMask/metamask-mobile/pull/10897): test: Fix Swap e2e test failure (#10897)
- [#10874](https://github.com/MetaMask/metamask-mobile/pull/10874): chore: add new `keyring-snaps` code fence (#10874)
- [#10913](https://github.com/MetaMask/metamask-mobile/pull/10913): test: e2e srp reveal regression update (#10913)
- [#10879](https://github.com/MetaMask/metamask-mobile/pull/10879): test: e2e to reveal private key (#10879)
- [#10754](https://github.com/MetaMask/metamask-mobile/pull/10754): test: complete quiz to reveal SRP (#10754)
- [#10871](https://github.com/MetaMask/metamask-mobile/pull/10871): chore: enable merge queues gh action test run (#10871)
- [#10714](https://github.com/MetaMask/metamask-mobile/pull/10714): test: Refactor AccountListView Page object (#10714)

### Fixed
- [#10518](https://github.com/MetaMask/metamask-mobile/pull/10518): fix: refactor blockaid utils sync functions to async (#10518)
- [#11020](https://github.com/MetaMask/metamask-mobile/pull/11020): fix: Fix broken unit test in `Sendflow` tests (#11020)
- [#10385](https://github.com/MetaMask/metamask-mobile/pull/10385): fix: no insufficient funds warning (#10385)
- [#10826](https://github.com/MetaMask/metamask-mobile/pull/10826): fix: Upgrading Appium test failing (#10826)
- [#9910](https://github.com/MetaMask/metamask-mobile/pull/9910): fix: refactor saga xhr injection and add unit tests (#9910)
- [#10850](https://github.com/MetaMask/metamask-mobile/pull/10850): fix: remove exclusion of micromatch advisory and bump it (#10850)
- [#10673](https://github.com/MetaMask/metamask-mobile/pull/10673): fix: camera permission alert with settings access (#10673)
- [#10851](https://github.com/MetaMask/metamask-mobile/pull/10851): fix(2795): remove duplicate description in account connect multiselect screen (#10851)
- [#10894](https://github.com/MetaMask/metamask-mobile/pull/10894): fix: browser tab url type (#10894)
- [#10963](https://github.com/MetaMask/metamask-mobile/pull/10963): fix: Update PRODUCTION_APP_URL value (#10963)
- [#10903](https://github.com/MetaMask/metamask-mobile/pull/10903): fix(bug report): the description of bug report issue wasn't up-to-date anymore (#10903)
- [#10886](https://github.com/MetaMask/metamask-mobile/pull/10886): fix: recaptcha on in app browser (#10886)
- [#10540](https://github.com/MetaMask/metamask-mobile/pull/10540): fix: Browser dialog prompts in app (#10540)
- [#10844](https://github.com/MetaMask/metamask-mobile/pull/10844): fix: Refactor `yarn setup` in CI to generate terms of use content while retaining performance optimization (#10844)
- [#10845](https://github.com/MetaMask/metamask-mobile/pull/10845): fix: Add missing react-native-slider to pod lock file (#10845)
- [#10843](https://github.com/MetaMask/metamask-mobile/pull/10843): "revert: ""fix: Fixed 17 High Priority Issues - SonarCloud"" (#10843)"
- [#10635](https://github.com/MetaMask/metamask-mobile/pull/10635): fix: Fixed 17 High Priority Issues - SonarCloud (#10635)
- [#10827](https://github.com/MetaMask/metamask-mobile/pull/10827): fix: Fix/disable flipper for release (#10827)
- [#10820](https://github.com/MetaMask/metamask-mobile/pull/10820): fix: Set NO_FLIPPER to true on ios release (#10820)
- [#10545](https://github.com/MetaMask/metamask-mobile/pull/10545): fix: update metrics logic (#10545)
- [#10761](https://github.com/MetaMask/metamask-mobile/pull/10761): fix: typescript vs code default version (#10761)
- [#10753](https://github.com/MetaMask/metamask-mobile/pull/10753): fix: Fix coachmark error (#10753)
- [#10979](https://github.com/MetaMask/metamask-mobile/pull/10979): fix: wallet connect invalid hostname (#10979)
- [#10701](https://github.com/MetaMask/metamask-mobile/pull/10701): fix: wrong or missing analytics request source (#10701)
- [#10863](https://github.com/MetaMask/metamask-mobile/pull/10863): fixes: connectWith sdk (#10863)
- [#10729](https://github.com/MetaMask/metamask-mobile/pull/10729): fix: support set custom nonce to zero (#10729)
- [#11002](https://github.com/MetaMask/metamask-mobile/pull/11002): fix: infinite gas fee loading during send (#11002)
- [#10936](https://github.com/MetaMask/metamask-mobile/pull/10936): fix: Add missing allowedAction NetworkController:findNetworkClientIdByChainId to transactionController (#10936)
- [#10965](https://github.com/MetaMask/metamask-mobile/pull/10965): fix: gas never loading during send + high gas fee after deep link (#10965)
- [#10662](https://github.com/MetaMask/metamask-mobile/pull/10662): fix: blockaid loader on confirmation pages (#10662)
- [#10286](https://github.com/MetaMask/metamask-mobile/pull/10286): fix: Add dark mode to storybook (#10286)
- [#9962](https://github.com/MetaMask/metamask-mobile/pull/9962): fix: updated Text to use proper font styles (#9962)
- [#10476](https://github.com/MetaMask/metamask-mobile/pull/10476): fix: fix sentry error (#10476)
- [#10687](https://github.com/MetaMask/metamask-mobile/pull/10687): fix: Optimism quotes failing (#10687)
- [#10900](https://github.com/MetaMask/metamask-mobile/pull/10900): fix(notifications): hide profile sync toggle (#10900)
- [#10791](https://github.com/MetaMask/metamask-mobile/pull/10791): fix: Fix the QR code account unable to sign any message and transaction issue in 7.30.0 (#10791)
- [#10982](https://github.com/MetaMask/metamask-mobile/pull/10982): fix: UI notifications details bugs (#10982)
- [#10795](https://github.com/MetaMask/metamask-mobile/pull/10795): fix: small UI polishings (#10795)
- [#10792](https://github.com/MetaMask/metamask-mobile/pull/10792): fix: refactor notifications utils (#10792)

## 7.30.0 - Sep 6, 2024
### Added
- [#10748](https://github.com/MetaMask/metamask-mobile/pull/10748): feat: Add yarn flipper script (#10748)
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ android {
applicationId "io.metamask"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1410
versionName "7.30.0"
versionCode 1432
versionName "7.31.0"
testBuildType System.getProperty('testBuildType', 'debug')
missingDimensionStrategy 'react-native-camera', 'general'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
4 changes: 0 additions & 4 deletions android/app/src/main/java/io/metamask/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
import io.branch.rnbranch.*;
import android.content.Intent;
import android.os.Bundle;

import org.devio.rn.splashscreen.SplashScreen;

import java.util.ArrayList;
import java.util.Arrays;

Expand All @@ -37,7 +34,6 @@ protected void onStart() {

@Override
protected void onCreate(Bundle savedInstanceState) {
SplashScreen.show(this);
super.onCreate(null);
}

Expand Down
9 changes: 9 additions & 0 deletions android/app/src/main/res/drawable-night/app_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/theme" />
<item>
<bitmap
android:src="@drawable/fox"
android:gravity="center"
android:tileMode="disabled" />
</item>
</layer-list>
Binary file removed android/app/src/main/res/drawable-night/diamond.png
Binary file not shown.
Binary file added android/app/src/main/res/drawable-night/fox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions android/app/src/main/res/drawable/app_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/theme" />
<item>
<bitmap
android:src="@drawable/fox"
android:gravity="center"
android:tileMode="disabled" />
</item>
</layer-list>
13 changes: 0 additions & 13 deletions android/app/src/main/res/drawable/background_splash.xml

This file was deleted.

Binary file removed android/app/src/main/res/drawable/diamond.png
Binary file not shown.
Binary file added android/app/src/main/res/drawable/fox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed android/app/src/main/res/drawable/screen.png
Binary file not shown.
6 changes: 6 additions & 0 deletions android/app/src/main/res/layout-night/launch_screen.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent" android:background="@color/theme">
<ImageView android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/fox" android:scaleType="center" />
</RelativeLayout>
2 changes: 1 addition & 1 deletion android/app/src/main/res/layout/launch_screen.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent" android:background="@color/theme">
<ImageView android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/diamond" android:scaleType="center" />
<ImageView android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/fox" android:scaleType="center" />
</RelativeLayout>
3 changes: 3 additions & 0 deletions android/app/src/main/res/values-night/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<resources>
<string name="app_name">MetaMask</string>
</resources>
23 changes: 23 additions & 0 deletions android/app/src/main/res/values-night/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<resources>

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowDisablePreview">true</item>
<!-- Customize your theme here. -->
<item name="android:windowBackground">@drawable/app_background</item>
<item name="android:statusBarColor">@color/theme</item>
<item name="android:navigationBarColor">@color/navBar</item>
<item name="android:windowLightStatusBar">@bool/useLightStatusBar</item>
<item name="android:textColor">@color/themeInverse</item>
</style>

<style name="SplashTheme" parent="Theme.AppCompat.Light">
<item name="android:windowDisablePreview">true</item>
<item name="android:windowBackground">@drawable/app_background</item>
<item name="android:statusBarColor">@color/theme</item>
<item name="android:navigationBarColor">@color/navBar</item>
<item name="android:windowLightStatusBar">@bool/useLightStatusBar</item>
<item name="android:textColor">@color/themeInverse</item>
</style>

</resources>
6 changes: 4 additions & 2 deletions android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,19 @@

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowDisablePreview">true</item>
<!-- Customize your theme here. -->
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
<item name="android:windowBackground">@color/theme</item>
<item name="android:windowBackground">@drawable/app_background</item>
<item name="android:statusBarColor">@color/theme</item>
<item name="android:navigationBarColor">@color/navBar</item>
<item name="android:windowLightStatusBar">@bool/useLightStatusBar</item>
<item name="android:textColor">@color/themeInverse</item>
</style>

<style name="SplashTheme" parent="Theme.AppCompat.DayNight">
<item name="android:windowBackground">@drawable/background_splash</item>
<item name="android:windowDisablePreview">true</item>
<item name="android:windowBackground">@drawable/app_background</item>
<item name="android:statusBarColor">@color/theme</item>
<item name="android:navigationBarColor">@color/navBar</item>
<item name="android:windowLightStatusBar">@bool/useLightStatusBar</item>
Expand Down
9 changes: 9 additions & 0 deletions android/app/src/qa/res/drawable-night/app_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/theme" />
<item>
<bitmap
android:src="@drawable/fox"
android:gravity="center"
android:tileMode="disabled" />
</item>
</layer-list>
Binary file removed android/app/src/qa/res/drawable-night/diamond.png
Binary file not shown.
Binary file added android/app/src/qa/res/drawable-night/fox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions android/app/src/qa/res/drawable/app_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/theme" />
<item>
<bitmap
android:src="@drawable/fox"
android:gravity="center"
android:tileMode="disabled" />
</item>
</layer-list>
13 changes: 0 additions & 13 deletions android/app/src/qa/res/drawable/background_splash.xml

This file was deleted.

Binary file removed android/app/src/qa/res/drawable/diamond.png
Binary file not shown.
Binary file added android/app/src/qa/res/drawable/fox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions android/app/src/qa/res/drawable/rn_edit_text_material.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
android:insetTop="@dimen/abc_edit_text_inset_top_material"
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
<selector>
<!--
This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
<item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
For more info, see https://bit.ly/3CdLStv (react-native/pull/29452) and https://bit.ly/3nxOMoR.
-->
<item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
<item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
</selector>
</inset>
Binary file removed android/app/src/qa/res/drawable/screen.png
Binary file not shown.
6 changes: 6 additions & 0 deletions android/app/src/qa/res/layout-night/launch_screen.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent" android:background="@color/theme">
<ImageView android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/fox" android:scaleType="center" />
</RelativeLayout>
Loading

0 comments on commit 44b108d

Please sign in to comment.