From 2b7ac68ae5e45ad3880f9a6c5f6fd8f8a7dd42f7 Mon Sep 17 00:00:00 2001
From: mwapst <163834242+mwapst@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:53:21 +0100
Subject: [PATCH 1/2] align help button theme with Polaris standard

small change to contextualHelp.tsx to follow Polaris theme
---
 src/main/webui/src/commonButtons/contextualHelp.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/webui/src/commonButtons/contextualHelp.tsx b/src/main/webui/src/commonButtons/contextualHelp.tsx
index a07f1ca3..c9ea6e97 100644
--- 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>

From 8d91fdb3adc6df5aa5b00200761d0b978ace5095 Mon Sep 17 00:00:00 2001
From: mwapst <163834242+mwapst@users.noreply.github.com>
Date: Thu, 8 Aug 2024 15:40:09 +0100
Subject: [PATCH 2/2] temporary fix to proposal/Overview.tsx

Added // @ts-ignore to a line in const DisplayObservations to inhibit unexpected behaviour with Cancel button
---
 src/main/webui/src/ProposalEditorView/proposal/Overview.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/webui/src/ProposalEditorView/proposal/Overview.tsx b/src/main/webui/src/ProposalEditorView/proposal/Overview.tsx
index 5de7d135..ff5bb74f 100644
--- 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)!