fix: resolved merge conflict

deriv-com · May 27, 2024 · bbd1110 · bbd1110
2 parents 3ef9443 + 4bdad22
commit bbd1110
Show file tree

Hide file tree

Showing 7 changed files with 2,435 additions and 2,369 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     },
     "dependencies": {
         "@babel/preset-env": "^7.24.5",
-        "@deriv-com/api-hooks": "^0.1.19",
+        "@deriv-com/api-hooks": "^0.1.24",
         "@deriv-com/translations": "^1.2.4",
         "@deriv-com/ui": "^1.27.3",
         "@deriv-com/utils": "latest",

diff --git a/src/components/AdvertsTableRow/AdvertsTableRow.tsx b/src/components/AdvertsTableRow/AdvertsTableRow.tsx
@@ -57,8 +57,9 @@ const AdvertsTableRow = memo((props: TAdvertsTableRowRenderer) => {
     }, [local_currency]);
 
     useEffect(() => {
-        if (exchangeRateData?.exchange_rates?.rates) {
-            exchangeRateRef.current = exchangeRateData?.exchange_rates?.rates?.[local_currency];
+        const rate = exchangeRateData?.exchange_rates?.rates?.[local_currency];
+        if (typeof rate === 'number') {
+            exchangeRateRef.current = rate;
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [exchangeRateData]);

diff --git a/src/components/BuySellForm/BuySellForm.tsx b/src/components/BuySellForm/BuySellForm.tsx
@@ -105,9 +105,11 @@ const BuySellForm = ({ advertId, isModalOpen, onRequestClose }: TBuySellFormProp
     }, [local_currency]);
 
     useEffect(() => {
-        if (exchangeRatesData?.exchange_rates?.rates) {
-            exchangeRateRef.current = exchangeRatesData?.exchange_rates.rates?.[local_currency];
+        const rate = exchangeRatesData?.exchange_rates?.rates?.[local_currency];
+        if (typeof rate === 'number') {
+            exchangeRateRef.current = rate;
         }
+
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [exchangeRatesData]);
 

diff --git a/src/components/FloatingRate/FloatingRate.tsx b/src/components/FloatingRate/FloatingRate.tsx
@@ -46,8 +46,9 @@ const FloatingRate = ({
     }, [localCurrency]);
 
     useEffect(() => {
-        if (exchangeRateData?.exchange_rates?.rates) {
-            exchangeRateRef.current = exchangeRateData?.exchange_rates?.rates?.[localCurrency];
+        const rate = exchangeRateData?.exchange_rates?.rates?.[localCurrency];
+        if (typeof rate === 'number') {
+            exchangeRateRef.current = rate;
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [exchangeRateData]);

diff --git a/src/pages/my-ads/components/AdSummary/AdSummary.tsx b/src/pages/my-ads/components/AdSummary/AdSummary.tsx
@@ -56,9 +56,11 @@ const AdSummary = ({
     }, [currency, localCurrency]);
 
     useEffect(() => {
-        if (exchangeRatesData?.exchange_rates?.rates) {
-            exchangeRateRef.current = exchangeRatesData.exchange_rates?.rates?.[localCurrency];
+        const rate = exchangeRatesData?.exchange_rates?.rates?.[localCurrency];
+        if (typeof rate === 'number') {
+            exchangeRateRef.current = rate;
         }
+
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [exchangeRatesData]);
 

diff --git a/src/pages/my-ads/screens/MyAds/MyAdsTableRow/MyAdsTableRow.tsx b/src/pages/my-ads/screens/MyAds/MyAdsTableRow/MyAdsTableRow.tsx
@@ -79,8 +79,9 @@ const MyAdsTableRow = ({ currentRateType, showModal, ...rest }: TMyAdsTableProps
     }, [localCurrency]);
 
     useEffect(() => {
-        if (exchangeRatesData?.exchange_rates?.rates) {
-            exchangeRateRef.current = exchangeRatesData.exchange_rates?.rates?.[localCurrency ?? ''];
+        const rate = exchangeRatesData?.exchange_rates?.rates?.[localCurrency ?? ''];
+        if (typeof rate === 'number') {
+            exchangeRateRef.current = rate;
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [exchangeRatesData]);