Merge pull request #292 from msupply-foundation/266-fix-tooltip-errors

266 - Fixup tool tip errors
msupply-foundation · Mar 3, 2024 · 151a0c4 · 151a0c4
2 parents 25fc6e7 + 86ec3e6
commit 151a0c4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/frontend/packages/system/src/NotificationEvents/DetailView/DetailView.tsx b/frontend/packages/system/src/NotificationEvents/DetailView/DetailView.tsx
@@ -53,20 +53,22 @@ export const DetailView = () => {
         {/* if we have a config_id, create a link to edit the config */}
         {entity?.notificationConfigId && (
           <Tooltip title={entity.notificationConfig?.title ?? ''}>
-            <BaseButton
-              onClick={() => {
-                navigate(
-                  configRoute(
-                    entity.notificationConfig?.kind ?? ConfigKind.Scheduled,
-                    entity.notificationConfigId ?? ''
-                  )
-                );
-              }}
-              variant="outlined"
-              endIcon={<EditIcon />}
-            >
-              {t('button.edit-notification-config')}
-            </BaseButton>
+            <div>
+              <BaseButton
+                onClick={() => {
+                  navigate(
+                    configRoute(
+                      entity.notificationConfig?.kind ?? ConfigKind.Scheduled,
+                      entity.notificationConfigId ?? ''
+                    )
+                  );
+                }}
+                variant="outlined"
+                endIcon={<EditIcon />}
+              >
+                {t('button.edit-notification-config')}
+              </BaseButton>
+            </div>
           </Tooltip>
         )}
       </AppBarButtonsPortal>

diff --git a/frontend/packages/system/src/NotificationEvents/ListView/ListView.tsx b/frontend/packages/system/src/NotificationEvents/ListView/ListView.tsx
@@ -42,7 +42,9 @@ export const ListView = ({}: ListViewProps) => {
         label: 'label.date',
         Cell: props => (
           <Tooltip title={props.rowData.createdAt}>
-            <RelativeTimeDate d={props.rowData.createdAt}></RelativeTimeDate>
+            <div>
+              <RelativeTimeDate d={props.rowData.createdAt}></RelativeTimeDate>
+            </div>
           </Tooltip>
         ),
       },