Merge branch 'master' into send-max-amount-hotfix

Reviewed-on: #119

handlers/application/balance.go

@@ -13,8 +13,7 @@ import (
 	"gopkg.in/leonelquinteros/gotext.v1"
 )
 
-// CheckBalance retrieves the balance of the active voucher and sets
-// the balance as the result content.
+// CheckBalance retrieves the balance of the active voucher, alias and pool symbol
 func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var (
 		res     resource.Result
@@ -38,7 +37,6 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt
 			return res, err
 		}
 	}
-
 	activeBal, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_BAL)
 	if err != nil {
 		if !db.IsNotFound(err) {
@@ -47,6 +45,7 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt
 		}
 	}
 
+	// get the account alias
 	accAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS)
 	if err != nil {
 		if !db.IsNotFound(err) {
@@ -55,7 +54,13 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt
 		}
 	}
 
-	content, err = loadUserContent(ctx, string(activeSym), string(activeBal), string(accAlias))
+	// Resolve active pool
+	_, activePoolSymbol, err := h.resolveActivePoolDetails(ctx, sessionId)
+	if err != nil {
+		return res, err
+	}
+
+	content, err = loadUserContent(ctx, string(activeSym), string(activeBal), string(accAlias), string(activePoolSymbol))
 	if err != nil {
 		return res, err
 	}
@@ -65,7 +70,7 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt
 }
 
 // loadUserContent loads the main user content in the main menu: the alias, balance and active symbol associated with active voucher
-func loadUserContent(ctx context.Context, activeSym, balance, alias string) (string, error) {
+func loadUserContent(ctx context.Context, activeSym, balance, alias, activePoolSymbol string) (string, error) {
 	var content string
 
 	code := codeFromCtx(ctx)
@@ -82,9 +87,9 @@ func loadUserContent(ctx context.Context, activeSym, balance, alias string) (str
 	balStr := fmt.Sprintf("%s %s", formattedAmount, activeSym)
 
 	if alias != "" {
-		content = l.Get("%s\nBalance: %s\n", alias, balStr)
+		content = l.Get("%s\n%s\nPool: %s\n", alias, balStr, activePoolSymbol)
 	} else {
-		content = l.Get("Balance: %s\n", balStr)
+		content = l.Get("%s\nPool: %s\n", balStr, activePoolSymbol)
 	}
 	return content, nil
 }

handlers/application/send.go

@@ -242,7 +242,9 @@ func (h *MenuHandlers) determineAndSaveTransactionType(
 		// fetch data for use (to_voucher data)
 		recipientActiveSym, recipientActiveAddress, recipientActiveDecimal, err := h.getRecipientData(ctx, string(recipientPhoneNumber))
 		if err != nil {
-			return err
+			// missing key (case for new users)
+			logg.ErrorCtxf(ctx, "failed on getRecipientData", "error", err)
+			return nil
 		}
 		swapMetadata := &dataserviceapi.TokenHoldings{
 			TokenAddress:  string(recipientActiveAddress),
@@ -373,13 +375,6 @@ 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)
 
-	// confirm the transaction type
-	swapToVoucher, err := store.ReadSwapToVoucher(ctx, h.userdataStore, sessionId)
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed on ReadSwapFromVoucher", "error", err)
-		return res, err
-	}
-
 	// Case for M-Pesa
 	// if the recipient is Mpesa (address), check if the sender's voucher is a stable coin
 	recipientAddress, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_RECIPIENT)
@@ -393,6 +388,16 @@ func (h *MenuHandlers) MaxAmount(ctx context.Context, sym string, input []byte)
 		return res, nil
 	}
 
+	// confirm the transaction type
+	swapToVoucher, err := store.ReadSwapToVoucher(ctx, h.userdataStore, sessionId)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed on ReadSwapFromVoucher", "error", err)
+		// switch to normal transaction as the recipient isn't registered (pool or alias only on sarafu)
+		res.FlagReset = append(res.FlagReset, flag_swap_transaction)
+		res.Content = l.Get("Maximum amount: %s %s\nEnter amount:", formattedBalance, string(activeSym))
+		return res, nil
+	}
+
 	if string(swapToVoucher.TokenAddress) == string(activeAddress) {
 		// recipient has active token same as selected token → normal transaction
 		transactionType = []byte("normal")

services/registration/account_menu

@@ -1 +1 @@
-My Account
+Account

services/registration/account_menu_swa

@@ -1 +1 @@
-Akaunti yangu
+Akaunti

services/registration/select_pool_menu

@@ -1 +1 @@
-Select pool
+Pool

services/registration/select_pool_menu_swa

@@ -1 +1 @@
-Chagua Bwawa
+Bwawa

services/registration/vouchers_menu

@@ -1 +1 @@
-My Vouchers
+Vouchers

services/registration/vouchers_menu_swa

@@ -1 +1 @@
-Sarafu yangu
+Sarafu