Merge remote-tracking branch 'origin/dev' into dev

src/Managing.WebApp/src/components/organism/Backtest/backtestRowDetails.tsx

@@ -9,7 +9,8 @@ const BacktestRowDetails: React.FC<IBotRowDetails> = ({
   strategiesValues,
   signals,
   optimizedMoneyManagement,
-  statistics
+  statistics,
+  moneyManagement
 }) => {
   return (
     <>
@@ -30,12 +31,6 @@ const BacktestRowDetails: React.FC<IBotRowDetails> = ({
             })}
           ></CardPosition>
           <CardPositionItem positions={positions}></CardPositionItem>
-          <CardText
-            title="Optimized Money Management"
-            content={
-              "SL: " +optimizedMoneyManagement.stopLoss.toFixed(2) + "% TP: " + optimizedMoneyManagement.takeProfit.toFixed(2) + "%"
-            }
-          ></CardText>
           <CardText
             title="Max Drowdown"
             content={
@@ -54,6 +49,27 @@ const BacktestRowDetails: React.FC<IBotRowDetails> = ({
                 .toString() + '%'
             }
           ></CardText>
+          <CardText
+            title="Max Drawdown Recovery Time"
+            content={
+              statistics.maxDrawdownRecoveryTime?.toString() +
+              ' days'
+            }
+          ></CardText>
+          <CardText
+            title="Money Management"
+            content={
+              "SL: " +(moneyManagement.stopLoss * 100).toFixed(2) + "% TP: " + 
+              (moneyManagement.takeProfit * 100).toFixed(2) + "%"
+            }
+          ></CardText>
+          <CardText
+            title="Optimized Money Management"
+            content={
+              "SL: " +optimizedMoneyManagement.stopLoss.toFixed(2) + "% TP: " + optimizedMoneyManagement.takeProfit.toFixed(2) + "%"
+            }
+          ></CardText>
+         
    
         </div>
         <div>

src/Managing.WebApp/src/components/organism/Backtest/backtestTable.tsx

@@ -300,6 +300,7 @@ const BacktestTable: React.FC<IBacktestCards> = ({ list, isFetching }) => {
           signals={row.original.signals}
           optimizedMoneyManagement={row.original.optimizedMoneyManagement}
           statistics={row.original.statistics}
+          moneyManagement={row.original.moneyManagement}
         ></BacktestRowDetails>
       </>
     ),

src/Managing.WebApp/src/global/type.tsx

@@ -151,6 +151,7 @@ export type  IBotRowDetails = {
   signals: Signal[]
   optimizedMoneyManagement: MoneyManagement
   statistics: PerformanceMetrics
+  moneyManagement: MoneyManagement
 }
 
 export type  IBacktestFormInput = {