Merge pull request #26963 from tienifr/fix/26953

[CP Staging] Fix: App crashes while creating Distance money request

(cherry picked from commit cced02d)

src/components/ReportActionItem/ReportActionItemImages.js

@@ -11,7 +11,7 @@ const propTypes = {
     images: PropTypes.arrayOf(
         PropTypes.shape({
             thumbnail: PropTypes.string,
-            image: PropTypes.string,
+            image: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
         }),
     ).isRequired,
 

src/components/avatarPropTypes.js

@@ -5,5 +5,5 @@ export default PropTypes.shape({
     source: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
     type: PropTypes.oneOf([CONST.ICON_TYPE_AVATAR, CONST.ICON_TYPE_WORKSPACE]),
     name: PropTypes.string,
-    id: PropTypes.number,
+    id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
 });

src/components/transactionPropTypes.js

@@ -68,7 +68,7 @@ export default PropTypes.shape({
     /** The receipt object associated with the transaction */
     receipt: PropTypes.shape({
         receiptID: PropTypes.number,
-        source: PropTypes.string,
+        source: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
         state: PropTypes.string,
     }),
 

src/libs/tryResolveUrlFromApiRoot.js

@@ -20,6 +20,11 @@ const ORIGIN_PATTERN = new RegExp(`^(${ORIGINS_TO_REPLACE.join('|')})`);
  * @returns {String}
  */
 export default function tryResolveUrlFromApiRoot(url) {
+    // in native, when we import an image asset, it will have a number representation which can be used in `source` of Image
+    // in this case we can skip the url resolving
+    if (typeof url === 'number') {
+        return url;
+    }
     const apiRoot = ApiUtils.getApiRoot({shouldUseSecure: false});
     return url.replace(ORIGIN_PATTERN, apiRoot);
 }