Merge pull request #3748 from Expensify/stites-fixDefault

Change blocked from concierge prop default to empty object
Expensify · Jun 24, 2021 · 3ed8538 · 3ed8538
2 parents a029762 + f2e965d
commit 3ed8538
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
@@ -77,7 +77,7 @@ function getUserDetails() {
             Onyx.merge(ONYXKEYS.NVP_PAYPAL_ME_ADDRESS, payPalMeAddress);
 
             // Update the blockedFromConcierge NVP
-            const blockedFromConcierge = lodashGet(response, `nameValuePairs.${CONST.NVP.BLOCKED_FROM_CONCIERGE}`, '');
+            const blockedFromConcierge = lodashGet(response, `nameValuePairs.${CONST.NVP.BLOCKED_FROM_CONCIERGE}`, {});
             Onyx.merge(ONYXKEYS.NVP_BLOCKED_FROM_CONCIERGE, blockedFromConcierge);
         });
 }

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
@@ -400,7 +400,7 @@ class ReportActionCompose extends React.Component {
         const isConciergeChat = this.props.report.participants
             && this.props.report.participants.includes(CONST.EMAIL.CONCIERGE);
         let isBlockedFromConcierge = false;
-        if (isConciergeChat && this.props.blockedFromConcierge) {
+        if (isConciergeChat && !_.isEmpty(this.props.blockedFromConcierge)) {
             isBlockedFromConcierge = User.isBlockedFromConcierge(this.props.blockedFromConcierge.expiresAt);
         }