From ac23e929f6dd88a5cd4bb716f1c4fbd341f53f15 Mon Sep 17 00:00:00 2001
From: MaxxRK <drgullett89@outlook.com>
Date: Wed, 27 Nov 2024 09:22:38 -0600
Subject: [PATCH] fix message formats

---
 firstradeAPI.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/firstradeAPI.py b/firstradeAPI.py
index 3f0f54af..f3d93e13 100644
--- a/firstradeAPI.py
+++ b/firstradeAPI.py
@@ -125,10 +125,6 @@ def firstrade_transaction(firstrade_o: Brokerage, orderObj: stockOrder, loop=Non
     # Buy on each account
     for s in orderObj.get_stocks():
         for key in firstrade_o.get_account_numbers():
-            printAndDiscord(
-                f"{key} {orderObj.get_action()}ing {orderObj.get_amount()} {s} @ {orderObj.get_price()}",
-                loop,
-            )
             for account in firstrade_o.get_account_numbers(key):
                 obj: ft_account.FTSession = firstrade_o.get_logged_in_objects(key)
                 print_account = maskString(account)
@@ -167,7 +163,8 @@ def firstrade_transaction(firstrade_o: Brokerage, orderObj: stockOrder, loop=Non
                         # Do the dance
                         quantity = 100
                         printAndDiscord(
-                            f"Buying {quantity} then selling {quantity - orderObj.get_amount()} of {s}"
+                            f"Buying {quantity} then selling {quantity - orderObj.get_amount()} of {s}",
+                            loop,
                         )
                         orderObj.set_amount(quantity)
                         ft_order = order.Order(obj)
@@ -189,7 +186,7 @@ def firstrade_transaction(firstrade_o: Brokerage, orderObj: stockOrder, loop=Non
                                 f"{key} account {print_account}: The buy order verification was "
                                 + "successful"
                                 if buy_success
-                                else "unsuccessful"
+                                else f"{key} account {print_account}: The sell order verification was unsuccessful"
                             ),
                             loop,
                         )
@@ -223,7 +220,7 @@ def firstrade_transaction(firstrade_o: Brokerage, orderObj: stockOrder, loop=Non
                                 f"{key} account {print_account}: The sell order verification was "
                                 + "successful"
                                 if sell_success
-                                else "unsuccessful"
+                                else f"{key} account {print_account}: The sell order verification was unsuccessful"
                             ),
                             loop,
                         )
@@ -254,7 +251,7 @@ def firstrade_transaction(firstrade_o: Brokerage, orderObj: stockOrder, loop=Non
                                 f"{key} account {print_account}: The order verification was "
                                 + "successful"
                                 if order_success
-                                else "unsuccessful"
+                                else f"{key} account {print_account}: The sell order verification was unsuccessful"
                             ),
                             loop,
                         )