Merge branch 'main' into internal-build-pr-badge

.storybook/preview.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import Onyx from 'react-native-onyx';
+import {SafeAreaProvider} from 'react-native-safe-area-context';
 import './fonts.css';
 import ComposeProviders from '../src/components/ComposeProviders';
 import HTMLEngineProvider from '../src/components/HTMLEngineProvider';
@@ -18,6 +19,7 @@ const decorators = [
                 OnyxProvider,
                 LocaleContextProvider,
                 HTMLEngineProvider,
+                SafeAreaProvider,
             ]}
         >
             <Story />

android/app/build.gradle

@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001030000
-        versionName "1.3.0-0"
+        versionCode 1001030102
+        versionName "1.3.1-2"
     }
 
     splits {

android/app/src/e2eRelease/java/com/expensify/chat/ReactNativeFlipper.java

@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ */
+package com.expensify.chat;
+
+import android.content.Context;
+import com.facebook.react.ReactInstanceManager;
+
+/**
+ * Class responsible of loading Flipper inside your React Native application. This is the release
+ * flavor of it so it's empty as we don't want to load Flipper.
+ */
+public class ReactNativeFlipper {
+  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
+    // Do nothing as we don't want to initialize Flipper on Release.
+  }
+}

android/app/src/main/java/com/expensify/chat/MainActivity.java

@@ -2,9 +2,7 @@
 
 import android.os.Bundle;
 import android.content.pm.ActivityInfo;
-import android.view.KeyEvent;
 import com.expensify.chat.bootsplash.BootSplash;
-import com.expensify.reactnativekeycommand.KeyCommandModule;
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
@@ -46,34 +44,4 @@ protected void onCreate(Bundle savedInstanceState) {
       setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
     }
   }
-
-  /**
-   * This method is called when a key down event has occurred.
-   * Forwards the event to the KeyCommandModule
-   */
-  @Override
-  public boolean onKeyDown(int keyCode, KeyEvent event) {
-    // Disabling hardware ESCAPE support which is handled by Android
-    if (event.getKeyCode() == KeyEvent.KEYCODE_ESCAPE) { 
-        return false; 
-    }
-    KeyCommandModule.getInstance().onKeyDownEvent(keyCode, event);
-    return super.onKeyDown(keyCode, event);
-  }
-
-  @Override
-  public boolean onKeyLongPress(int keyCode, KeyEvent event) {    
-    // Disabling hardware ESCAPE support which is handled by Android
-    if (event.getKeyCode() == KeyEvent.KEYCODE_ESCAPE) { return false; }
-    KeyCommandModule.getInstance().onKeyDownEvent(keyCode, event);
-    return super.onKeyLongPress(keyCode, event);
-  }
-
-  @Override
-  public boolean onKeyUp(int keyCode, KeyEvent event) {    
-    // Disabling hardware ESCAPE support which is handled by Android
-    if (event.getKeyCode() == KeyEvent.KEYCODE_ESCAPE) { return false; }
-    KeyCommandModule.getInstance().onKeyDownEvent(keyCode, event);
-    return super.onKeyUp(keyCode, event);
-  }
-}
+}