Merge branch 'main' into fix/confirmation-ui-adjustments

.gitignore

@@ -123,4 +123,4 @@ html-report/
 app/util/termsOfUse/termsOfUseContent.ts
 docs/assets/termsOfUse.html
 
-/app/images/branding
+/app/images/branding

.prettierignore

@@ -15,7 +15,7 @@ scripts
 .detoxrc.js
 .prettierignore
 locales
-.storybook
+.storybook/storybook.requires.js
 /ppom
 app/lib/ppom/ppom.html.js
-/app/lib/ppom/blockaid-version.js
+/app/lib/ppom/blockaid-version.js

.storybook/decorators/index.ts

@@ -1,2 +1,4 @@
+export { default as withMockStore } from './withMockStore';
 export { default as withNavigation } from './withNavigation';
 export { default as withSafeArea } from './withSafeArea';
+export { default as withTheme } from './withTheme';

.storybook/decorators/withMockStore.tsx

@@ -0,0 +1,16 @@
+// Third party dependencies
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { Provider } from 'react-redux';
+
+// External dependencies
+import { storybookStore } from '../storybook-store';
+
+const mockStore = configureMockStore();
+const store = mockStore(storybookStore);
+
+const withMockStore = (story: any) => {
+  return <Provider store={store}>{story()}</Provider>;
+};
+
+export default withMockStore;

.storybook/decorators/withTheme.tsx

@@ -0,0 +1,8 @@
+import React from 'react';
+import ThemeProvider from '../../app/component-library/providers/ThemeProvider/ThemeProvider';
+
+const withTheme = (storyFn: () => React.ReactNode) => (
+  <ThemeProvider>{storyFn()}</ThemeProvider>
+);
+
+export default withTheme;

.storybook/preview.js

@@ -1,15 +1,15 @@
-import { ThemeContext, mockTheme } from '../app/util/theme';
-import { withNavigation, withSafeArea } from './decorators';
+import {
+  withMockStore,
+  withTheme,
+  withNavigation,
+  withSafeArea,
+} from './decorators';
 
 export const decorators = [
-  // Using a decorator to apply padding for every story
-  (StoryFn) => (
-    <ThemeContext.Provider value={mockTheme}>
-      {<StoryFn />}
-    </ThemeContext.Provider>
-  ),
+  withTheme,
   withSafeArea,
   withNavigation,
+  withMockStore,
 ];
 
 export const parameters = {

.storybook/storybook-store.js

@@ -0,0 +1,5 @@
+import { AppThemeKey } from '../app/util/theme/models';
+
+export const storybookStore = {
+  user: { appTheme: AppThemeKey.os },
+};

CHANGELOG.md

@@ -2,7 +2,16 @@
 
 ## Current Main Branch
 
-## 7.29.0 - Aug 2, 2024
+## 7.29.2 - Sep 2, 2024
+### Fixed
+- [#10965](https://github.com/MetaMask/metamask-mobile/pull/10965): fix: gas never loading during send + high gas fee after deep link (#10965)
+- [#11005](https://github.com/MetaMask/metamask-mobile/pull/11005): fix: Add missing allowedAction NetworkController:findNetworkClientIdByChainId to transactionController (#11005)
+
+## 7.29.1 - Aug 29, 2024
+### Fixed
+- [#10831](https://github.com/MetaMask/metamask-mobile/pull/10831): feat: Update Polygon from MATIC to POL (#10831)
+
+## 7.29.0 - Aug 6, 2024
 ### Added
 - [#9578](https://github.com/MetaMask/metamask-mobile/pull/9578): feat: type `renderHookWithProvider` (#9578)
 - [#10277](https://github.com/MetaMask/metamask-mobile/pull/10277): feat: New nft details page (#10277)
@@ -66,7 +75,6 @@
 - [#10383](https://github.com/MetaMask/metamask-mobile/pull/10383): fix: race condition issues when doing batch-rpc calls in the DeeplinkProtocolService (#10383)
 - [#10365](https://github.com/MetaMask/metamask-mobile/pull/10365): fix: attribution link (#10365)
 - [#10303](https://github.com/MetaMask/metamask-mobile/pull/10303): fix: page navigation during QR accounts selection (#10303)
-
 ## 7.28.1 - Aug 15, 2024
 ### Fixed
 - [#10637](https://github.com/MetaMask/metamask-mobile/pull/10637): fix: swap button blocked by SwapsController polling issue (#10637)

android/app/build.gradle

@@ -173,8 +173,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1397
-        versionName "7.29.0"
+        versionCode 1409
+        versionName "7.29.2"
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy 'react-native-camera', 'general'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

android/app/src/main/AndroidManifest.xml

@@ -36,6 +36,17 @@
 		android:largeHeap="true"
      	android:exported="false"
      	>
+		<activity
+			android:launchMode="singleInstance"
+			android:name=".SplashActivity"
+			android:theme="@style/SplashTheme"
+			android:label="@string/app_name"
+			android:exported="false"
+		>
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+			</intent-filter>
+		</activity>
 		<activity
 			android:launchMode="singleTask"
 			android:name=".MainActivity"