Merge branch 'pending-status-quotes' into 'develop'

Add quotes for pending statuses

See merge request soapbox-pub/soapbox-fe!1006

app/soapbox/features/ui/components/pending_status.js

@@ -9,9 +9,10 @@ import DisplayName from 'soapbox/components/display_name';
 import RelativeTimestamp from 'soapbox/components/relative_timestamp';
 import StatusContent from 'soapbox/components/status_content';
 import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder_card';
+import PlaceholderMediaGallery from 'soapbox/features/placeholder/components/placeholder_media_gallery';
+import QuotedStatus from 'soapbox/features/status/containers/quoted_status_container';
 import { getDomain } from 'soapbox/utils/accounts';
 
-import PlaceholderMediaGallery from '../../placeholder/components/placeholder_media_gallery';
 import { buildStatus } from '../util/pending_status_builder';
 
 import PollPreview from './poll_preview';
@@ -40,7 +41,7 @@ class PendingStatus extends ImmutablePureComponent {
           media={status.get('media_attachments')}
         />
       );
-    } else if (shouldHaveCard(status)) {
+    } else if (!status.get('quote') && shouldHaveCard(status)) {
       return <PlaceholderCard />;
     } else {
       return null;
@@ -93,6 +94,8 @@ class PendingStatus extends ImmutablePureComponent {
             {this.renderMedia()}
             {status.get('poll') && <PollPreview poll={status.get('poll')} />}
 
+            {status.get('quote') && <QuotedStatus statusId={status.get('quote')} />}
+
             {/* TODO */}
             {/* <PlaceholderActionBar /> */}
           </div>

app/soapbox/features/ui/util/pending_status_builder.js

@@ -28,6 +28,7 @@ export const buildStatus = (state, pendingStatus, idempotencyKey) => {
     muted: false,
     pinned: false,
     poll: pendingStatus.get('poll', null),
+    quote: pendingStatus.get('quote_id', null),
     reblog: null,
     reblogged: false,
     reblogs_count: 0,