Progress

app/javascript/gabsocial/features/account_timeline.js

@@ -91,8 +91,6 @@ class AccountTimeline extends ImmutablePureComponent {
 
     if (!account) return null
 
-    console.log("statusIds:", statusIds)
-
     return (
       <StatusList
         scrollKey='account_timeline'

app/javascript/gabsocial/features/compose/components/compose_form.js

@@ -277,6 +277,8 @@ class ComposeForm extends ImmutablePureComponent {
       displayNone: length(this.props.text) === 0 || anyMedia,
     })
 
+    console.log("reduxReplyToId:", reduxReplyToId, shouldCondense, isModalOpen)
+
     return (
       <div className={parentContainerClasses}>
         <div className={[_s.default, _s.flexRow, _s.width100PC].join(' ')}>
@@ -294,7 +296,7 @@ class ComposeForm extends ImmutablePureComponent {
           >
 
             {
-              !!reduxReplyToId && !shouldCondense && isModalOpen &&
+              !!reduxReplyToId && isModalOpen &&
               <div className={[_s.default, _s.px15, _s.py10, _s.mt5].join(' ')}>
                 <StatusContainer
                   id={reduxReplyToId}
@@ -344,7 +346,7 @@ class ComposeForm extends ImmutablePureComponent {
             }
 
             {
-              /*
+              /* : todo :
               !!selectedGifSrc && !anyMedia &&
               <div className={[_s.default, _s.px15].join(' ')}>
                 <GifForm

app/javascript/gabsocial/features/compose/containers/compose_form_container.js

@@ -15,7 +15,8 @@ import { me } from '../../../initial_state'
 const mapStateToProps = (state, { replyToId }) => {
 
   const reduxReplyToId = state.getIn(['compose', 'in_reply_to'])
-  const isMatch = reduxReplyToId || replyToId ? reduxReplyToId === replyToId : true
+  let isMatch = !!reduxReplyToId
+  if (!isMatch) isMatch = replyToId ? reduxReplyToId === replyToId : true
 
   if (!isMatch) {
     return {

app/javascript/gabsocial/features/search.js

@@ -109,14 +109,16 @@ class Search extends ImmutablePureComponent {
               Showing {size} of {results.get('groups').size} results
             </Text>
           </div>
-          {
-            results.get('groups').slice(0, size).map(group => (
-              <GroupListItem
-                key={`search-${group.get('name')}`}
-                id={group.get('id')}
-              />
-            ))
-          }
+          <div className={[_s.default, _s.px10, _s.py10].join(' ')}>
+            {
+              results.get('groups').slice(0, size).map(group => (
+                <GroupListItem
+                  key={`search-${group.get('name')}`}
+                  id={group.get('id')}
+                />
+              ))
+            }
+          </div>
         </PanelLayout>
       )
     }

app/javascript/gabsocial/features/status.js

@@ -39,6 +39,7 @@ class Status extends ImmutablePureComponent {
   render() {
     const { status } = this.props
     
+    // : todo :
     // - if comment render as such
     
     if (!status) {
@@ -46,7 +47,7 @@ class Status extends ImmutablePureComponent {
     }
 
     return (
-      <StatusContainer {...this.props} />
+      <StatusContainer {...this.props} contextType='feature' />
     )
   }