Merge branch 'main' into fix-admin-label-added-optimistically-in-poli…

…cy-rooms
jp928 · Aug 28, 2024 · b84f5e7 · b84f5e7
2 parents 49a2353 + 9437d98
commit b84f5e7
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 12 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009002515
-        versionName "9.0.25-15"
+        versionCode 1009002601
+        versionName "9.0.26-1"
         // 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"

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>9.0.25</string>
+	<string>9.0.26</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.25.15</string>
+	<string>9.0.26.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</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>9.0.25</string>
+	<string>9.0.26</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.25.15</string>
+	<string>9.0.26.1</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.25</string>
+	<string>9.0.26</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.25.15</string>
+	<string>9.0.26.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

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": "9.0.25-15",
+  "version": "9.0.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.",

diff --git a/patches/react-pdf+7.7.3.patch b/patches/react-pdf+7.7.3.patch
@@ -1,3 +1,15 @@
+diff --git a/node_modules/react-pdf/dist/cjs/Document.js b/node_modules/react-pdf/dist/cjs/Document.js
+index 9bb0398..032d898 100644
+--- a/node_modules/react-pdf/dist/cjs/Document.js
++++ b/node_modules/react-pdf/dist/cjs/Document.js
+@@ -289,6 +289,7 @@ const Document = (0, react_1.forwardRef)(function Document(_a, ref) {
+             pdfDispatch({ type: 'REJECT', error });
+         });
+         return () => {
++            loadingTask._worker.destroy();
+             loadingTask.destroy();
+         };
+     }
 diff --git a/node_modules/react-pdf/dist/esm/Document.js b/node_modules/react-pdf/dist/esm/Document.js
 index b1c5a81..569769e 100644
 --- a/node_modules/react-pdf/dist/esm/Document.js

diff --git a/src/components/MapView/MapView.tsx b/src/components/MapView/MapView.tsx
@@ -282,7 +282,6 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
                         <Button
                             onPress={centerMap}
                             iconFill={theme.icon}
-                            iconStyles={styles.ml1}
                             medium
                             icon={Expensicons.Crosshair}
                             accessibilityLabel={translate('common.center')}