minor merge bugs - working version

NeuromatchAcademy · Jun 30, 2024 · 1edb8d3 · 1edb8d3
1 parent 6f4477f
commit 1edb8d3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/app/javascript/flavours/glitch/components/status_action_bar.jsx b/app/javascript/flavours/glitch/components/status_action_bar.jsx
@@ -144,7 +144,7 @@ class StatusActionBar extends ImmutablePureComponent {
   };
 
   handleQuoteClick = () => {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
 
     if (signedIn) {
       this.props.onQuote(this.props.status, this.context.router.history);

diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -344,11 +344,11 @@ class Status extends ImmutablePureComponent {
   };
 
   handleQuoteClick = (status) => {
-    const { signedIn } = this.context.identity;
+    const { signedIn } = this.props.identity;
     const { dispatch } = this.props;
 
     if (signedIn) {
-      dispatch(quoteCompose(status, this.context.router.history));
+      dispatch(quoteCompose(status, this.props.history));
     } else {
       dispatch(openModal('INTERACTION', {
         type: 'reply',

diff --git a/app/models/status.rb b/app/models/status.rb
@@ -186,7 +186,6 @@ class Status < ApplicationRecord
                    quote: [
                      :application,
                      :tags,
-                     :preview_cards,
                      :media_attachments,
                      :conversation,
                      :status_stat,