Progress

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

@@ -8,6 +8,7 @@ import DatePickerPopover from './date_picker_popover'
 import EmojiPickerPopover from './emoji_picker_popover'
 import GroupInfoPopover from './group_info_popover'
 import ProfileOptionsPopover from './profile_options_popover'
+import RepostOptionsPopover from './repost_options_popover'
 import SearchPopover from './search_popover'
 import SidebarMorePopover from './sidebar_more_popover'
 import StatusOptionsPopover from './status_options_popover'
@@ -23,6 +24,7 @@ const POPOVER_COMPONENTS = {
   EMOJI_PICKER: () => Promise.resolve({ default: EmojiPickerPopover }),
   GROUP_INFO: () => GroupInfoPopover,
   PROFILE_OPTIONS: () => Promise.resolve({ default: ProfileOptionsPopover }),
+  REPOST_OPTIONS: () => Promise.resolve({ default: RepostOptionsPopover }),
   SEARCH: () => Promise.resolve({ default: SearchPopover }),
   SIDEBAR_MORE: () => Promise.resolve({ default: SidebarMorePopover }),
   STATUS_OPTIONS: () => Promise.resolve({ default: StatusOptionsPopover }),

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

@@ -50,7 +50,6 @@ const messages = defineMessages({
   admin_account: { id: 'admin_account', defaultMessage: 'Open moderation interface' },
   add_or_remove_from_list: { id: 'account.add_or_remove_from_list', defaultMessage: 'Add or Remove from lists' },
   add_or_remove_from_shortcuts: { id: 'account.add_or_remove_from_shortcuts', defaultMessage: 'Add or Remove from shortcuts' },
-  accountFollowsYou: { id: 'account.follows_you', defaultMessage: 'Follows you' },
   accountBlocked: { id: 'account.blocked', defaultMessage: 'Blocked' },
   accountMuted: { id: 'account.muted', defaultMessage: 'Muted' },
   domainBlocked: { id: 'account.domain_blocked', defaultMessage: 'Domain hidden' },

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

@@ -0,0 +1,97 @@
+import ImmutablePureComponent from 'react-immutable-pure-component'
+import ImmutablePropTypes from 'react-immutable-proptypes'
+import { defineMessages, injectIntl } from 'react-intl'
+import { quoteCompose } from '../../actions/compose'
+import { repost, unrepost } from '../../actions/interactions'
+import { openModal } from '../../actions/modal'
+import { boostModal, me } from '../../initial_state'
+import PopoverLayout from './popover_layout'
+import List from '../list'
+
+const messages = defineMessages({
+  repost: { id: 'repost', defaultMessage: 'Repost' },
+  repostWithComment: { id: 'repost_with_comment', defaultMessage: 'Repost with comment' },
+});
+
+const mapDispatchToProps = (dispatch, { intl }) => ({
+  onQuote (status, router) {
+    if (!me) return dispatch(openModal('UNAUTHORIZED'))
+
+    dispatch((_, getState) => {
+      const state = getState();
+      if (state.getIn(['compose', 'text']).trim().length !== 0) {
+        dispatch(openModal('CONFIRM', {
+          message: intl.formatMessage(messages.quoteMessage),
+          confirm: intl.formatMessage(messages.quoteConfirm),
+          onConfirm: () => dispatch(quoteCompose(status, router)),
+        }));
+      } else {
+        dispatch(quoteCompose(status, router));
+      }
+    });
+  },
+
+  onRepost (status) {
+    if (!me) return dispatch(openModal('UNAUTHORIZED'))
+
+    if (status.get('reblogged')) {
+      dispatch(unrepost(status));
+    } else {
+      dispatch(repost(status));
+    }
+  },
+});
+
+
+export default
+@injectIntl
+@connect(null, mapDispatchToProps)
+class RepostOptionsPopover extends ImmutablePureComponent {
+
+  static defaultProps = {
+    intl: PropTypes.object.isRequired,
+    status: ImmutablePropTypes.map.isRequired,
+    onQuote: PropTypes.func.isRequired,
+    onRepost: PropTypes.func.isRequired,
+  }
+
+  updateOnProps = ['status']
+
+  handleOnRepost = () => {
+    
+  }
+
+  handleOnQuote = () => {
+    
+  }
+
+  render() {
+    const { intl } = this.props
+
+    const listItems = [
+      {
+        hideArrow: true,
+        icon: 'repost',
+        title: intl.formatMessage(messages.repost),
+        onClick: this.handleOnRepost,
+      },
+      {
+        hideArrow: true,
+        icon: 'pencil',
+        title: intl.formatMessage(messages.repostWithComment),
+        onClick: this.handleBlockDomain,
+      }
+    ]
+
+    return (
+      <PopoverLayout width={220}>
+        <List
+          scrollKey='repost_options'
+          items={listItems}
+          size='large'
+        />
+      </PopoverLayout>
+    )
+  }
+
+}

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

@@ -28,11 +28,11 @@ export default class UserInfoPopover extends ImmutablePureComponent {
               to={to}
               className={[_s.default, _s.noUnderline, _s.flexGrow1].join(' ')}
             >
-              <Avatar account={account} size={42} />
-              <DisplayName account={account} multiline noHover />
+              <Avatar account={account} size={42} noHover />
+              <DisplayName account={account} isMultiline noHover />
             </NavLink>
 
-            <div className={[_s.default, _s.marginLeftAuto].join(' ')}>
+            <div className={[_s.default, _s.mlAuto, _s.right0, _s.posAbs, _s.mt5].join(' ')}>
               <AccountActionButton account={account} />
             </div>
           </div>