From b2fb9faf6c450d5afe1e79f9a6a6220c4a9b2a6d Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Tue, 15 Oct 2024 16:17:33 +0300
Subject: [PATCH] use the active balance to validate the amount

---
 internal/handlers/ussd/menuhandler.go | 41 +++++----------------------
 1 file changed, 7 insertions(+), 34 deletions(-)

diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index c3d1870..f263e4b 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -745,43 +745,16 @@ func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte)
 	flag_invalid_amount, _ := h.flagManager.GetFlag("flag_invalid_amount")
 	store := h.userdataStore
 
-	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
+	var balanceValue float64
+
+	// retrieve the active balance
+	activeBal, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_BAL)
 	if err != nil {
 		return res, err
 	}
-
-	// retrieve the active symbol
-	activeSym, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_SYM)
-	useActiveSymbol := err == nil && len(activeSym) > 0
-
-	var balanceValue float64
-	if useActiveSymbol {
-		// If active symbol is set, retrieve its balance
-		activeBal, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_BAL)
-		if err != nil {
-			return res, fmt.Errorf("failed to get active balance: %v", err)
-		}
-		balanceValue, err = strconv.ParseFloat(string(activeBal), 64)
-		if err != nil {
-			return res, fmt.Errorf("failed to parse active balance: %v", err)
-		}
-	} else {
-		// If no active symbol, use the current balance from the API
-		balanceStr, err := h.accountService.CheckBalance(string(publicKey))
-		if err != nil {
-			return res, fmt.Errorf("failed to check balance: %v", err)
-		}
-		res.Content = balanceStr
-
-		// Parse the balance string
-		balanceParts := strings.Split(balanceStr, " ")
-		if len(balanceParts) != 2 {
-			return res, fmt.Errorf("unexpected balance format: %s", balanceStr)
-		}
-		balanceValue, err = strconv.ParseFloat(balanceParts[0], 64)
-		if err != nil {
-			return res, fmt.Errorf("failed to parse balance: %v", err)
-		}
+	balanceValue, err = strconv.ParseFloat(string(activeBal), 64)
+	if err != nil {
+		return res, err
 	}
 
 	// Extract numeric part from the input amount