From 6fe9b69d959602030a451bddecc0ecf908b3937c Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Mon, 31 Aug 2020 19:58:14 -0500
Subject: [PATCH] Updated ProfilePage unavailable message for isLocked vs
 isBlocked
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Updated:
- ProfilePage unavailable message for isLocked vs isBlocked
---
 app/javascript/gabsocial/pages/profile_page.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/javascript/gabsocial/pages/profile_page.js b/app/javascript/gabsocial/pages/profile_page.js
index 2e9f915d..f8bbc92e 100644
--- a/app/javascript/gabsocial/pages/profile_page.js
+++ b/app/javascript/gabsocial/pages/profile_page.js
@@ -24,12 +24,14 @@ class ProfilePage extends ImmutablePureComponent {
       children,
       unavailable,
       noSidebar,
+      isBlocked,
       params: { username },
     } = this.props
 
     const nameHTML = !!account ? account.get('display_name_html') : ''
     const name = !!account ? account.get('display_name_plain') : ''
-    
+    const unavailableMessage = (unavailable && isBlocked) ? <FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' /> : <FormattedMessage id='empty_column.account_private' defaultMessage='This account is private. You must request to follow in order to view their page.' />
+
     return (
       <ProfileLayout
         account={account}
@@ -47,9 +49,7 @@ class ProfilePage extends ImmutablePureComponent {
         {
           unavailable &&
           <Block>
-            <ColumnIndicator type='error' message={
-              <FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />
-            } />
+            <ColumnIndicator type='error' message={unavailableMessage} />
           </Block>
         }
       </ProfileLayout>
@@ -72,6 +72,7 @@ const mapStateToProps = (state, { params: { username } }) => {
   const getAccount = makeGetAccount()
 
   return {
+    isBlocked,
     unavailable,
     account: accountId !== -1 ? getAccount(state, accountId) : null,
   }
@@ -84,6 +85,7 @@ ProfilePage.propTypes = {
   noSidebar: PropTypes.bool,
   params: PropTypes.object.isRequired,
   unavailable: PropTypes.bool.isRequired,
+  isBlocked: PropTypes.bool.isRequired,
 }
 
 export default connect(mapStateToProps)(ProfilePage)
\ No newline at end of file