Progress

app/javascript/gabsocial/pages/group_page.js

@@ -37,7 +37,6 @@ class GroupPage extends ImmutablePureComponent {
 	}
 	
 	componentDidMount() {
-		console.log("group page mounted:", this.props.params.id)
 		this.props.onFetchGroup(this.props.params.id)
 	}
 
@@ -54,16 +53,9 @@ class GroupPage extends ImmutablePureComponent {
 		return (
 			<GroupLayout
 				showBackBtn
-				title={intl.formatMessage(messages.group)}
+				title={groupTitle}
 				group={group}
 				relationships={relationships}
-				actions={[
-					// : todo :
-					// {
-					// 	icon: 'ellipsis',
-					// 	onClick: null,
-					// },
-				]}
 			>
 				<PageTitle path={[groupTitle, intl.formatMessage(messages.group)]} />
 

app/javascript/gabsocial/pages/notifications_page.js

@@ -16,6 +16,7 @@ const filters = [
   'reblog',
   'poll',
   'follow',
+  'follow_requests',
 ]
 
 const messages = defineMessages({
@@ -25,6 +26,7 @@ const messages = defineMessages({
   reblog: { id: 'reposts', defaultMessage: 'Reposts' },
   poll: { id: 'polls', defaultMessage: 'Poll' },
   follow: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
+  follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
   all: { id: 'notifications.filter.all', defaultMessage: 'All' },
 })
 
@@ -35,7 +37,6 @@ const mapStateToProps = (state) => ({
 
 const mapDispatchToProps = (dispatch) => ({
   setFilter(value) {
-    console.log("SETTING ACTIVE FILTER:", value)
     dispatch(setFilter('active', value))
   },
 })

app/javascript/gabsocial/pages/profile_page.js

@@ -1,4 +1,4 @@
-import { Fragment } from 'react'
+import { FormattedMessage } from 'react-intl'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { fetchAccountByUsername } from '../actions/accounts'
@@ -6,6 +6,7 @@ import { makeGetAccount } from '../selectors'
 import { me } from '../initial_state'
 import PageTitle from '../features/ui/util/page_title'
 import ColumnIndicator from '../components/column_indicator'
+import Block from '../components/block'
 import ProfileLayout from '../layouts/profile_layout'
 
 const mapStateToProps = (state, { params: { username } }) => {
@@ -63,6 +64,7 @@ class ProfilePage extends ImmutablePureComponent {
       <ProfileLayout
         account={account}
         title={name}
+        unavailable={unavailable}
       >
         <PageTitle path={`${name} (@${username})`} />
         {
@@ -74,6 +76,12 @@ class ProfilePage extends ImmutablePureComponent {
             account,
           })
         }
+        {
+          unavailable &&
+          <ColumnIndicator type='error' message={
+            <FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />
+          } />
+        }
       </ProfileLayout>
     )
   }