refactor: to fix pnl margin calculator issues (#4208)

yaswanth-deriv · web-flow · commit 0daaef2d0aa4 · 2023-02-21T09:03:37.000+06:00
diff --git a/crowdin/messages.json b/crowdin/messages.json
@@ -3092,9 +3092,9 @@
   "-195404006": "Take profit pip value",
   "-1659122470": "Our profit and loss calculator for margin helps you to approximate your losses and/or gains.",
   "-137444201": "Buy",
-  "-805098509": "Open price of asset",
   "-213618448": "Stop loss pips",
   "-544680075": "Take profit pips",
+  "-805098509": "Open price of asset",
   "-168442931": "How to calculate stop loss and/or take profit level and pip value",
   "-431890384": "The stop loss and/or take profit level and pip value when buying a contract on Deriv MT5 is calculated based on the formula:",
   "-1812417493": "<0>Stop loss and/or take profit level = asset price + {stop loss OR take profit amount ÷ (volume × contract size)}</0>",
diff --git a/src/components/form/input.tsx b/src/components/form/input.tsx
@@ -249,7 +249,7 @@ const Input = ({
                     height={height}
                     showLabel={label}
                     {...props}
-                    ref={() => current_input}
+                    ref={current_input}
                 />
                 {label && (
                     <StyledLabel
diff --git a/src/pages/trader-tools/common/_utility.tsx b/src/pages/trader-tools/common/_utility.tsx
@@ -4,7 +4,7 @@ type ErrorsType = {
     errors?: null
     symbol?: string
     volume?: string | JSX.Element
-    assetPrice?: string
+    assetPrice?: string | JSX.Element
     leverage?: string
     pointValue?: string | JSX.Element
     takeProfitAmount?: string | JSX.Element
@@ -89,7 +89,7 @@ export const getPnlMarginCommon = (values, action) => {
             return toFixed(take_profit_level_formula)
         }
         case 'getStopLossLevelBuy': {
-            const stop_loss_level_formula = assetPrice + [-stopLossAmount / (volume * contractSize)]
+            const stop_loss_level_formula = assetPrice + -[stopLossAmount / (volume * contractSize)]
             return toFixed(stop_loss_level_formula)
         }
         case 'getTakeProfitLevelBuy': {
diff --git a/src/pages/trader-tools/common/_validation.tsx b/src/pages/trader-tools/common/_validation.tsx
@@ -71,6 +71,9 @@ const validation = {
         if (!input || input.name === 'default') {
             return localize('Asset Price is required')
         }
+        if (input) {
+            return numberValidation(input.toString(), localize('Asset Price is required'), 15)
+        }
 
         return null
     },
diff --git a/src/pages/trader-tools/pnl-for-margin/_pnl-margin-calculator.tsx b/src/pages/trader-tools/pnl-for-margin/_pnl-margin-calculator.tsx

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,9 @@ const validation = {`
`71`	`71`	`if (!input \|\| input.name === 'default') {`
`72`	`72`	`return localize('Asset Price is required')`
`73`	`73`	`}`
	`74`	`+ if (input) {`
	`75`	`+ return numberValidation(input.toString(), localize('Asset Price is required'), 15)`
	`76`	`+ }`
`74`	`77`
`75`	`78`	`return null`
`76`	`79`	`},`