diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx index 25d60822dd2..9fcca27d12c 100644 --- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx +++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx @@ -91,10 +91,11 @@ const ActivityDetails = (props: Props) => { }` const isOwner = viewerLowestScope === 'TEAM' + const MOBILE_SETTINGS_HEIGHT = 208 return (
-
+
@@ -140,6 +141,18 @@ const ActivityDetails = (props: Props) => {
+
+ +
+
+
{ const {selectedTemplateRef, teamsRef, type, isOpen, preferredTeamId, viewerRef} = props + const [isMinimized, setIsMinimized] = useState(false) + const isMobile = !useBreakpoint(Breakpoint.INVOICE) const selectedTemplate = useFragment( graphql` fragment ActivityDetailsSidebar_template on MeetingTemplate { @@ -288,129 +294,153 @@ const ActivityDetailsSidebar = (props: Props) => { {isOpen &&
}
-
Settings
+
+
+ Settings + setIsMinimized(!isMinimized)} + > + {isMinimized ? : } + +
-
- {/* TODO: move one-on-one logic to its own component */} - {selectedTemplate.id === 'oneOnOneAction' ? ( -
-
Teammate
- +
+
+ {/* TODO: move one-on-one logic to its own component */} + {selectedTemplate.id === 'oneOnOneAction' ? ( +
+
Teammate
+ + + {showOrgPicker && ( + <> +
Organization
+ + + )} +
+ ) : ( + + )} - {showOrgPicker && ( + {selectedTeam.tier === 'starter' && + !viewer.featureFlags.noTemplateLimit && + !selectedTemplate.isFree ? ( +
+
+ Upgrade to the Team Plan to create custom activities unlocking your + team’s ideal workflow. +
+ + Upgrade to Team Plan + +
+ ) : ( <> -
Organization
- + {type === 'retrospective' && ( + <> + + + + + )} + {type === 'poker' && ( + + )} + {type === 'action' && ( + + )} + {type === 'teamPrompt' && ( + + )} )}
- ) : ( - +
+ +
+ {oneOnOneTeamInput && ( + )} - - {selectedTeam.tier === 'starter' && - !viewer.featureFlags.noTemplateLimit && - !selectedTemplate.isFree ? ( -
-
- Upgrade to the Team Plan to create custom activities unlocking your team’s - ideal workflow. -
- - Upgrade to Team Plan - -
- ) : ( + {error && {error.message}} + {selectedTemplate.id !== 'oneOnOneAction' && ( <> - {type === 'retrospective' && ( - <> - - - - - )} - {type === 'poker' && ( - - )} - {type === 'action' && ( - - )} - {type === 'teamPrompt' && ( - - )} -
- {oneOnOneTeamInput && ( - - )} - {error && {error.message}} - {selectedTemplate.id !== 'oneOnOneAction' && ( - <> - - {/* TODO: scheduling meeting does not work with one-on-one https://github.com/ParabolInc/parabol/issues/8820 */} - - - )} - handleStartActivity()} - waiting={submitting} - className='h-14' - > -
Start Activity
-
-
+ + {/* TODO: scheduling meeting does not work with one-on-one https://github.com/ParabolInc/parabol/issues/8820 */} + )} + handleStartActivity()} + waiting={submitting} + className='h-14' + > +
Start Activity
+
diff --git a/packages/client/components/NewMeetingActionsCurrentMeetings.tsx b/packages/client/components/NewMeetingActionsCurrentMeetings.tsx index af3241f3a55..af6f2fb4840 100644 --- a/packages/client/components/NewMeetingActionsCurrentMeetings.tsx +++ b/packages/client/components/NewMeetingActionsCurrentMeetings.tsx @@ -53,6 +53,7 @@ const NewMeetingActionsCurrentMeetings = (props: Props) => { useSnacksForNewMeetings(activeMeetings as any) const meetingCount = activeMeetings.length const label = `${meetingCount} Active ${plural(meetingCount, 'Meeting')}` + if (!meetingCount) return null return ( <>