Merge remote-tracking branch 'origin/main' into fix/40936-init-money-req

.github/workflows/deploy.yml

@@ -28,6 +28,24 @@ jobs:
 
       - name: 🚀 Push tags to trigger staging deploy 🚀
         run: git push --tags
+
+      - name: Warn deployers if staging deploy failed
+        if: ${{ failure() }}
+        uses: 8398a7/action-slack@v3
+        with:
+          status: custom
+          custom_payload: |
+            {
+              channel: '#deployer',
+              attachments: [{
+                color: "#DB4545",
+                pretext: `<!subteam^S4TJJ3PSL>`,
+                text: `💥 NewDot staging deploy failed. 💥`,
+              }]
+            }
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
 
   deployProduction:
     runs-on: ubuntu-latest
@@ -65,6 +83,24 @@ jobs:
           PR_LIST: ${{ steps.getReleasePRList.outputs.PR_LIST }}
 
       - name: 🚀 Create release to trigger production deploy 🚀
-        run: gh release create ${{ env.PRODUCTION_VERSION }} --generate-notes
+        run: gh release create ${{ env.PRODUCTION_VERSION }} --notes '${{ steps.getReleaseBody.outputs.RELEASE_BODY }}'
         env:
           GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
+
+      - name: Warn deployers if production deploy failed
+        if: ${{ failure() }}
+        uses: 8398a7/action-slack@v3
+        with:
+          status: custom
+          custom_payload: |
+            {
+              channel: '#deployer',
+              attachments: [{
+                color: "#DB4545",
+                pretext: `<!subteam^S4TJJ3PSL>`,
+                text: `💥 NewDot production deploy failed. 💥`,
+              }]
+            }
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}

android/app/build.gradle

@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009000510
-        versionName "9.0.5-10"
+        versionCode 1009000600
+        versionName "9.0.6-0"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.5</string>
+	<string>9.0.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.5.10</string>
+	<string>9.0.6.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.5</string>
+	<string>9.0.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.5.10</string>
+	<string>9.0.6.0</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.5</string>
+	<string>9.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.5.10</string>
+	<string>9.0.6.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.5-10",
+  "version": "9.0.6-0",
   "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.",
@@ -133,7 +133,7 @@
     "react-content-loader": "^7.0.0",
     "react-dom": "18.1.0",
     "react-error-boundary": "^4.0.11",
-    "react-fast-pdf": "1.0.13",
+    "react-fast-pdf": "1.0.14",
     "react-map-gl": "^7.1.3",
     "react-native": "0.73.4",
     "react-native-android-location-enabler": "^2.0.1",

patches/@expensify+react-native-live-markdown+0.1.91.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@expensify/react-native-live-markdown/src/web/cursorUtils.ts b/node_modules/@expensify/react-native-live-markdown/src/web/cursorUtils.ts
+index 1cda659..ba5c3c3 100644
+--- a/node_modules/@expensify/react-native-live-markdown/src/web/cursorUtils.ts
++++ b/node_modules/@expensify/react-native-live-markdown/src/web/cursorUtils.ts
+@@ -66,7 +66,7 @@ function setCursorPosition(target: HTMLElement, start: number, end: number | nul
+         // 3. Caret at the end of whole input, when pressing enter
+         // 4. All other placements
+         if (prevChar === '\n' && prevTextLength !== undefined && prevTextLength < textCharacters.length) {
+-          if (nextChar !== '\n') {
++          if (nextChar && nextChar !== '\n' && i !== n - 1) {
+             range.setStart(textNodes[i + 1] as Node, 0);
+           } else if (i !== textNodes.length - 1) {
+             range.setStart(textNodes[i] as Node, 1);

scripts/applyPatches.sh

@@ -8,24 +8,17 @@ SCRIPTS_DIR=$(dirname "${BASH_SOURCE[0]}")
 source "$SCRIPTS_DIR/shellUtils.sh"
 
 # Wrapper to run patch-package.
-# We use `script` to preserve colorization when the output of patch-package is piped to tee
-# and we provide /dev/null to discard the output rather than sending it to a file
-# `script` has different syntax on macOS vs linux, so that's why we need a wrapper function
 function patchPackage {
   OS="$(uname)"
-  if [[ "$OS" == "Darwin" ]]; then
-    # macOS
-    script -q /dev/null npx patch-package --error-on-fail
-  elif [[ "$OS" == "Linux" ]]; then
-    # Ubuntu/Linux
-    script -q -c "npx patch-package --error-on-fail" /dev/null
+  if [[ "$OS" == "Darwin" || "$OS" == "Linux" ]]; then
+    npx patch-package --error-on-fail
   else
     error "Unsupported OS: $OS"
+    exit 1
   fi
 }
 
 # Run patch-package and capture its output and exit code, while still displaying the original output to the terminal
-# (we use `script -q /dev/null` to preserve colorization in the output)
 TEMP_OUTPUT="$(mktemp)"
 patchPackage 2>&1 | tee "$TEMP_OUTPUT"
 EXIT_CODE=${PIPESTATUS[0]}
@@ -36,7 +29,7 @@ rm -f "$TEMP_OUTPUT"
 echo "$OUTPUT" | grep -q "Warning:"
 WARNING_FOUND=$?
 
-printf "\n";
+printf "\n"
 
 # Determine the final exit code
 if [ "$EXIT_CODE" -eq 0 ]; then

src/App.tsx

@@ -20,6 +20,7 @@ import OnyxProvider from './components/OnyxProvider';
 import PopoverContextProvider from './components/PopoverProvider';
 import SafeArea from './components/SafeArea';
 import ScrollOffsetContextProvider from './components/ScrollOffsetContextProvider';
+import {SearchContextProvider} from './components/Search/SearchContext';
 import ThemeIllustrationsProvider from './components/ThemeIllustrationsProvider';
 import ThemeProvider from './components/ThemeProvider';
 import ThemeStylesProvider from './components/ThemeStylesProvider';
@@ -91,6 +92,7 @@ function App({url}: AppProps) {
                             VolumeContextProvider,
                             VideoPopoverMenuContextProvider,
                             KeyboardProvider,
+                            SearchContextProvider,
                         ]}
                     >
                         <CustomStatusBarAndBackground />