include right column in expanded view

Author: weswalla

web/src/components/ExpandedViewMode/EVMiddleColumn/TabContent/EvDetails/EvDetails.component.tsx

@@ -45,6 +45,7 @@ export type EvDetailsOwnProps = {
   updateOutcome: (outcome: Outcome, actionHash: ActionHashB64) => Promise<void>
   updateOutcomeWithLatest: () => Promise<void>
   cleanOutcome: () => Outcome
+  rightColumn: React.ReactNode
 }
 
 export type EvDetailsConnectorStateProps = {
@@ -122,6 +123,7 @@ const EvDetails: React.FC<EvDetailsProps> = ({
   startDescriptionEdit,
   endDescriptionEdit,
   editingPeers,
+  rightColumn,
   // Destructure rightColumn prop
 }) => {
   // reset
@@ -487,6 +489,7 @@ const EvDetails: React.FC<EvDetailsProps> = ({
       {/* End of ev-details-main-content */}
 
       {/* Render the right column alongside the main content */}
+      {rightColumn}
     </div>
   )
 }

web/src/components/ExpandedViewMode/ExpandedViewMode.connector.tsx

@@ -298,6 +298,13 @@ const ConnectedExpandedViewMode: React.FC<ConnectedExpandedViewModeProps> = ({
     />
   ) : null
 
+  const rightColumn = outcome ? ( // Only render if outcome exists
+    <ConnectedEVRightColumn
+      projectId={projectId}
+      onClose={onClose}
+      outcome={outcome}
+    />
+  ) : null
   // redux connected expanded view components
   const details = (
     <ConnectedEvDetails
@@ -313,6 +320,7 @@ const ConnectedExpandedViewMode: React.FC<ConnectedExpandedViewModeProps> = ({
         setDescription,
         githubInputLinkText,
         setGithubInputLinkText,
+        rightColumn,
       }}
     />
   )
@@ -323,13 +331,6 @@ const ConnectedExpandedViewMode: React.FC<ConnectedExpandedViewModeProps> = ({
       appWebsocket={appWebsocket}
     />
   )
-  const rightColumn = outcome ? ( // Only render if outcome exists
-    <ConnectedEVRightColumn
-      projectId={projectId}
-      onClose={onClose}
-      outcome={outcome}
-    />
-  ) : null
 
   // Ensure all necessary props are passed to the component,
   // which will then distribute them to the wrapper or inner component.