Merge branch 'master' into 221-submit-proposal-after-deadline

orppst · Aug 9, 2024 · 8027cf7 · 8027cf7
2 parents 9bc9362 + 661c5ed
commit 8027cf7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/main/webui/src/ProposalEditorView/proposal/Overview.tsx b/src/main/webui/src/ProposalEditorView/proposal/Overview.tsx
@@ -481,6 +481,7 @@ function OverviewPanel(): ReactElement {
                 //not sure if this will be needed, it's still work in progress
                 let targetObjs = [] as Target[];
 
+                // @ts-ignore
                 observation.target?.map((obsTarget) => {
                     let targetObj = proposalsData?.targets?.find((target) =>
                         target._id === obsTarget)!

diff --git a/src/main/webui/src/commonButtons/contextualHelp.tsx b/src/main/webui/src/commonButtons/contextualHelp.tsx
@@ -1,5 +1,7 @@
 import { useState } from "react";
 import { Button, Grid, Space } from '@mantine/core';
+import { IconInfoCircle } from '@tabler/icons-react';
+import { ICON_SIZE } from '../constants.tsx';
 
 import {contextualHelpMessages} from "../../public/contextualHelpMessages.jsx";
 
@@ -33,7 +35,11 @@ export function ContextualHelpButton(props : {messageId : string}) {
         <Space h={"xl"}/>
         <Grid >
            <Grid.Col span={10}></Grid.Col>
-           <Button color="cyan" onClick={() => {setShowingHelp(!showingHelp)}}>
+           <Button
+               rightSection={<IconInfoCircle size={ICON_SIZE}/>}
+               color="cyan"
+               variant={"subtle"}
+               onClick={() => {setShowingHelp(!showingHelp)}}>
                {showingHelp ? labelClearHelp : labelShowHelp}
            </Button>
         </Grid>