Merge branch 'main' into migrateUnorderedListToTypeScript

software-mansion-labs · Nov 7, 2023 · 37ddcc0 · 37ddcc0
2 parents 6a15a2d + f9cf18e
commit 37ddcc0
Show file tree

Hide file tree

Showing 235 changed files with 3,331 additions and 1,679 deletions.
diff --git a/.github/ISSUE_TEMPLATE/Standard.md b/.github/ISSUE_TEMPLATE/Standard.md
@@ -42,45 +42,8 @@ Which of our officially supported platforms is this issue occurring on?
 - [ ] MacOS: Desktop
 
 ## Screenshots/Videos
-<details>
-<summary>Android: Native</summary>
 
-<!-- add screenshots or videos here -->
-
-</details>
-
-<details>
-<summary>Android: mWeb Chrome</summary>
-
-<!-- add screenshots or videos here -->
-
-</details>
-
-<details>
-<summary>iOS: Native</summary>
-
-<!-- add screenshots or videos here -->
-
-</details>
-
-<details>
-<summary>iOS: mWeb Safari</summary>
-
-<!-- add screenshots or videos here -->
-
-</details>
-
-<details>
-<summary>MacOS: Chrome / Safari</summary>
-
-<!-- add screenshots or videos here -->
-
-</details>
-
-<details>
-<summary>MacOS: Desktop</summary>
-
-<!-- add screenshots or videos here -->
+Add any screenshot/video evidence
 
 </details>
 

diff --git a/.github/actions/javascript/postTestBuildComment/index.js b/.github/actions/javascript/postTestBuildComment/index.js
@@ -35,12 +35,12 @@ function getTestBuildMessage() {
     const iOSQRCode = iOSSuccess ? `![iOS](https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${iOSLink})` : "The QR code can't be generated, because the iOS build failed";
     const webQRCode = webSuccess ? `![Web](https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${webLink})` : "The QR code can't be generated, because the web build failed";
 
-    const message = `:test_tube::test_tube: Use the links below to test this build in android and iOS. Happy testing! :test_tube::test_tube:
-| android :robot:  | iOS :apple: |
+    const message = `:test_tube::test_tube: Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! :test_tube::test_tube:
+| Android :robot:  | iOS :apple: |
 | ------------- | ------------- |
 | ${androidLink}  | ${iOSLink}  |
 | ${androidQRCode}  | ${iOSQRCode}  |
-| desktop :computer: | web :spider_web: |
+| Desktop :computer: | Web :spider_web: |
 | ${desktopLink}  | ${webLink}  |
 | ${desktopQRCode}  | ${webQRCode}  |`;
 

diff --git a/.github/actions/javascript/postTestBuildComment/postTestBuildComment.js b/.github/actions/javascript/postTestBuildComment/postTestBuildComment.js
@@ -26,12 +26,12 @@ function getTestBuildMessage() {
     const iOSQRCode = iOSSuccess ? `![iOS](https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${iOSLink})` : "The QR code can't be generated, because the iOS build failed";
     const webQRCode = webSuccess ? `![Web](https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${webLink})` : "The QR code can't be generated, because the web build failed";
 
-    const message = `:test_tube::test_tube: Use the links below to test this build in android and iOS. Happy testing! :test_tube::test_tube:
-| android :robot:  | iOS :apple: |
+    const message = `:test_tube::test_tube: Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! :test_tube::test_tube:
+| Android :robot:  | iOS :apple: |
 | ------------- | ------------- |
 | ${androidLink}  | ${iOSLink}  |
 | ${androidQRCode}  | ${iOSQRCode}  |
-| desktop :computer: | web :spider_web: |
+| Desktop :computer: | Web :spider_web: |
 | ${desktopLink}  | ${webLink}  |
 | ${desktopQRCode}  | ${webQRCode}  |`;
 

diff --git a/.github/workflows/e2ePerformanceTests.yml b/.github/workflows/e2ePerformanceTests.yml
@@ -183,6 +183,7 @@ jobs:
           file_artifacts: Customer Artifacts.zip
           log_artifacts: debug.log
           cleanup: true
+          timeout: 5400
 
       - name: Print logs if run failed
         if: failure()
@@ -213,6 +214,7 @@ jobs:
           remote_src: false
           file_artifacts: Customer Artifacts.zip
           cleanup: true
+          timeout: 5400
 
       - name: Unzip AWS Device Farm delta results
         run: unzip "Customer Artifacts.zip" -d deltaResults

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -154,7 +154,7 @@ jobs:
 
       - name: Build production desktop app
         if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: npm run desktop-build -- --publish always
+        run: npm run desktop-build
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
@@ -165,7 +165,7 @@ jobs:
 
       - name: Build staging desktop app
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: npm run desktop-build-staging -- --publish always
+        run: npm run desktop-build-staging
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}

diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
@@ -246,7 +246,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - name: Build desktop app for testing
-        run: npm run desktop-build-adhoc -- --publish always
+        run: npm run desktop-build-adhoc
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
@@ -339,7 +339,7 @@ jobs:
         if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
         with:
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
-          body-include: 'Use the links below to test this build in android and iOS. Happy testing!'
+          body-include: 'Use the links below to test this adhoc build in Android, iOS, Desktop, and Web. Happy testing!'
           number: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
           delete: true
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001039301
-        versionName "1.3.93-1"
+        versionCode 1001039505
+        versionName "1.3.95-5"
     }
 
     flavorDimensions "default"

diff --git a/assets/css/fonts.css b/assets/css/fonts.css
@@ -54,6 +54,11 @@
     src: url('/fonts/ExpensifyNewKansas-MediumItalic.woff2') format('woff2'),  url('/fonts/ExpensifyNewKansas-MediumItalic.woff') format('woff');
 }
 
+@font-face {
+    font-family: Windows Segoe UI Emoji;
+    src: url('/fonts/seguiemj.ttf');
+}
+
 * {
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;

diff --git a/assets/fonts/web/seguiemj.ttf b/assets/fonts/web/seguiemj.ttf
diff --git a/config/electronBuilder.config.js b/config/electronBuilder.config.js
@@ -1,6 +1,5 @@
 const {version} = require('../package.json');
 
-const isPublishing = process.argv.includes('--publish');
 const pullRequestNumber = process.env.PULL_REQUEST_NUMBER;
 
 const s3Bucket = {
@@ -28,8 +27,7 @@ if (!isCorrectElectronEnv) {
 }
 
 /**
- * The configuration for the production and staging Electron builds.
- * It can be used to create local builds of the same, by omitting the `--publish` flag
+ * The configuration for the debug, production and staging Electron builds.
  */
 module.exports = {
     appId: 'com.expensifyreactnative.chat',
@@ -44,6 +42,9 @@ module.exports = {
         entitlements: 'desktop/entitlements.mac.plist',
         entitlementsInherit: 'desktop/entitlements.mac.plist',
         type: 'distribution',
+        notarize: {
+            teamId: '368M544MTT',
+        },
     },
     dmg: {
         title: 'New Expensify',
@@ -58,7 +59,6 @@ module.exports = {
             path: s3Path[process.env.ELECTRON_ENV],
         },
     ],
-    afterSign: isPublishing ? './desktop/notarize.js' : undefined,
     files: ['dist', '!dist/www/{.well-known,favicon*}'],
     directories: {
         app: 'desktop',

diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
@@ -187,7 +187,6 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
             'react-native-config': 'react-web-config',
             'react-native$': '@expensify/react-native-web',
             'react-native-web': '@expensify/react-native-web',
-            'lottie-react-native': 'react-native-web-lottie',
 
             // Module alias for web & desktop
             // https://webpack.js.org/configuration/resolve/#resolvealias

diff --git a/contributingGuides/APPLE_GOOGLE_SIGNIN.md b/contributingGuides/APPLE_GOOGLE_SIGNIN.md
@@ -233,7 +233,7 @@ If developing on MacOS, the development desktop app can't handle deeplinks corre
 1. Create a "real" build of the desktop app, which can handle deep links, open the build folder, and install the dmg there:
 
 ```
-npm run desktop-build --publish=never
+npm run desktop-build
 open desktop-build
 # Then double-click "NewExpensify.dmg" in Finder window
 ```