Merge pull request #33238 from rojiphil/33215-app-unusable-older-safari

fix older safari launch app issue
Expensify · Dec 21, 2023 · 8970aa3 · 8970aa3
2 parents b966bd4 + 7043a17
commit 8970aa3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/libs/UserUtils.ts b/src/libs/UserUtils.ts
@@ -105,8 +105,8 @@ function getDefaultAvatar(accountID = -1, avatarURL?: string): React.FC<SvgProps
     // But the avatar link still corresponds to the original ID-generated link. So we extract the SVG image number from the backend's link instead of using the user ID directly
     let accountIDHashBucket: AvatarRange;
     if (avatarURL) {
-        const match = avatarURL.match(/(?<=default-avatar_)\d+(?=\.)/);
-        const lastDigit = match && parseInt(match[0], 10);
+        const match = avatarURL.match(/(default-avatar_)(\d+)(?=\.)/);
+        const lastDigit = match && parseInt(match[2], 10);
         accountIDHashBucket = lastDigit as AvatarRange;
     } else {
         accountIDHashBucket = ((accountID % CONST.DEFAULT_AVATAR_COUNT) + 1) as AvatarRange;

diff --git a/tests/unit/UserUtilsTest.js b/tests/unit/UserUtilsTest.js
@@ -0,0 +1,9 @@
+import * as UserUtils from '../../src/libs/UserUtils';
+
+describe('UserUtils', () => {
+    it('should return the default avatar from the avatar url', () => {
+        const avatarURL = 'https://d2k5nsl2zxldvw.cloudfront.net/images/avatars/default-avatar_7.png';
+        const defaultAvatar = UserUtils.getDefaultAvatar(1, avatarURL);
+        expect(typeof defaultAvatar).toBe('function');
+    });
+});