Merge branch 'master' into mpesa-onramp-offramp

handlers/application/send.go

@@ -335,8 +335,8 @@ func (h *MenuHandlers) MaxAmount(ctx context.Context, sym string, input []byte)
 	// Format the active balance amount to 2 decimal places
 	formattedBalance, _ := store.TruncateDecimalString(string(activeBal), 2)
 
-	// If normal transaction, or if the sym is max_amount, return balance
-	if string(transactionType) == "normal" || sym == "max_amount" {
+	// If normal transaction, or if the sym is send_max_amount, return balance
+	if string(transactionType) == "normal" || sym == "send_max_amount" {
 		res.FlagReset = append(res.FlagReset, flag_swap_transaction)
 
 		res.Content = l.Get("Maximum amount: %s %s\nEnter amount:", formattedBalance, string(activeSym))

handlers/application/send_test.go

@@ -277,7 +277,7 @@ func TestMaxAmount(t *testing.T) {
 				}
 			}
 
-			res, err := h.MaxAmount(ctx, "max_amount", []byte(""))
+			res, err := h.MaxAmount(ctx, "send_max_amount", []byte(""))
 
 			if tt.expectedError {
 				assert.Error(t, err)

handlers/application/vouchers.go

@@ -45,6 +45,26 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
 	res.FlagReset = append(res.FlagReset, flag_api_error)
 
 	if len(vouchersResp) == 0 {
+		// clear the current active voucher data if it exists
+		_, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
+		if err == nil {
+			firstVoucherMap := map[storedb.DataTyp]string{
+				storedb.DATA_ACTIVE_SYM:     "",
+				storedb.DATA_ACTIVE_BAL:     "",
+				storedb.DATA_ACTIVE_DECIMAL: "",
+				storedb.DATA_ACTIVE_ADDRESS: "",
+			}
+
+			for key, value := range firstVoucherMap {
+				if err := userStore.WriteEntry(ctx, sessionId, key, []byte(value)); err != nil {
+					logg.ErrorCtxf(ctx, "Failed to reset active voucher data", "key", key, "error", err)
+					return res, err
+				}
+			}
+
+			logg.InfoCtxf(ctx, "Default voucher reset")
+		}
+
 		res.FlagSet = append(res.FlagSet, flag_no_active_voucher)
 		return res, nil
 	}

handlers/local.go

@@ -85,7 +85,7 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("validate_recipient", appHandlers.ValidateRecipient)
 	ls.DbRs.AddLocalFunc("transaction_reset", appHandlers.TransactionReset)
 	ls.DbRs.AddLocalFunc("invite_valid_recipient", appHandlers.InviteValidRecipient)
-	ls.DbRs.AddLocalFunc("max_amount", appHandlers.MaxAmount)
+	ls.DbRs.AddLocalFunc("send_max_amount", appHandlers.MaxAmount)
 	ls.DbRs.AddLocalFunc("credit_max_amount", appHandlers.MaxAmount)
 	ls.DbRs.AddLocalFunc("validate_amount", appHandlers.ValidateAmount)
 	ls.DbRs.AddLocalFunc("reset_transaction_amount", appHandlers.ResetTransactionAmount)

services/registration/amount

@@ -1 +1 @@
-{{.max_amount}}
+{{.send_max_amount}}

services/registration/amount.vis

@@ -1,8 +1,8 @@
 LOAD reset_transaction_amount 10
 RELOAD reset_transaction_amount
-LOAD max_amount 0
-RELOAD max_amount
-MAP max_amount
+LOAD send_max_amount 0
+RELOAD send_max_amount
+MAP send_max_amount
 MOUT back 0
 HALT
 LOAD validate_amount 64

services/registration/amount_swa

@@ -1 +1 @@
-{{.max_amount}}
+{{.send_max_amount}}