Merge pull request #7279 from Expensify/OSBotify-cherry-pick-staging-…

…7277

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001013000
-        versionName "1.1.30-0"
+        versionCode 1001013001
+        versionName "1.1.30-1"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.30.0</string>
+	<string>1.1.30.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.30.0</string>
+	<string>1.1.30.1</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.30-0",
+  "version": "1.1.30-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.",

src/components/AttachmentPicker/index.native.js

@@ -71,6 +71,13 @@ function getDataForUpload(fileData) {
         size: fileData.fileSize || fileData.size,
     };
 
+    // When the URI is lacking uri scheme - file upload would fail
+    // Prefixing the uri with `file://` fixes attachment upload on Android
+    const hasScheme = /^.+:\/\//.test(fileResult.uri);
+    if (!hasScheme) {
+        fileResult.uri = `file://${fileResult.uri}`;
+    }
+
     if (fileResult.size) {
         return Promise.resolve(fileResult);
     }
@@ -198,7 +205,6 @@ class AttachmentPicker extends Component {
                     return reject(new Error(`Error during attachment selection: ${response.errorMessage}`));
                 }
 
-                // Resolve with the first (and only) selected file
                 return resolve(response.assets);
             });
         });