fix cors issue on attachments

Expensify · Dec 12, 2024 · 49f5d26 · 49f5d26
1 parent f8f4173
commit 49f5d26
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/src/components/FullscreenLoadingIndicator.tsx b/src/components/FullscreenLoadingIndicator.tsx
@@ -6,16 +6,16 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 type FullScreenLoadingIndicatorProps = {
     style?: StyleProp<ViewStyle>;
-    _51888test?: boolean;
+    flag51888test?: boolean;
 };
 
-function FullScreenLoadingIndicator({style, _51888test}: FullScreenLoadingIndicatorProps) {
+function FullScreenLoadingIndicator({style, flag51888test}: FullScreenLoadingIndicatorProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     return (
         <View style={[StyleSheet.absoluteFillObject, styles.fullScreenLoading, style]}>
             <ActivityIndicator
-                color={_51888test ? theme.textError : theme.spinner}
+                color={flag51888test ? theme.textError : theme.spinner}
                 size="large"
             />
         </View>

diff --git a/src/components/Image/index.tsx b/src/components/Image/index.tsx
@@ -64,7 +64,7 @@ function Image({source: propsSource, isAuthTokenRequired = false, onLoad, object
                 // most likely a reauthentication happens
                 // but unless the calculated source is different from the previous, the image wont reload
                 if (isAcceptedSession(session.creationDate - previousSessionAge.current, session.creationDate)) {
-                    console.log(
+                    Log.info(
                         `@51888 setting validSessionAge to accepted session ${session.authToken?.substring(0, 10)} creationDate ${new Date(
                             session.creationDate,
                         ).toISOString()}} received less than 60s ago or newer from 2H`,
@@ -146,7 +146,7 @@ function Image({source: propsSource, isAuthTokenRequired = false, onLoad, object
         return undefined;
     }
     if (source === undefined) {
-        return <FullScreenLoadingIndicator _51888test={true} />;
+        return <FullScreenLoadingIndicator flag51888test />;
     }
     return (
         <BaseImage

diff --git a/src/components/ImageWithSizeCalculation.tsx b/src/components/ImageWithSizeCalculation.tsx
@@ -56,16 +56,7 @@ function ImageWithSizeCalculation({url, altText, style, onMeasure, onLoadFailure
     const [isLoading, setIsLoading] = useState(false);
     const {isOffline} = useNetwork();
 
-    const source = useMemo(() => {
-        //(typeof url === 'string' ? {uri: url} : url)
-        if (isAuthTokenRequired) {
-            Log.info(`@51888 ImageWitrhSize source ${url}`);
-        }
-        if (typeof url === 'string') {
-            return {uri: url};
-        }
-        return url;
-    }, [url]);
+    const source = useMemo(() => (typeof url === 'string' ? {uri: url} : url), [url]);
 
     const onError = () => {
         Log.hmmm('Unable to fetch image to calculate size', {url});