Merge branch 'CP-2908' into CP-3165

libs/core/overview/components/overview-screens/harmony-overview/harmony-overview.component.tsx

@@ -91,10 +91,6 @@ export const HarmonyOverview: FunctionComponent<HarmonyOverviewProps> = ({
       forceUpdate(releasesToInstall)
   }
 
-  const synchronizeHarmonyTime = () => {
-    synchronizeTime()
-  }
-
   return (
     <>
       {!genericDeviceErrorModalOpened && (
@@ -149,7 +145,7 @@ export const HarmonyOverview: FunctionComponent<HarmonyOverviewProps> = ({
         onUpdateDownload={openCheckForUpdateModal}
         serialNumber={serialNumber}
         caseColour={caseColour}
-        synchronizeTime={synchronizeHarmonyTime}
+        synchronizeTime={synchronizeTime}
       />
     </>
   )

libs/core/overview/components/time-synchronization/time-synchronization.component.tsx

@@ -17,7 +17,6 @@ import React, { useEffect, useMemo, useRef } from "react"
 import { defineMessages, FormattedMessage } from "react-intl"
 import { DisplayStyle } from "Core/__deprecated__/renderer/components/core/button/button.config"
 import ButtonComponent from "Core/__deprecated__/renderer/components/core/button/button.component"
-import { TimeSynchronizationIds } from "Core/overview/components/time-synchronization/time-synchronization-ids.enum"
 import { useDispatch, useSelector } from "react-redux"
 import { selectTimeSynchronizationStatus } from "Core/time-synchronization/selectors/time-synchronization-status.selector"
 import { resetTimeSynchronizationStatus } from "Core/time-synchronization/actions/reset-time-synchronization-status"
@@ -30,6 +29,7 @@ import { Dispatch } from "Core/__deprecated__/renderer/store"
 import styled from "styled-components"
 import { getTime } from "Core/time-synchronization/actions/get-time.action"
 import { selectSynchronizedTime } from "Core/time-synchronization/selectors/synchronized-time.selector"
+import { TimeSynchronizationTestIds } from "e2e-test-ids"
 
 const messages = defineMessages({
   timeSynchronizationTitle: {
@@ -164,10 +164,10 @@ const TimeSynchronization: FunctionComponent<Props> = ({
               }
               labelMessage={buttonMessage}
               onClick={onSynchronize}
-              data-testid={TimeSynchronizationIds.SynchronizeButton}
               disabled={status === "loading"}
               loading={status === "loading"}
               Icon={status === "success" ? IconType.ButtonSuccess : undefined}
+              data-testid={TimeSynchronizationTestIds.SynchronizeButton}
             />
           </CardAction>
         </CardBody>

libs/e2e-test-ids/src/e2e-test-ids.ts

@@ -54,3 +54,7 @@ export enum NewContactSupportModalTestIds {
   AttachedFilesLabel = "attached-files-label",
   AttachedFilesSubtext = "attached-files-subtext",
 }
+
+export enum TimeSynchronizationTestIds {
+  SynchronizeButton = "time-synchronization-synchronize-button",
+}