Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/removing_ruby_junk

app/javascript/gabsocial/components/modal/edit_profile_modal.js

@@ -98,8 +98,8 @@ class EditProfileModal extends ImmutablePureComponent {
     if (account.get('avatar_static') !== avatarSrc) obj.avatar = avatarSrc
     if (account.get('header_static') !== headerSrc) obj.header = headerSrc
 
-    this.props.onSave(obj)
-    this.handleOnClose()
+    this.props.onSave(obj, this.handleOnClose)
+    //this.handleOnClose()
   }
 
   render() {
@@ -210,7 +210,7 @@ const mapStateToProps = (state) => ({
 })
 
 const mapDispatchToProps = (dispatch) => ({
-  onSave: (data) => dispatch(saveUserProfileInformation(data)),
+  onSave: (data, closer) => dispatch(saveUserProfileInformation(data, closer)),
 })
 
 EditProfileModal.propTypes = {

app/javascript/gabsocial/components/popover/group_timeline_sort_top_options_popover.js

@@ -56,12 +56,14 @@ class GroupTimelineSortTopOptionsPopover extends React.PureComponent {
         title: intl.formatMessage(messages.topYearTitle),
         onClick: () => this.handleOnClick(GROUP_TIMELINE_SORTING_TYPE_TOP_OPTION_YEARLY),
       },
+      /*
       {
         hideArrow: true,
         isActive: sortByTopValue === GROUP_TIMELINE_SORTING_TYPE_TOP_OPTION_ALL_TIME,
         title: intl.formatMessage(messages.topAllTitle),
         onClick: () => this.handleOnClick(GROUP_TIMELINE_SORTING_TYPE_TOP_OPTION_ALL_TIME),
       },
+      */
     ]
 
     return (

app/javascript/gabsocial/reducers/user.js

@@ -19,6 +19,7 @@ export default function (state = initialState, action) {
     case SAVE_USER_PROFILE_INFORMATION_FETCH_SUCCESS:
       return state
     case SAVE_USER_PROFILE_INFORMATION_FETCH_FAIL:
+      alert('Failed to update your profile. Max profile image size is 2MB. Please update and try again.')
       return state.set('isError', true)
     case RESEND_USER_CONFIRMATION_EMAIL_SUCCESS:
       return state.set('emailConfirmationResends', state.get('emailConfirmationResends') + 1)