conflicts

.eslintrc.js

@@ -31,6 +31,11 @@ module.exports = {
                         importNames: ['TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight'],
                         message: 'Please use PressableWithFeedback and/or PressableWithoutFeedback from src/components/Pressable instead',
                     },
+                    {
+                        name: 'react-native',
+                        importNames: ['StatusBar'],
+                        message: 'Please use StatusBar from src/libs/StatusBar instead',
+                    },
                 ],
             },
         ],

.github/actions/composite/setupNode/action.yml

@@ -8,10 +8,34 @@ runs:
       with:
         node-version-file: '.nvmrc'
         cache: npm
+        cache-dependency-path: |
+          package-lock.json
+          desktop/package-lock.json
 
-    - name: Install node packages
-      uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
+    - id: cache-node-modules
+      uses: actions/cache@v3
+      with:
+        path: node_modules
+        key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}
+
+    - id: cache-desktop-node-modules
+      uses: actions/cache@v3
+      with:
+        path: desktop/node_modules
+        key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json') }}
+
+    - name: Install root project node packages
+      if: steps.cache-node-modules.outputs.cache-hit != 'true'
+      uses: nick-fields/retry@v2
       with:
         timeout_minutes: 30
         max_attempts: 3
         command: npm ci
+
+    - name: Install node packages for desktop submodule
+      if: steps.cache-desktop-node-modules.outputs.cache-hit != 'true'
+      uses: nick-fields/retry@v2
+      with:
+        timeout_minutes: 30
+        max_attempts: 3
+        command: cd desktop && npm ci

.github/workflows/platformDeploy.yml

@@ -158,13 +158,13 @@ jobs:
           bundler-cache: true
 
       - uses: actions/cache@v3
+        id: cache-pods
         with:
           path: ios/Pods
           key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pods-
 
       - name: Install cocoapods
+        if: steps.cache-pods.outputs.cache-hit != 'true'
         uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
         with:
           timeout_minutes: 10

.github/workflows/testBuild.yml

@@ -141,13 +141,13 @@ jobs:
           bundler-cache: true
 
       - uses: actions/cache@v3
+        id: cache-pods
         with:
           path: ios/Pods
           key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pods-
 
       - name: Install cocoapods
+        if: steps.cache-pods.outputs.cache-hit != 'true'
         uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
         with:
           timeout_minutes: 10

.well-known/apple-app-site-association

@@ -12,10 +12,6 @@
                         "/": "/settings/*",
                         "comment": "Profile and app settings"
                     },
-                    {
-                        "/": "/setpassword/*",
-                        "comment": "Passoword setup"
-                    },
                     {
                         "/": "/details/*",
                         "comment": "Details of another users"

android/app/build.gradle

@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001032507
-        versionName "1.3.25-7"
+        versionCode 1001032601
+        versionName "1.3.26-1"
     }
 
     splits {

android/app/src/main/AndroidManifest.xml

@@ -52,7 +52,6 @@
             <!-- 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="/settings"/>
-            <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/setpassword"/>
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/details"/>
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/v"/>
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/bank-account"/>
@@ -64,7 +63,6 @@
             <!-- 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="/settings"/>
-            <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/setpassword"/>
             <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"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/bank-account"/>

docs/articles/other/Everything-About-Chat.md

@@ -23,6 +23,37 @@ In addition to 1:1 and group chat, members of a Workspace or Policy will have ac
 All workspace members are added to the #announce room by default. The #announce room lets you share important company announcements and have conversations between workspace members.
 
 All workspace admins can access the #admins room. Use the #admins room to collaborate with the other admins on your policy, and chat with your dedicated Expensify Onboarding Guide. If you have a subscription of 10 or more users, you're automatically assigned an Account Manager. You can ask for help and collaborate with your Account Manager in this same #admins room. Anytime someone on your team, your dedicated setup specialist, or your dedicated account manager makes any changes to your Workspace settings, that update is logged in the #admins room.
+## How to format text
+
+#### Italic
+###### To italicize your message, place an underscore on both sides of the text:
+*text*
+
+#### Bold
+###### To bold your message, place an asterisk on both sides of the text:
+**text**
+
+#### Strikethrough
+###### To strikethrough your message, place a tilde on both sides of the text:
+~text~
+
+#### Quote
+###### To turn your text into a blockquote, add a `>` symbol in front of the text:
+> your text
+
+#### Code
+###### To turn your message into code, place a backtick on both sides of the text:
+`text`
+
+#### Codeblock
+###### To turn your entire message into code block, place three backticks on both sides of the text:
+```
+text
+and even more text
+```
+#### Heading
+###### To turn your message into a heading, place the `#` symbol in front of the text:
+## Heading 
 
 # FAQs
 ## How do I add more than one person to a chat?

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.25</string>
+	<string>1.3.26</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.25.7</string>
+	<string>1.3.26.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.25</string>
+	<string>1.3.26</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.25.7</string>
+	<string>1.3.26.1</string>
 </dict>
 </plist>

package.json

@@ -1,13 +1,13 @@
 {
   "name": "new.expensify",
-  "version": "1.3.25-7",
+  "version": "1.3.26-1",
   "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.",
   "license": "MIT",
   "private": true,
   "scripts": {
-    "postinstall": "npx patch-package && cd desktop && npm install",
+    "postinstall": "scripts/postInstall.sh",
     "clean": "npx react-native clean-project-auto",
     "android": "scripts/set-pusher-suffix.sh && npx react-native run-android --port=8083",
     "ios": "scripts/set-pusher-suffix.sh && npx react-native run-ios --port=8082",
@@ -76,7 +76,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#925e62744f784a92c3ad8947aabfc21c93bec221",
+    "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#50aacd53fe54ef7131e5cb9c74ee4526b3bcfe16",
     "fbjs": "^3.0.2",
     "html-entities": "^1.3.1",
     "htmlparser2": "^7.2.0",

scripts/postInstall.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Go to project root
+ROOT_DIR=$(dirname "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)")
+cd "$ROOT_DIR" || exit 1
+
+# Run patch-package
+npx patch-package
+
+# Install node_modules in subpackages, unless we're in a CI/CD environment,
+# where the node_modules for subpackages are cached separately.
+# See `.github/actions/composite/setupNode/action.yml` for more context.
+if [[ -n ${CI+x} ]]; then
+  cd desktop || exit 1
+  npm install
+fi

src/CONST.js

@@ -829,6 +829,7 @@ const CONST = {
         WIDTH: 320,
         HEIGHT: 416,
     },
+    DESKTOP_HEADER_PADDING: 12,
     CATEGORY_SHORTCUT_BAR_HEIGHT: 32,
     SMALL_EMOJI_PICKER_SIZE: {
         WIDTH: '100%',
@@ -1107,7 +1108,7 @@ const CONST = {
         CARD_NUMBER: /^[0-9]{15,16}$/,
         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]+$/,
+        PAYPAL_ME_USERNAME: /^[a-zA-Z0-9]{1,20}$/,
         ROOM_NAME: /^#[a-z0-9-]{1,80}$/,
 
         // eslint-disable-next-line max-len, no-misleading-character-class
@@ -2436,9 +2437,9 @@ const CONST = {
     },
     SPACE_CHARACTER_WIDTH: 4,
 
-    // This ID is used in SelectionScraper.js to query the DOM for UnreadActionIndicator's
-    // div and then remove it from copied contents in the getHTMLOfSelection() method.
-    UNREAD_ACTION_INDICATOR_ID: 'no-copy-area-unread-action-indicator',
+    // The attribute used in the SelectionScraper.js helper to query all the DOM elements
+    // that should be removed from the copied contents in the getHTMLOfSelection() method
+    SELECTION_SCRAPER_HIDDEN_ELEMENT: 'selection-scrapper-hidden-element',
     MODERATION: {
         MODERATOR_DECISION_PENDING: 'pending',
         MODERATOR_DECISION_PENDING_HIDE: 'pendingHide',

src/ONYXKEYS.js

@@ -45,6 +45,9 @@ export default {
     // Contains all the personalDetails the user has access to
     PERSONAL_DETAILS: 'personalDetails',
 
+    // Contains all the personalDetails the user has access to, keyed by accountID
+    PERSONAL_DETAILS_LIST: 'personalDetailsList',
+
     // Contains all the private personal details of the user
     PRIVATE_PERSONAL_DETAILS: 'private_personalDetails',
 

src/ROUTES.js

@@ -111,13 +111,14 @@ export default {
     FLAG_COMMENT: `flag/:reportID/:reportActionID`,
     getFlagCommentRoute: (reportID, reportActionID) => `flag/${reportID}/${reportActionID}`,
     SEARCH: 'search',
-    SET_PASSWORD_WITH_VALIDATE_CODE: 'setpassword/:accountID/:validateCode',
     DETAILS: 'details',
     getDetailsRoute: (login) => `details?login=${encodeURIComponent(login)}`,
+    PROFILE: 'a/:accountID',
+    getProfileRoute: (accountID) => `a/${accountID}`,
     REPORT_PARTICIPANTS: 'r/:reportID/participants',
     getReportParticipantsRoute: (reportID) => `r/${reportID}/participants`,
-    REPORT_PARTICIPANT: 'r/:reportID/participants/details',
-    getReportParticipantRoute: (reportID, login) => `r/${reportID}/participants/details?login=${encodeURIComponent(login)}`,
+    REPORT_PARTICIPANT: 'r/:reportID/participants/a/:accountID',
+    getReportParticipantRoute: (reportID, accountID) => `r/${reportID}/participants/a/${accountID}`,
     REPORT_WITH_ID_DETAILS: 'r/:reportID/details',
     getReportDetailsRoute: (reportID) => `r/${reportID}/details`,
     REPORT_SETTINGS: 'r/:reportID/settings',