Merge pull request binary-com#1638 from sam-binary/decimal-missing

ashkanx · web-flow · commit d3669d5181b1 · 2019-07-16T10:44:30.000+08:00
Decimal missing
diff --git a/src/botPage/bot/Interface/MiscInterface.js b/src/botPage/bot/Interface/MiscInterface.js
@@ -29,7 +29,8 @@ export default Interface =>
                 notifyTelegram: this.notifyTelegram,
                 getTotalRuns  : () => this.tradeEngine.getTotalRuns(),
                 getBalance    : type => this.tradeEngine.getBalance(type),
-                getTotalProfit: () => this.tradeEngine.getTotalProfit(),
+                getTotalProfit: toString =>
+                    this.tradeEngine.getTotalProfit(toString, this.tradeEngine.tradeOptions.currency),
             };
         }
     };
diff --git a/src/botPage/bot/TradeEngine/Total.js b/src/botPage/bot/TradeEngine/Total.js
@@ -86,9 +86,14 @@ export default Engine =>
             const accountStat = this.getAccountStat();
             return accountStat.totalRuns;
         }
-        getTotalProfit() {
+        getTotalProfit(toString, currency) {
             const accountStat = this.getAccountStat();
-            return Number(accountStat.totalProfit);
+            return toString && accountStat.totalProfit !== 0
+                ? roundBalance({
+                    currency,
+                    balance: +accountStat.totalProfit,
+                })
+                : +accountStat.totalProfit;
         }
         /* eslint-enable */
         checkLimits(tradeOption) {
diff --git a/src/botPage/bot/__tests__/block-tests/tools-test/Misc.js b/src/botPage/bot/__tests__/block-tests/tools-test/Misc.js
@@ -17,7 +17,7 @@ describe('Misc. tools', () => {
         Bot.notify({ message: 'Test', className: 'info'})
         watch('before')
         result.totalRuns = Bot.getTotalRuns();
-        result.totalProfit = Bot.getTotalProfit();
+        result.totalProfit = Bot.getTotalProfit(false, null);
         result.balance = Bot.getBalance('NUM')
         result.balanceStr = Bot.getBalance('STR')
     `
@@ -47,7 +47,9 @@ describe('Misc. tools', () => {
     });
 
     it('Notify', () => {
-        const { notify: { className, message } } = observed;
+        const {
+            notify: { className, message },
+        } = observed;
 
         expect(className).equal('info');
         expect(message).equal('Test');
diff --git a/src/botPage/view/blockly/blocks/tools/total_profit.js b/src/botPage/view/blockly/blocks/tools/total_profit.js
@@ -23,4 +23,15 @@ Blockly.Blocks.total_profit = {
         }
     },
 };
-Blockly.JavaScript.total_profit = () => ['Bot.getTotalProfit()', Blockly.JavaScript.ORDER_ATOMIC];
+Blockly.JavaScript.total_profit = () => ['Bot.getTotalProfit(false)', Blockly.JavaScript.ORDER_ATOMIC];
+
+Blockly.Blocks.total_profit_string = {
+    init: function init() {
+        this.appendDummyInput().appendField(translate('Total Profit String'));
+        this.setOutput(true, 'String');
+        this.setColour('#dedede');
+        this.setTooltip(translate('Return the total profit (String)'));
+        this.setHelpUrl('https://github.com/binary-com/binary-bot/wiki');
+    },
+};
+Blockly.JavaScript.total_profit_string = () => ['Bot.getTotalProfit(true)', Blockly.JavaScript.ORDER_ATOMIC];
diff --git a/static/xml/toolbox.xml b/static/xml/toolbox.xml
@@ -440,6 +440,7 @@
             <category name="Misc." i18n-text="Misc.">
                 <block type="balance"></block>
                 <block type="total_profit"></block>
+                <block type="total_profit_string"></block>
                 <block type="total_runs"></block>
                 <block type="notify">
                     <field name="NOTIFICATION_TYPE">success</field>
