diff --git a/android/app/build.gradle b/android/app/build.gradle index 2b00f3bfd1cc..2f932f24badf 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -106,8 +106,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001032602 - versionName "1.3.26-2" + versionCode 1001032603 + versionName "1.3.26-3" } splits { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 019353c4e63d..5da8522219b5 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1.3.26.2 + 1.3.26.3 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 9c07699438fe..d51fa0b06ed0 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.3.26.2 + 1.3.26.3 diff --git a/package-lock.json b/package-lock.json index 9de2df2b90a2..b7801f4d81c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.3.26-2", + "version": "1.3.26-3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.3.26-2", + "version": "1.3.26-3", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index d82fff18b9d3..058eada3cbdd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.3.26-2", + "version": "1.3.26-3", "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.", diff --git a/src/CONST.js b/src/CONST.js index 156df68f4836..74aef53bd86a 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -450,6 +450,7 @@ const CONST = { PDF_VIEWER_URL: '/pdf/web/viewer.html', CLOUDFRONT_DOMAIN_REGEX: /^https:\/\/\w+\.cloudfront\.net/i, EXPENSIFY_ICON_URL: `${CLOUDFRONT_URL}/images/favicon-2019.png`, + CONCIERGE_ICON_URL_2021: `${CLOUDFRONT_URL}/images/icons/concierge_2021.png`, CONCIERGE_ICON_URL: `${CLOUDFRONT_URL}/images/icons/concierge_2022.png`, UPWORK_URL: 'https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22', GITHUB_URL: 'https://github.com/Expensify/App', diff --git a/src/libs/UserUtils.js b/src/libs/UserUtils.js index e7d8235f0004..e2d9f1c7d82c 100644 --- a/src/libs/UserUtils.js +++ b/src/libs/UserUtils.js @@ -127,8 +127,13 @@ function isDefaultAvatar(avatarURL) { return true; } - // If null URL, we should also use a default avatar + // We use a hardcoded "default" Concierge avatar + if (_.isString(avatarURL) && (avatarURL === CONST.CONCIERGE_ICON_URL_2021 || avatarURL === CONST.CONCIERGE_ICON_URL)) { + return true; + } + if (!avatarURL) { + // If null URL, we should also use a default avatar return true; } return false;