Merge pull request #55394 from software-mansion-labs/war-in/improve-a…

…pplyPatches

[No QA] Merge patch directories together when applying patches

scripts/applyPatches.sh

@@ -15,12 +15,18 @@ function patchPackage {
 
   OS="$(uname)"
   if [[ "$OS" == "Darwin" || "$OS" == "Linux" ]]; then
-    npx patch-package --error-on-fail --color=always
-    EXIT_CODE=$?
     if [[ "$IS_HYBRID_APP_REPO" == "true" && "$NEW_DOT_FLAG" == "false" ]]; then
-      echo -e "\n${GREEN}Applying HybridApp patches!${NC}"
-      npx patch-package --patch-dir 'Mobile-Expensify/patches' --error-on-fail --color=always
-      EXIT_CODE+=$?
+      TEMP_PATCH_DIR=$(mktemp -d ./tmp-patches-XXX)
+      cp -r ./patches/* "$TEMP_PATCH_DIR"
+      cp -r ./Mobile-Expensify/patches/* "$TEMP_PATCH_DIR"
+
+      npx patch-package --patch-dir "$TEMP_PATCH_DIR" --error-on-fail --color=always
+      EXIT_CODE=$?
+
+      rm -rf "$TEMP_PATCH_DIR"
+    else
+      npx patch-package --error-on-fail --color=always
+      EXIT_CODE=$?
     fi
     exit $EXIT_CODE
   else