From a0e79bfe1012b2975b4363dae03176b8869d4bf5 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 13 Aug 2022 10:33:58 -0500
Subject: [PATCH] StatusContainer: pass all props through, fix pinned posts not
 showing as pinned

---
 app/soapbox/components/status.tsx           | 28 +++++++++------------
 app/soapbox/components/status_list.tsx      |  2 --
 app/soapbox/containers/status_container.tsx | 12 +++------
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx
index 04f42a546..020b0756a 100644
--- a/app/soapbox/components/status.tsx
+++ b/app/soapbox/components/status.tsx
@@ -181,7 +181,7 @@ const Status: React.FC<IStatus> = (props) => {
   };
 
   if (!status) return null;
-  let prepend, rebloggedByText, reblogElement, reblogElementMobile;
+  let rebloggedByText, reblogElement, reblogElementMobile;
 
   if (hidden) {
     return (
@@ -207,20 +207,6 @@ const Status: React.FC<IStatus> = (props) => {
     );
   }
 
-  if (featured) {
-    prepend = (
-      <div className='pt-4 px-4'>
-        <HStack alignItems='center' space={1}>
-          <Icon src={require('@tabler/icons/pinned.svg')} className='text-gray-600 dark:text-gray-400' />
-
-          <Text size='sm' theme='muted' weight='medium'>
-            <FormattedMessage id='status.pinned' defaultMessage='Pinned post' />
-          </Text>
-        </HStack>
-      </div>
-    );
-  }
-
   if (status.reblog && typeof status.reblog === 'object') {
     const displayNameHtml = { __html: String(status.getIn(['account', 'display_name_html'])) };
 
@@ -318,7 +304,17 @@ const Status: React.FC<IStatus> = (props) => {
         onClick={() => history.push(statusUrl)}
         role='link'
       >
-        {prepend}
+        {featured && (
+          <div className='pt-4 px-4'>
+            <HStack alignItems='center' space={1}>
+              <Icon src={require('@tabler/icons/pinned.svg')} className='text-gray-600 dark:text-gray-400' />
+
+              <Text size='sm' theme='muted' weight='medium'>
+                <FormattedMessage id='status.pinned' defaultMessage='Pinned post' />
+              </Text>
+            </HStack>
+          </div>
+        )}
 
         <div
           className={classNames('status__wrapper', `status-${actualStatus.visibility}`, {
diff --git a/app/soapbox/components/status_list.tsx b/app/soapbox/components/status_list.tsx
index db9695b87..c45216e03 100644
--- a/app/soapbox/components/status_list.tsx
+++ b/app/soapbox/components/status_list.tsx
@@ -122,7 +122,6 @@ const StatusList: React.FC<IStatusList> = ({
 
   const renderStatus = (statusId: string) => {
     return (
-      // @ts-ignore
       <StatusContainer
         key={statusId}
         id={statusId}
@@ -157,7 +156,6 @@ const StatusList: React.FC<IStatusList> = ({
     if (!featuredStatusIds) return [];
 
     return featuredStatusIds.toArray().map(statusId => (
-      // @ts-ignore
       <StatusContainer
         key={`f-${statusId}`}
         id={statusId}
diff --git a/app/soapbox/containers/status_container.tsx b/app/soapbox/containers/status_container.tsx
index 985251c65..3f7c1a34f 100644
--- a/app/soapbox/containers/status_container.tsx
+++ b/app/soapbox/containers/status_container.tsx
@@ -22,18 +22,12 @@ const getStatus = makeGetStatus();
  * Legacy Status wrapper accepting a status ID instead of the full entity.
  * @deprecated Use the Status component directly.
  */
-const StatusContainer: React.FC<IStatusContainer> = ({ id, onMoveUp, onMoveDown, withDismiss }) => {
+const StatusContainer: React.FC<IStatusContainer> = (props) => {
+  const { id, ...rest } = props;
   const status = useAppSelector(state => getStatus(state, { id }));
 
   if (status) {
-    return (
-      <Status
-        status={status}
-        onMoveUp={onMoveUp}
-        onMoveDown={onMoveDown}
-        withDismiss={withDismiss}
-      />
-    );
+    return <Status status={status} {...rest} />;
   } else {
     return null;
   }