Merge branch 'main' into dangrous-filterdevmoderations

Expensify · Jul 13, 2023 · b66a1ea · b66a1ea
2 parents 3b62a73 + 6e6b95f
commit b66a1ea
Show file tree

Hide file tree

Showing 50 changed files with 538 additions and 469 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -2,7 +2,7 @@ module.exports = {
     extends: ['expensify', 'plugin:storybook/recommended', 'plugin:react-hooks/recommended', 'prettier', 'plugin:react-native-a11y/basic'],
     plugins: ['react-hooks', 'react-native-a11y'],
     parser: 'babel-eslint',
-    ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js', 'desktop/dist/*.js', 'dist/*.js', 'node_modules/.bin/**', '.git/**'],
+    ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js', 'desktop/dist/*.js', 'dist/*.js', 'node_modules/.bin/**', 'node_modules/.cache/**', '.git/**'],
     env: {
         jest: true,
     },
@@ -23,18 +23,13 @@ module.exports = {
                 paths: [
                     {
                         name: 'react-native',
-                        importNames: ['useWindowDimensions'],
-                        message: 'Please use useWindowDimensions from src/hooks/useWindowDimensions instead',
-                    },
-                    {
-                        name: 'react-native',
-                        importNames: ['StatusBar'],
-                        message: 'Please use StatusBar from src/libs/StatusBar instead',
-                    },
-                    {
-                        name: 'react-native',
-                        importNames: ['TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight', 'Pressable'],
-                        message: 'Please use PressableWithFeedback and/or PressableWithoutFeedback from src/components/Pressable instead',
+                        importNames: ['useWindowDimensions', 'StatusBar', 'TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight', 'Pressable'],
+                        message: [
+                            '',
+                            "For 'useWindowDimensions', please use 'src/hooks/useWindowDimensions' instead.",
+                            "For 'TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight', 'Pressable', please use 'PressableWithFeedback' and/or 'PressableWithoutFeedback' from 'src/components/Pressable' instead.",
+                            "For 'StatusBar', please use 'src/libs/StatusBar' instead.",
+                        ].join('\n'),
                     },
                 ],
             },

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
@@ -60,7 +60,6 @@ git fetch origin main # This will fetch the full history of the main branch, plu
 # Good
 git fetch origin main --no-tags --depth=1 # This will just fetch the latest commit from main
 git fetch origin tag 1.0.0-0 --no-tags --depth=1 # This will fetch the latest commit from the 1.0.0-0 tag and create a local tag to match
-git fetch origin staging --no-tags --shallow-since="$(( $(date +%s) - 3600 ))" # This will fetch all commits made to the staging branch in the last hour
 git fetch origin tag 1.0.1-0 --no-tags --shallow-exclude=1.0.0-0 # This will fetch all commits from the 1.0.1-0 tag, except for those that are reachable from the 1.0.0-0 tag.
 ```
 

diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml
@@ -43,12 +43,19 @@ jobs:
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
+      - name: Get previous app version
+        id: getPreviousVersion
+        uses: Expensify/App/.github/actions/javascript/getPreviousVersion@main
+        with:
+          SEMVER_LEVEL: 'PATCH'
+
+      - name: Fetch history of relevant refs
+        run: |
+          git fetch origin main staging --no-tags --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}
+
       - name: Get version bump commit
         id: getVersionBumpCommit
         run: |
-          # Find the commit for the version-bump
-          # This command fetches commits in the last hour on the main branch
-          git fetch origin main --no-tags --shallow-since="$(( $(date +%s) - 3600 ))"
           git switch main
           VERSION_BUMP_COMMIT="$(git log --format='%H' --author='OSBotify' --grep 'Update version to ${{ needs.createNewVersion.outputs.NEW_VERSION }}')"
           echo "VERSION_BUMP_SHA=$VERSION_BUMP_COMMIT" >> "$GITHUB_OUTPUT"
@@ -61,21 +68,6 @@ jobs:
           USER: ${{ github.actor }}
           PULL_REQUEST_NUMBER: ${{ github.event.inputs.PULL_REQUEST_NUMBER }}
 
-      - name: Get previous app version
-        id: getPreviousVersion
-        uses: Expensify/App/.github/actions/javascript/getPreviousVersion@main
-        with:
-          SEMVER_LEVEL: 'PATCH'
-
-      - name: Fetch history of relevant refs
-        run: |
-          git fetch origin \
-            staging \
-            ${{ steps.getVersionBumpCommit.outputs.VERSION_BUMP_SHA }} \
-            ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }} \
-            --no-tags \
-            --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}
-
       - name: Cherry-pick the version-bump to staging
         run: |
           git switch staging

diff --git a/.github/workflows/e2ePerformanceTests.yml b/.github/workflows/e2ePerformanceTests.yml
@@ -44,7 +44,7 @@ jobs:
         if: ${{ !fromJSON(steps.checkForExistingArtifact.outputs.exists) }}
         run: |
           git fetch origin tag ${{ steps.getMostRecentRelease.outputs.VERSION }} --no-tags --depth=1
-          git switch ${{ steps.getMostRecentRelease.outputs.VERSION }}
+          git switch --detach ${{ steps.getMostRecentRelease.outputs.VERSION }}
 
       - name: Build APK
         if: ${{ !fromJSON(steps.checkForExistingArtifact.outputs.exists) }}

diff --git a/.well-known/apple-app-site-association b/.well-known/apple-app-site-association
@@ -8,6 +8,10 @@
                        "/": "/r/*",
                        "comment": "Reports"
                     },
+                    {
+                        "/": "/a/*",
+                        "comment": "Profile Page"
+                    },
                     {
                         "/": "/settings/*",
                         "comment": "Profile and app settings"

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 1001033908
-        versionName "1.3.39-8"
+        versionCode 1001034003
+        versionName "1.3.40-3"
     }
 
     splits {

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -54,6 +54,7 @@
 
                 <!-- Production URLs -->
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/r"/>
+                <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/a"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/settings"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/details"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/v"/>
@@ -65,6 +66,7 @@
 
                 <!-- Staging URLs -->
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
+                <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/a"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/settings"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/details"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/v"/>

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">New Expensify</string>
+    <string name="app_name">Expensify Chat</string>
 </resources>
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.39</string>
+	<string>1.3.40</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.39.8</string>
+	<string>1.3.40.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.39</string>
+	<string>1.3.40</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.39.8</string>
+	<string>1.3.40.3</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.39-8",
+  "version": "1.3.40-3",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -78,7 +78,7 @@
     "babel-polyfill": "^6.26.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#d636fef3f22b4e5fcf61333ddc89a5d2e08cacc9",
+    "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#0c685f835b809395ef6adf0799ac171cba03a4ba",
     "fbjs": "^3.0.2",
     "htmlparser2": "^7.2.0",
     "jest-when": "^3.5.2",
@@ -115,7 +115,7 @@
     "react-native-key-command": "^1.0.1",
     "react-native-localize": "^2.2.6",
     "react-native-modal": "^13.0.0",
-    "react-native-onyx": "1.0.50",
+    "react-native-onyx": "1.0.52",
     "react-native-pdf": "^6.6.2",
     "react-native-performance": "^4.0.0",
     "react-native-permissions": "^3.0.1",
@@ -182,7 +182,7 @@
     "css-loader": "^6.7.2",
     "diff-so-fancy": "^1.3.0",
     "dotenv": "^16.0.3",
-    "electron": "22.3.14",
+    "electron": "^25.2.0",
     "electron-builder": "24.5.0",
     "eslint": "^7.6.0",
     "eslint-config-expensify": "^2.0.38",

diff --git a/src/CONST.js b/src/CONST.js
@@ -1141,7 +1141,7 @@ const CONST = {
         CARD_SECURITY_CODE: /^[0-9]{3,4}$/,
         CARD_EXPIRATION_DATE: /^(0[1-9]|1[0-2])([^0-9])?([0-9]{4}|([0-9]{2}))$/,
         PAYPAL_ME_USERNAME: /^[a-zA-Z0-9]{1,20}$/,
-        ROOM_NAME: /^#[a-z0-9-]{1,80}$/,
+        ROOM_NAME: /^#[a-z0-9à-ÿ-]{1,80}$/,
 
         // eslint-disable-next-line max-len, no-misleading-character-class
         EMOJIS: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,