From 277aab654ace2c76de69705d7cfb34da6dc26592 Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Wed, 25 Feb 2026 22:19:57 +0100 Subject: [PATCH 1/3] PM-4004 #time 3h root cause and fixing modal not closed when cancel clicked --- src/libs/ui/lib/components/modals/confirm/ConfirmModal.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/ui/lib/components/modals/confirm/ConfirmModal.tsx b/src/libs/ui/lib/components/modals/confirm/ConfirmModal.tsx index 739a5e913..c42774b0d 100644 --- a/src/libs/ui/lib/components/modals/confirm/ConfirmModal.tsx +++ b/src/libs/ui/lib/components/modals/confirm/ConfirmModal.tsx @@ -24,11 +24,12 @@ const ConfirmModal: FC = (props: ConfirmModalProps) => { const isLoading = props.isLoading const handleConfirm = useCallback((): void => props.onConfirm(), [props.onConfirm]) const handleClose = useCallback(() => { + console.log(isLoading, 'isLoading', props.onClose) if (!isLoading) { props.onClose?.() } // eslint-disable-next-line react-hooks/exhaustive-deps - }, [isLoading]) + }, [isLoading, props.open]) return ( Date: Wed, 25 Feb 2026 23:03:46 +0100 Subject: [PATCH 2/3] PM-4005 #time 3h fix edit tool items --- .../src/settings/tabs/tools/service-provider/ServiceProvider.tsx | 1 + src/apps/accounts/src/settings/tabs/tools/software/Software.tsx | 1 + .../src/settings/tabs/tools/subscriptions/Subscriptions.tsx | 1 + 3 files changed, 3 insertions(+) diff --git a/src/apps/accounts/src/settings/tabs/tools/service-provider/ServiceProvider.tsx b/src/apps/accounts/src/settings/tabs/tools/service-provider/ServiceProvider.tsx index b5dbbdd6b..4de9e7c0d 100644 --- a/src/apps/accounts/src/settings/tabs/tools/service-provider/ServiceProvider.tsx +++ b/src/apps/accounts/src/settings/tabs/tools/service-provider/ServiceProvider.tsx @@ -379,6 +379,7 @@ const ServiceProvider: FC = (props: ServiceProviderProps) type='text' error={formErrors.serviceProviderName} dirty + forceUpdateValue />
{!isEditMode && } diff --git a/src/apps/accounts/src/settings/tabs/tools/software/Software.tsx b/src/apps/accounts/src/settings/tabs/tools/software/Software.tsx index 044786715..340b48bfd 100644 --- a/src/apps/accounts/src/settings/tabs/tools/software/Software.tsx +++ b/src/apps/accounts/src/settings/tabs/tools/software/Software.tsx @@ -313,6 +313,7 @@ const Software: FC = (props: SoftwareProps) => { name='softwareName' label='Software Name *' value={selectedSoftwareName} + forceUpdateValue onChange={handleSoftwareNameChange} placeholder='Type here the Software Name' tabIndex={0} diff --git a/src/apps/accounts/src/settings/tabs/tools/subscriptions/Subscriptions.tsx b/src/apps/accounts/src/settings/tabs/tools/subscriptions/Subscriptions.tsx index f41734988..491018f9b 100644 --- a/src/apps/accounts/src/settings/tabs/tools/subscriptions/Subscriptions.tsx +++ b/src/apps/accounts/src/settings/tabs/tools/subscriptions/Subscriptions.tsx @@ -297,6 +297,7 @@ const Subscriptions: FC = (props: SubscriptionsProps) => { type='text' error={formErrors.subscriptionName} dirty + forceUpdateValue />
{!isEditMode && } From bc416aec2f152e06f5a3d2f70e1c374fd48e5a2d Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Wed, 25 Feb 2026 23:06:44 +0100 Subject: [PATCH 3/3] removed console log --- src/libs/ui/lib/components/modals/confirm/ConfirmModal.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libs/ui/lib/components/modals/confirm/ConfirmModal.tsx b/src/libs/ui/lib/components/modals/confirm/ConfirmModal.tsx index c42774b0d..8ad0c4a9d 100644 --- a/src/libs/ui/lib/components/modals/confirm/ConfirmModal.tsx +++ b/src/libs/ui/lib/components/modals/confirm/ConfirmModal.tsx @@ -24,7 +24,6 @@ const ConfirmModal: FC = (props: ConfirmModalProps) => { const isLoading = props.isLoading const handleConfirm = useCallback((): void => props.onConfirm(), [props.onConfirm]) const handleClose = useCallback(() => { - console.log(isLoading, 'isLoading', props.onClose) if (!isLoading) { props.onClose?.() }