From d7a0dd698400f11fdfb9d587583edd0b5871e1eb Mon Sep 17 00:00:00 2001
From: Smidy13 <77650800+Smidy13@users.noreply.github.com>
Date: Fri, 19 Mar 2021 01:36:42 +1300
Subject: [PATCH 1/2] Bug Fix: Telegram Announcement Formula and Condition
 Changes

---
 .../Low-Frequency-Trading/Announcements.js    | 28 +++++++++++++++++--
 .../TradingSessionFunctions.js                |  3 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/Announcements.js b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/Announcements.js
index a0674a84f..c6cd6896c 100644
--- a/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/Announcements.js
+++ b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/Announcements.js
@@ -37,7 +37,7 @@ exports.newSuperalgosBotModulesAnnouncements = function (processIndex) {
                     conditionValue = eval(announcement.announcementCondition.code)
                 } catch (err) {
 
-                    const message = 'Annoucement Condition Evaluation Error'
+                    const message = 'Announcement Condition Evaluation Error'
                     let docs = {
                         project: 'Superalgos',
                         category: 'Topic',
@@ -53,8 +53,30 @@ exports.newSuperalgosBotModulesAnnouncements = function (processIndex) {
             }
             if (canAnnounce === true) {
                 let text = announcement.config.text
-                if (announcement.formula !== undefined) {
-                    text = tradingSystem.formulas.get(announcement.formula.id)
+                if (announcement.announcementFormula !== undefined) {
+                    console.log(announcement.announcementFormula)
+                    let formulaValue
+                    let errorMessage
+
+                    try {
+                        formulaValue = eval(announcement.announcementFormula.code)
+                    } catch (err) {
+
+                        errorMessage = err.message
+                        const message = 'Announcement Formula Evaluation Error'
+                        let docs = {
+                            project: 'Superalgos',
+                            category: 'Topic',
+                            type: 'TS LF Trading Bot Error - ' + message,
+                            placeholder: {}
+                        }
+
+                        TS.projects.superalgos.utilities.docsFunctions.buildPlaceholder(docs, err, announcement.announcementFormula.name, announcement.announcementFormula.code, undefined, undefined, undefined)
+
+                        tradingSystem.addError([announcement.announcementFormula.id, err.message, docs])
+                    }
+                    if (errorMessage == undefined) { text = formulaValue }
+
                 }
 
                 if (TS.projects.superalgos.globals.processConstants.CONSTANTS_BY_PROCESS_INDEX_MAP.get(processIndex).SESSION_NODE.socialBots !== undefined) {
diff --git a/Projects/Superalgos/UI/Function-Libraries/TradingSessionFunctions.js b/Projects/Superalgos/UI/Function-Libraries/TradingSessionFunctions.js
index c4f1f71a7..d644bc354 100644
--- a/Projects/Superalgos/UI/Function-Libraries/TradingSessionFunctions.js
+++ b/Projects/Superalgos/UI/Function-Libraries/TradingSessionFunctions.js
@@ -65,7 +65,6 @@ function newSuperalgosFunctionLibraryTradingSessionFunctions() {
             'Dynamic Indicators->Indicator Function->Formula->' +
             'Trading Strategy->' +
             'Trigger Stage->Trigger On Event->Trigger Off Event->Take Position Event->' +
-            'Announcement->Announcement Formula->' +
             'Open Stage->' +
             'Manage Stage->' +
             'Managed Stop Loss->Managed Take Profit->' +
@@ -74,7 +73,7 @@ function newSuperalgosFunctionLibraryTradingSessionFunctions() {
             'Situation->Condition->Javascript Code->' +
             'Close Stage->' +
             'Initial Targets->Target Size In Base Asset->Target Size In Quoted Asset->Target Rate->Formula->' +
-            'Announcement->Announcement Formula->' +
+            'Announcement->Announcement Formula->Announcement Condition->' +
             'Open Execution->Close Execution->' +
             'Execution Algorithm->Market Buy Order->Market Sell Order->Limit Buy Order->Limit Sell Order->' +
             'Order Rate->Formula->' +

From 7c7f88f87833a9b02d7b6ff1780550f4ba8f5462 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Thu, 18 Mar 2021 15:09:32 +0100
Subject: [PATCH 2/2] Update Announcements.js

---
 .../Trading-Bot/Low-Frequency-Trading/Announcements.js         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/Announcements.js b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/Announcements.js
index c6cd6896c..c9c345b63 100644
--- a/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/Announcements.js
+++ b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/Announcements.js
@@ -54,7 +54,6 @@ exports.newSuperalgosBotModulesAnnouncements = function (processIndex) {
             if (canAnnounce === true) {
                 let text = announcement.config.text
                 if (announcement.announcementFormula !== undefined) {
-                    console.log(announcement.announcementFormula)
                     let formulaValue
                     let errorMessage
 
@@ -97,4 +96,4 @@ exports.newSuperalgosBotModulesAnnouncements = function (processIndex) {
             }
         }
     }
-}
\ No newline at end of file
+}