Merge pull request #48574 from mkzie2/mkzie2-issue-48533

[CP Staging] fix: create object uri for import spreadsheets
Expensify · Sep 5, 2024 · fdc0585 · fdc0585
2 parents 35d31f3 + 37694a3
commit fdc0585
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/components/ImportSpreadsheet.tsx b/src/components/ImportSpreadsheet.tsx
@@ -75,15 +75,15 @@ function ImportSpreedsheet({backTo, goTo}: ImportSpreedsheetProps) {
         if (!validateFile(file)) {
             return;
         }
-        if (!file.uri) {
+        let fileURI = file.uri ?? URL.createObjectURL(file);
+        if (!fileURI) {
             return;
         }
-        let filePath = file.uri;
         if (Platform.OS === 'ios') {
-            filePath = filePath.replace(/^.*\/Documents\//, `${RNFetchBlob.fs.dirs.DocumentDir}/`);
+            fileURI = fileURI.replace(/^.*\/Documents\//, `${RNFetchBlob.fs.dirs.DocumentDir}/`);
         }
 
-        fetch(filePath)
+        fetch(fileURI)
             .then((data) => {
                 setIsReadingFIle(true);
                 return data.arrayBuffer();
@@ -102,6 +102,9 @@ function ImportSpreedsheet({backTo, goTo}: ImportSpreedsheetProps) {
             })
             .finally(() => {
                 setIsReadingFIle(false);
+                if (fileURI && !file.uri) {
+                    URL.revokeObjectURL(fileURI);
+                }
             });
     };
 
@@ -189,7 +192,7 @@ function ImportSpreedsheet({backTo, goTo}: ImportSpreedsheetProps) {
                                             height={CONST.IMPORT_SPREADSHEET.ICON_HEIGHT}
                                         />
                                         <Text style={[styles.textFileUpload]}>{translate('common.dropTitle')}</Text>
-                                        <Text style={[styles.subTextFileUpload, styles.textSupporting]}>{translate('common.dropMessage')}</Text>
+                                        <Text style={[styles.subTextFileUpload, styles.themeTextColor]}>{translate('common.dropMessage')}</Text>
                                     </View>
                                 </View>
                             </DragAndDropConsumer>