Merge branch 'main' into aswin_s/issue-16526

Expensify · Apr 26, 2023 · 0ab51e7 · 0ab51e7
2 parents f9c99c5 + f3fae40
commit 0ab51e7
Show file tree

Hide file tree

Showing 269 changed files with 20,085 additions and 2,047 deletions.
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
@@ -71,6 +71,12 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
+      - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
+        run: |
+          cp .env.staging .env.adhoc
+          sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc  
+          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
@@ -121,6 +127,12 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
+      - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
+        run: |
+          cp .env.staging .env.adhoc
+          sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc  
+          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
@@ -178,6 +190,12 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
           fetch-depth: 0
 
+      - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
+        run: |
+          cp .env.staging .env.adhoc
+          sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc  
+          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Decrypt Developer ID Certificate
@@ -192,7 +210,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - name: Build desktop app for testing
-        run: npm run desktop-build-internal -- --publish always
+        run: npm run desktop-build-adhoc -- --publish always
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
@@ -214,6 +232,12 @@ jobs:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
+      - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
+        run: |
+          cp .env.staging .env.adhoc
+          sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc  
+          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Configure AWS Credentials
@@ -223,7 +247,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - name: Build web for testing
-        run: npm run build-staging
+        run: npm run build-adhoc
 
       - name: Build docs
         run: npm run storybook-build
@@ -257,7 +281,8 @@ jobs:
           content_android="${content_android//'%'/'%25'}"
           content_android="${content_android//$'\n'/'%0A'}"
           content_android="${content_android//$'\r'/'%0D'}"
-          echo "android_paths=$content_android" >> "$GITHUB_OUTPUT"
+          android_path=$(echo "$content_android" | jq -r '.html_path')
+          echo "android_path=$android_path" >> "$GITHUB_OUTPUT"
 
       - name: Read JSONs with iOS paths
         id: get_ios_path
@@ -267,7 +292,8 @@ jobs:
           content_ios="${content_ios//'%'/'%25'}"
           content_ios="${content_ios//$'\n'/'%0A'}"
           content_ios="${content_ios//$'\r'/'%0D'}"
-          echo "ios_paths=$content_ios" >> "$GITHUB_OUTPUT"
+          ios_path=$(echo "$content_ios" | jq -r '.html_path')
+          echo "ios_path=$ios_path" >> "$GITHUB_OUTPUT"
 
       # This step removes previous comments with links connected to the PR
       - name: maintain-comment
@@ -289,7 +315,7 @@ jobs:
           DESKTOP: ${{ needs.desktop.result }}
           IOS: ${{ needs.iOS.result }}
           WEB: ${{ needs.web.result }}
-          ANDROID_LINK: ${{fromJson(steps.get_android_path.outputs.android_paths).html_path}}
+          ANDROID_LINK: ${{steps.get_android_path.outputs.android_path}}
           DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${{ env.PULL_REQUEST_NUMBER }}/NewExpensify.dmg
-          IOS_LINK: ${{ fromJson(steps.get_ios_path.outputs.ios_paths).html_path }}
+          IOS_LINK: ${{steps.get_ios_path.outputs.ios_path}}
           WEB_LINK: https://${{ env.PULL_REQUEST_NUMBER }}.pr-testing.expensify.com
diff --git a/.github/workflows/validateGithubActions.yml b/.github/workflows/validateGithubActions.yml
@@ -4,6 +4,8 @@ on:
   pull_request:
     types: [opened, synchronize]
     branches-ignore: [staging, production]
+    paths:
+      - .github/**
 
 jobs:
   verify:

diff --git a/.github/workflows/verifyPodfile.yml b/.github/workflows/verifyPodfile.yml
@@ -4,6 +4,10 @@ on:
   pull_request:
     types: [opened, synchronize]
     branches-ignore: [staging, production]
+    paths:
+      - ios/**
+      - "package.json"
+      - "package-lock.json"
 
 jobs:
   verify:

diff --git a/.storybook/preview.js b/.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 />

diff --git a/.storybook/public/index.css b/.storybook/public/index.css
@@ -1,24 +1,28 @@
 .search-field *, .sidebar-item, .search-result-item--label {
-    color: #fff !important;
+    color: #E7ECE9 !important;
 }
 
 .sidebar-subheading *, .search-result-item {
-    color: #fff;
+    color: #E7ECE9;
 }
 
 a.sidebar-item > svg {
     color: #03d47c;
 }
 
+a.sidebar-item[data-selected="true"], a.sidebar-item[data-selected="true"]:focus, a.sidebar-item[data-selected="true"]:hover {
+    background: #1A3D32;
+}
+
 .search-result-item--label span {
-    color: #ffffffaa !important;
+    color: #E7ECE9aa !important;
 }
 
 #panel-tab-content :is(input:checked ~ span:last-of-type, input:not(:checked) ~ span:first-of-type) {
-    background: #ff7101;
-    color: #fff;
+    background: #03D47C;
+    color: #E7ECE9;
 }
 
 .sidebar-container {
-    background: #0b1b34;
+    background: #07271f;
 }
diff --git a/.storybook/public/logo.png b/.storybook/public/logo.png
diff --git a/.storybook/public/logomark.svg b/.storybook/public/logomark.svg
diff --git a/.storybook/theme.js b/.storybook/theme.js
@@ -2,14 +2,22 @@ import {create} from '@storybook/theming';
 import colors from '../src/styles/colors';
 
 export default create({
-    appBg: colors.dark,
-    barSelectedColor: colors.blue,
-    base: 'light',
-    brandTitle: 'Expensify UI Docs',
+    brandTitle: 'New Expensify UI Docs',
     brandImage: 'logomark.svg',
-    colorPrimary: colors.dark,
-    colorSecondary: colors.orange,
     fontBase: 'ExpensifyNeue-Regular',
     fontCode: 'monospace',
-    textInverseColor: colors.black,
+    base: 'dark',
+    appBg: colors.greenHighlightBackground,
+    colorPrimary: colors.greenDefaultButton,
+    colorSecondary: colors.green,
+    appContentBg: colors.greenAppBackground,
+    textColor: colors.white,
+    barTextColor: colors.white,
+    barSelectedColor: colors.green,
+    barBg: colors.greenAppBackground,
+    appBorderColor: colors.greenBorders,
+    inputBg: colors.greenHighlightBackground,
+    inputBorder: colors.greenBorders,
+    appBorderRadius: 8,
+    inputBorderRadius: 8,
 });
diff --git a/__mocks__/react-native-dev-menu.js b/__mocks__/react-native-dev-menu.js
@@ -0,0 +1,3 @@
+export default {
+    addItem: jest.fn(),
+};
diff --git a/__mocks__/react-native-key-command.js b/__mocks__/react-native-key-command.js
@@ -0,0 +1,13 @@
+const registerKeyCommands = () => {};
+const unregisterKeyCommands = () => {};
+const constants = {};
+const eventEmitter = () => {};
+const addListener = () => {};
+
+export {
+    registerKeyCommands,
+    unregisterKeyCommands,
+    constants,
+    eventEmitter,
+    addListener,
+};
diff --git a/android/app/build.gradle b/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 1001030600
+        versionName "1.3.6-0"
     }
 
     splits {

diff --git a/android/app/src/e2eRelease/java/com/expensify/chat/ReactNativeFlipper.java b/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.
+  }
+}
diff --git a/android/app/src/main/assets/fonts/ExpensifyMono-Bold.otf b/android/app/src/main/assets/fonts/ExpensifyMono-Bold.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyMono-Regular.otf b/android/app/src/main/assets/fonts/ExpensifyMono-Regular.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-Bold.otf b/android/app/src/main/assets/fonts/ExpensifyNeue-Bold.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-BoldItalic.otf b/android/app/src/main/assets/fonts/ExpensifyNeue-BoldItalic.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-Italic.otf b/android/app/src/main/assets/fonts/ExpensifyNeue-Italic.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-Regular.otf b/android/app/src/main/assets/fonts/ExpensifyNeue-Regular.otf
diff --git a/android/app/src/main/java/com/expensify/chat/MainActivity.java b/android/app/src/main/java/com/expensify/chat/MainActivity.java
@@ -2,7 +2,9 @@
 
 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;
@@ -44,4 +46,34 @@ 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);
+  }
 }
diff --git a/android/link-assets-manifest.json b/android/link-assets-manifest.json
@@ -3,27 +3,27 @@
   "data": [
     {
       "path": "assets/fonts/native/ExpensifyMono-Bold.otf",
-      "sha1": "6b83b1c1c0c8650f6258fd05771b4e25696c4046"
+      "sha1": "d70e12540200613e9e6ac9068bed57e4bf477bfe"
     },
     {
       "path": "assets/fonts/native/ExpensifyMono-Regular.otf",
-      "sha1": "c0522536213e24609badc298ed82a6c47cdb5b20"
+      "sha1": "9bbd3795afea1b1136c5b6a8ecd7d470fd5ea1b2"
     },
     {
       "path": "assets/fonts/native/ExpensifyNeue-Bold.otf",
-      "sha1": "c61cccfb6091f06381fa5b514272eab7105246d8"
+      "sha1": "fba09dcd16261f9fd181a772e3f7879e5deafb7f"
     },
     {
       "path": "assets/fonts/native/ExpensifyNeue-BoldItalic.otf",
-      "sha1": "039065b262036e708ebb5f64b236ef08cc4e8f4e"
+      "sha1": "fe3969031652a5160819514bd62c36acb8ef7d24"
     },
     {
       "path": "assets/fonts/native/ExpensifyNeue-Italic.otf",
-      "sha1": "7ddd0652175a9f27380fc63eec4395d65ed189eb"
+      "sha1": "e07eeb6fbabec2b46d708f59bccdacc5bbf8acbf"
     },
     {
       "path": "assets/fonts/native/ExpensifyNeue-Regular.otf",
-      "sha1": "57b2cdd2f4adea3fad34464248502cd4edcaadd7"
+      "sha1": "32290ecbda86b5938c7538f6bf5c3106b43e5a6e"
     },
     {
       "path": "assets/fonts/native/ExpensifyNewKansas-Medium.otf",

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -11,6 +11,8 @@ include ':react-native-config'
 project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android')
 include ':react-native-plaid-link-sdk'
 project(':react-native-plaid-link-sdk').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-plaid-link-sdk/android')
+include ':react-native-dev-menu'
+project(':react-native-dev-menu').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-dev-menu/android')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/react-native-gradle-plugin')
diff --git a/assets/fonts/native/ExpensifyMono-Bold.otf b/assets/fonts/native/ExpensifyMono-Bold.otf
diff --git a/assets/fonts/native/ExpensifyMono-Regular.otf b/assets/fonts/native/ExpensifyMono-Regular.otf
diff --git a/assets/fonts/native/ExpensifyNeue-Bold.otf b/assets/fonts/native/ExpensifyNeue-Bold.otf
diff --git a/assets/fonts/native/ExpensifyNeue-BoldItalic.otf b/assets/fonts/native/ExpensifyNeue-BoldItalic.otf
diff --git a/assets/fonts/native/ExpensifyNeue-Italic.otf b/assets/fonts/native/ExpensifyNeue-Italic.otf
diff --git a/assets/fonts/native/ExpensifyNeue-Regular.otf b/assets/fonts/native/ExpensifyNeue-Regular.otf
diff --git a/assets/fonts/web/ExpensifyMono-Bold.woff b/assets/fonts/web/ExpensifyMono-Bold.woff
diff --git a/assets/fonts/web/ExpensifyMono-Bold.woff2 b/assets/fonts/web/ExpensifyMono-Bold.woff2
diff --git a/assets/fonts/web/ExpensifyMono-Regular.woff b/assets/fonts/web/ExpensifyMono-Regular.woff
diff --git a/assets/fonts/web/ExpensifyMono-Regular.woff2 b/assets/fonts/web/ExpensifyMono-Regular.woff2
diff --git a/assets/fonts/web/ExpensifyNeue-Bold.woff b/assets/fonts/web/ExpensifyNeue-Bold.woff
diff --git a/assets/fonts/web/ExpensifyNeue-Bold.woff2 b/assets/fonts/web/ExpensifyNeue-Bold.woff2
diff --git a/assets/fonts/web/ExpensifyNeue-BoldItalic.woff b/assets/fonts/web/ExpensifyNeue-BoldItalic.woff
diff --git a/assets/fonts/web/ExpensifyNeue-BoldItalic.woff2 b/assets/fonts/web/ExpensifyNeue-BoldItalic.woff2
diff --git a/assets/fonts/web/ExpensifyNeue-Italic.woff b/assets/fonts/web/ExpensifyNeue-Italic.woff
diff --git a/assets/fonts/web/ExpensifyNeue-Italic.woff2 b/assets/fonts/web/ExpensifyNeue-Italic.woff2
diff --git a/assets/fonts/web/ExpensifyNeue-Regular.woff b/assets/fonts/web/ExpensifyNeue-Regular.woff
diff --git a/assets/fonts/web/ExpensifyNeue-Regular.woff2 b/assets/fonts/web/ExpensifyNeue-Regular.woff2