Merge branch 'main' of github.com:Expensify/App

.github/scripts/verifyPodfile.sh

@@ -10,6 +10,15 @@ title "Verifying that Podfile.lock is synced with the project"
 
 declare EXIT_CODE=0
 
+# Check Provisioning Style. If automatic signing is enabled, iOS builds will fail, so ensure we always have the proper profile specified
+info "Verifying that automatic signing is not enabled"
+if grep -q 'PROVISIONING_PROFILE_SPECIFIER = chat_expensify_appstore' ios/NewExpensify.xcodeproj/project.pbxproj; then
+    success "Automatic signing not enabled"
+else
+    error "Error: Automatic provisioning style is not allowed!"
+    EXIT_CODE=1
+fi
+
 PODFILE_SHA=$(openssl sha1 ios/Podfile | awk '{print $2}')
 PODFILE_LOCK_SHA=$(awk '/PODFILE CHECKSUM: /{print $3}' ios/Podfile.lock)
 

.github/workflows/test.yml

@@ -6,69 +6,44 @@ on:
     types: [opened, synchronize]
     branches-ignore: [staging, production]
 
-env:
-  # Number of parallel jobs for jest tests
-  CHUNKS: 3
 jobs:
-  config:
-    runs-on: ubuntu-latest
-    name: Define matrix parameters
-    outputs:
-      MATRIX: ${{ steps.set-matrix.outputs.MATRIX }}
-      JEST_CHUNKS: ${{ steps.set-matrix.outputs.JEST_CHUNKS }}
-    steps:
-      - name: Set Matrix
-        id: set-matrix
-        uses: actions/github-script@v6
-        with:
-          # Generate matrix array i.e. [0, 1, 2, ...., CHUNKS - 1] for test job
-          script: |
-            core.setOutput('MATRIX', Array.from({ length: Number(process.env.CHUNKS) }, (v, i) => i + 1));
-            core.setOutput('JEST_CHUNKS', Number(process.env.CHUNKS) - 1);
-
-  test:
-    needs: config
+  jest:
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
-    name: test (job ${{ fromJSON(matrix.chunk) }})
     env:
       CI: true
     strategy:
       fail-fast: false
       matrix:
-        chunk: ${{fromJson(needs.config.outputs.MATRIX)}}
-
+        chunk: [ 1, 2, 3 ]
+    name: test (job ${{ fromJSON(matrix.chunk) }})
     steps:
-      # This action checks-out the repository, so the workflow can access it.
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-        with:
-          fetch-depth: 0
+      - uses: actions/checkout@885641592076c27bfb56c028cd5612cdad63e16d
 
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
-      # If automatic signing is enabled, iOS builds will fail, so ensure we always have the proper profile specified
-      - name: Check Provisioning Style
-        run: |
-          if grep -q 'PROVISIONING_PROFILE_SPECIFIER = chat_expensify_appstore' ios/NewExpensify.xcodeproj/project.pbxproj; then
-            exit 0
-          else
-            echo "Error: Automatic provisioning style is not allowed!"
-            exit 1
-          fi
+      - name: Get number of CPU cores
+        id: cpu-cores
+        uses: SimenB/github-actions-cpu-cores@31e91de0f8654375a21e8e83078be625380e2b18
 
       - name: Cache Jest cache
         id: cache-jest-cache
-        uses: actions/cache@v1
+        uses: actions/cache@ac25611caef967612169ab7e95533cf932c32270
         with:
           path: .jest-cache
           key: ${{ runner.os }}-jest
 
-      - name: All Unit Tests
-        if: ${{ fromJSON(matrix.chunk) < fromJSON(env.CHUNKS) }}
-        # Split the jest based test files in multiple chunks/groups and then execute them in parallel in different jobs/runners.
-        run: npx jest --listTests --json | jq -cM '[_nwise(length / ${{ fromJSON(needs.config.outputs.JEST_CHUNKS) }} | ceil)]' | jq '[[]] + .' | jq '.[${{ fromJSON(matrix.chunk) }}] | .[] | @text' | xargs npm test
+      - name: Jest tests
+        run: npx jest --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --max-workers ${{ steps.cpu-cores.outputs.count }}
+
+  shellTests:
+    if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
+    runs-on: ubuntu-latest
+    name: Shell tests
+    steps:
+      - uses: actions/checkout@885641592076c27bfb56c028cd5612cdad63e16d
+
+      - uses: Expensify/App/.github/actions/composite/setupNode@main
 
-      - name: Pull Request Tests
-        # Pull request related tests will be run in separate runner in parallel.
-        if: ${{ fromJSON(matrix.chunk) == fromJSON(env.CHUNKS) }}
+      - name: getPullRequestsMergedBetween
         run: tests/unit/getPullRequestsMergedBetweenTest.sh

.storybook/fonts.css

@@ -0,0 +1,50 @@
+@font-face {
+    font-family: ExpensifyNeue-Regular;
+    font-weight: 400;
+    font-style: normal;
+    src: url('../assets/fonts/web/ExpensifyNeue-Regular.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-Regular.woff') format('woff');
+}
+
+@font-face {
+    font-family: ExpensifyNeue-Regular;
+    font-weight: 700;
+    font-style: normal;
+    src: url('../assets/fonts/web/ExpensifyNeue-Bold.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-Bold.woff') format('woff');
+}
+
+@font-face {
+    font-family: ExpensifyNeue-Regular;
+    font-weight: 400;
+    font-style: italic;
+    src: url('../assets/fonts/web/ExpensifyNeue-Italic.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-Italic.woff') format('woff');
+}
+
+@font-face {
+    font-family: ExpensifyNeue-Regular;
+    font-weight: 700;
+    font-style: italic;
+    src: url('../assets/fonts/web/ExpensifyNeue-BoldItalic.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-BoldItalic.woff') format('woff');
+}
+
+@font-face {
+    font-family: ExpensifyMono-Regular;
+    font-weight: 400;
+    font-style: normal;
+    src: url('../assets/fonts/web/ExpensifyMono-Regular.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyMono-Regular.woff') format('woff');
+}
+
+@font-face {
+    font-family: ExpensifyMono-Bold;
+    font-weight: 700;
+    font-style: normal;
+    src: url('../assets/fonts/web/ExpensifyMono-Bold.woff2') format('woff2'),  url('../assets/fonts/web/ExpensifyMono-Bold.woff') format('woff');
+}
+
+* {
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+}
+
+strong {
+    font-weight: 600;
+}

.storybook/main.js

@@ -10,7 +10,8 @@ module.exports = {
     ],
     staticDirs: [
         './public',
-        '../assets/css',
+        {from: '../assets/css', to: 'css'},
+        {from: '../assets/fonts/web', to: 'fonts'},
     ],
     core: {
         builder: 'webpack5',

.storybook/manager-head.html

@@ -1,3 +1,3 @@
 <link rel="icon" type="image/png" href="logo.png" />
-<link rel="stylesheet" type="text/css" href="fonts.css" />
+<link rel="stylesheet" type="text/css" href="css/fonts.css" />
 <link rel="stylesheet" type="text/css" href="index.css" />

.storybook/preview.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import Onyx from 'react-native-onyx';
-import '../assets/css/fonts.css';
+import './fonts.css';
 import ComposeProviders from '../src/components/ComposeProviders';
 import HTMLEngineProvider from '../src/components/HTMLEngineProvider';
 import OnyxProvider from '../src/components/OnyxProvider';

android/app/build.gradle

@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001026500
-        versionName "1.2.65-0"
+        versionCode 1001027200
+        versionName "1.2.72-0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java

@@ -171,10 +171,7 @@ private void applyMessageStyle(@NonNull Context context, NotificationCompat.Buil
         String message = reportAction.get("message").getList().get(0).getMap().get("text").getString();
         long time = Timestamp.valueOf(reportAction.get("created").getString(Instant.now().toString())).getTime();
         String roomName = payload.get("roomName") == null ? "" : payload.get("roomName").getString("");
-        String conversationTitle = "Chat with " + name;
-        if (!roomName.isEmpty()) {
-            conversationTitle = "#" + roomName;
-        }
+        String conversationTitle = roomName.isEmpty() ? "Chat with " + name : roomName;
 
         // Retrieve or create the Person object who sent the latest report comment
         Person person = notificationCache.people.get(accountID);

android/app/src/main/res/values/colors.xml

@@ -1,7 +1,7 @@
 <resources>
     <color name="bootsplash_background">#061B09</color>
     <color name="white">#FFFFFF</color>
-    <color name="accent">#0185ff</color>
+    <color name="accent">#03D47C</color>
     <color name="dark">#0b1b34</color>
     <color name="gray4">#7D8B8F</color>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -5,7 +5,6 @@
 
     <!-- Base application theme. Applied to all Android versions -->
     <style name="BaseAppTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:textColor">@color/dark</item>
         <item name="android:colorEdgeEffect">@color/gray4</item>
         <item name="android:statusBarColor">#061B09</item>
         <item name="colorAccent">@color/accent</item>

android/build.gradle

@@ -24,7 +24,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.2.1")
+        classpath("com.android.tools.build:gradle:7.2.2")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("de.undercouch:gradle-download-task:5.0.1")
         classpath("com.google.gms:google-services:4.3.4")

assets/emojis.js

@@ -1,5 +1,3 @@
-import CONST from '../src/CONST';
-
 /*
  * This list is generated from the code here https://github.com/github/gemoji/blob/master/db/emoji.json
  * Each code is then converted to hex by replacing the "U+" with "0x"
@@ -48,7 +46,7 @@ import CONST from '../src/CONST';
 // BEFORE YOU EDIT THIS, PLEASE SEE WARNINGS IN EmojiPickerMenu.js
 const skinTones = [{
     code: '🖐',
-    skinTone: CONST.DEFAULT_SKIN_TONE,
+    skinTone: -1,
 }, {
     code: '🖐🏻',
     skinTone: 4,
@@ -1728,10 +1726,6 @@ const emojis = [
             'sleep',
         ],
     },
-    {
-        code: 'peopleAndBody',
-        header: true,
-    },
     {
         name: 'wave',
         code: '👋',