From 2e615cdd35e21f7f509c11390561a58b52185a0c Mon Sep 17 00:00:00 2001
From: Mateusz Kwasniewski <kwasniewski.mateusz@gmail.com>
Date: Thu, 15 Dec 2022 10:49:16 +0100
Subject: [PATCH] refresh change request, add conflict margin, set time ago
 (#2700)

---
 .../ChangeRequest/Changes/FeatureToggleChanges.tsx          | 3 ++-
 .../ChangeRequestHeader/ChangeRequestHeader.tsx             | 6 +++++-
 .../hooks/api/getters/useChangeRequest/useChangeRequest.ts  | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/FeatureToggleChanges.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/FeatureToggleChanges.tsx
index 875cf06b62..acb3df1173 100644
--- a/frontend/src/component/changeRequest/ChangeRequest/Changes/FeatureToggleChanges.tsx
+++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/FeatureToggleChanges.tsx
@@ -46,7 +46,8 @@ export const FeatureToggleChanges: FC<IFeatureToggleChanges> = ({
                     <Alert
                         severity="warning"
                         sx={{
-                            mx: 1,
+                            px: 3,
+                            mb: 2,
                             '&.MuiAlert-standardWarning': {
                                 borderStyle: 'none',
                             },
diff --git a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx
index ee3b1ed2cd..b4a1bdd471 100644
--- a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx
+++ b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestHeader/ChangeRequestHeader.tsx
@@ -27,7 +27,11 @@ export const ChangeRequestHeader: FC<{ changeRequest: IChangeRequest }> = ({
             </StyledContainer>
             <StyledInnerContainer>
                 <Typography variant="body2" sx={{ margin: 'auto 0' }}>
-                    Created <TimeAgo date={new Date(changeRequest.createdAt)} />{' '}
+                    Created{' '}
+                    <TimeAgo
+                        minPeriod={60}
+                        date={new Date(changeRequest.createdAt)}
+                    />{' '}
                     by
                 </Typography>
                 <Box
diff --git a/frontend/src/hooks/api/getters/useChangeRequest/useChangeRequest.ts b/frontend/src/hooks/api/getters/useChangeRequest/useChangeRequest.ts
index c36af4d12a..d01b8be6fa 100644
--- a/frontend/src/hooks/api/getters/useChangeRequest/useChangeRequest.ts
+++ b/frontend/src/hooks/api/getters/useChangeRequest/useChangeRequest.ts
@@ -6,7 +6,8 @@ import { IChangeRequest } from 'component/changeRequest/changeRequest.types';
 export const useChangeRequest = (projectId: string, id: string) => {
     const { data, error, mutate } = useSWR<IChangeRequest>(
         formatApiPath(`api/admin/projects/${projectId}/change-requests/${id}`),
-        fetcher
+        fetcher,
+        { refreshInterval: 15000 }
     );
 
     return {