From 051d57a459c46ca9ba3b8ad105f5f76aec053552 Mon Sep 17 00:00:00 2001
From: ahmadtaimoor-deriv
 <129935294+ahmadtaimoor-deriv@users.noreply.github.com>
Date: Wed, 19 Jun 2024 16:43:03 +0800
Subject: [PATCH 1/2] fix: fix

---
 .../Components/RiskManagementItem/risk-management-item.tsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/trader/src/AppV2/Components/RiskManagementItem/risk-management-item.tsx b/packages/trader/src/AppV2/Components/RiskManagementItem/risk-management-item.tsx
index 146e80b90348..3c8d9b64b6b6 100644
--- a/packages/trader/src/AppV2/Components/RiskManagementItem/risk-management-item.tsx
+++ b/packages/trader/src/AppV2/Components/RiskManagementItem/risk-management-item.tsx
@@ -160,7 +160,7 @@ const RiskManagementItem = observer(
                             )}
                         </ActionSheet.Content>
                         <ActionSheet.Footer
-                            isPrimaryButtonDisabled={!!errorMessage}
+                            isPrimaryButtonDisabled={!!errorMessage || finalValue == stepperValue}
                             shouldCloseOnPrimaryButtonClick
                             primaryAction={{
                                 content: <Localize i18n_default_text='Save' />,

From 3700272a009e6682e1a825d14cded43d6418ddce Mon Sep 17 00:00:00 2001
From: ahmadtaimoor-deriv
 <129935294+ahmadtaimoor-deriv@users.noreply.github.com>
Date: Thu, 20 Jun 2024 12:50:04 +0800
Subject: [PATCH 2/2] fix: review fix

---
 .../contract-details-footer.tsx               |  5 ++-
 .../deal-cancellation-remaining-time.tsx      | 32 +++++++++----------
 .../EntryExitDetails/entry-exit-details.tsx   |  2 +-
 .../Components/TakeProfit/take-profit.tsx     | 22 ++++++-------
 .../ContractDetails/contract-details.tsx      |  3 --
 packages/trader/src/AppV2/Routes/router.tsx   |  4 +--
 6 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/packages/trader/src/AppV2/Components/ContractDetailsFooter/contract-details-footer.tsx b/packages/trader/src/AppV2/Components/ContractDetailsFooter/contract-details-footer.tsx
index 8282151749ee..4f743b5a2912 100644
--- a/packages/trader/src/AppV2/Components/ContractDetailsFooter/contract-details-footer.tsx
+++ b/packages/trader/src/AppV2/Components/ContractDetailsFooter/contract-details-footer.tsx
@@ -53,7 +53,7 @@ const ContractDetailsFooter = observer(({ contract_info }: ContractInfoProps) =>
                     <Button
                         label={label}
                         isLoading={is_sell_requested}
-                        disabled={is_sell_requested || (Number(profit) < 0 && is_valid_to_cancel)}
+                        disabled={Number(profit) < 0 && is_valid_to_cancel}
                         onClick={() => onClickSell(contract_id)}
                         {...buttonProps}
                     />
@@ -62,8 +62,7 @@ const ContractDetailsFooter = observer(({ contract_info }: ContractInfoProps) =>
                             onClick={() => onClickCancel(contract_id)}
                             label={
                                 <>
-                                    {cardLabels.CANCEL}
-                                    {'  '}
+                                    {cardLabels.CANCEL}{' '}
                                     <RemainingTime
                                         as='span'
                                         end_time={cancellation_date_expiry}
diff --git a/packages/trader/src/AppV2/Components/DealCancellationRemainingTime/deal-cancellation-remaining-time.tsx b/packages/trader/src/AppV2/Components/DealCancellationRemainingTime/deal-cancellation-remaining-time.tsx
index 40ca4fc5453e..3067372de5f5 100644
--- a/packages/trader/src/AppV2/Components/DealCancellationRemainingTime/deal-cancellation-remaining-time.tsx
+++ b/packages/trader/src/AppV2/Components/DealCancellationRemainingTime/deal-cancellation-remaining-time.tsx
@@ -20,23 +20,21 @@ const DealCancellationRemainingTime = observer(({ format = 'mm:ss' }: DealCancel
     }
 
     return (
-        <React.Fragment>
-            <Tag
-                className='deal-cancellation-badge'
-                color='custom'
-                data-testid='deal-cancellation-badge'
-                label={
-                    <RemainingTime
-                        end_time={end_time}
-                        format='mm:ss'
-                        getCardLabels={getCardLabelsV2}
-                        start_time={start_time}
-                    />
-                }
-                size='sm'
-                variant='custom'
-            />
-        </React.Fragment>
+        <Tag
+            className='deal-cancellation-badge'
+            color='custom'
+            data-testid='deal-cancellation-badge'
+            label={
+                <RemainingTime
+                    end_time={end_time}
+                    format='mm:ss'
+                    getCardLabels={getCardLabelsV2}
+                    start_time={start_time}
+                />
+            }
+            size='sm'
+            variant='custom'
+        />
     );
 });
 
diff --git a/packages/trader/src/AppV2/Components/EntryExitDetails/entry-exit-details.tsx b/packages/trader/src/AppV2/Components/EntryExitDetails/entry-exit-details.tsx
index 605b9fab250c..d7e73aa49c56 100644
--- a/packages/trader/src/AppV2/Components/EntryExitDetails/entry-exit-details.tsx
+++ b/packages/trader/src/AppV2/Components/EntryExitDetails/entry-exit-details.tsx
@@ -37,7 +37,7 @@ const EntryExitDetails = ({ contract_info }: { contract_info: TContractInfo }) =
     const exitValue = exit_tick_display_value ? addComma(exit_tick_display_value) : null;
 
     return (
-        <CardWrapper title='Entry & exit details' className='entry-exit-details'>
+        <CardWrapper title={<Localize i18n_default_text='Entry & exit details' />} className='entry-exit-details'>
             <div className='entry-exit-details__table'>
                 {dateTimes.start && (
                     <EntryExitDetailRow
diff --git a/packages/trader/src/AppV2/Components/TakeProfit/take-profit.tsx b/packages/trader/src/AppV2/Components/TakeProfit/take-profit.tsx
index b0ecb0c9c962..4c60f42685b5 100644
--- a/packages/trader/src/AppV2/Components/TakeProfit/take-profit.tsx
+++ b/packages/trader/src/AppV2/Components/TakeProfit/take-profit.tsx
@@ -9,18 +9,16 @@ const TakeProfit = observer(() => {
     const { contract_info } = useContractDetails();
     const { limit_order } = contract_info;
     const { isTakeProfitVisible } = getContractDetailsConfig(contract_info.contract_type ?? '');
-    return (
-        isTakeProfitVisible && (
-            <RiskManagementItem
-                label={<Localize i18n_default_text='Take profit' />}
-                modal_body_content={
-                    <Localize i18n_default_text='When your profit reaches or exceeds the set amount, your trade will be closed automatically.' />
-                }
-                value={limit_order?.take_profit?.order_amount}
-                type='take_profit'
-            />
-        )
-    );
+    return isTakeProfitVisible ? (
+        <RiskManagementItem
+            label={<Localize i18n_default_text='Take profit' />}
+            modal_body_content={
+                <Localize i18n_default_text='When your profit reaches or exceeds the set amount, your trade will be closed automatically.' />
+            }
+            value={limit_order?.take_profit?.order_amount}
+            type='take_profit'
+        />
+    ) : null;
 });
 
 export default TakeProfit;
diff --git a/packages/trader/src/AppV2/Containers/ContractDetails/contract-details.tsx b/packages/trader/src/AppV2/Containers/ContractDetails/contract-details.tsx
index 0cd7695f34aa..bb93ca545de0 100644
--- a/packages/trader/src/AppV2/Containers/ContractDetails/contract-details.tsx
+++ b/packages/trader/src/AppV2/Containers/ContractDetails/contract-details.tsx
@@ -85,9 +85,7 @@ const ContractDetails = observer(() => {
                 <div className='contract-card-wrapper'>
                     <ContractCard contractInfo={contract_info} serverTime={server_time} />
                 </div>
-
                 <ChartPlaceholder />
-
                 <DealCancellation />
                 {showRiskManagement && (
                     <CardWrapper>
@@ -95,7 +93,6 @@ const ContractDetails = observer(() => {
                         <StopLoss />
                     </CardWrapper>
                 )}
-
                 <OrderDetails contract_info={contract_info} />
                 <PayoutInfo contract_info={contract_info} />
                 <EntryExitDetails contract_info={contract_info} />
diff --git a/packages/trader/src/AppV2/Routes/router.tsx b/packages/trader/src/AppV2/Routes/router.tsx
index 89f46a478a3e..05d7b2385b40 100644
--- a/packages/trader/src/AppV2/Routes/router.tsx
+++ b/packages/trader/src/AppV2/Routes/router.tsx
@@ -19,9 +19,9 @@ const Router: React.FC = () => {
                         is_logged_in={is_logged_in}
                         language={current_language}
                         Component404={Page404}
-                        should_redirect_login={true}
+                        should_redirect_login
                         routes={traderRoutes}
-                        to={''}
+                        to=''
                         {...route}
                     />
                 ))}