Merge pull request 'allow-stables-direct-to-mpesa' (#118) from allow-stables-direct-to-mpesa into master

Reviewed-on: #118

.env.example

@@ -34,9 +34,12 @@ INCLUDE_STABLES_PARAM=false
 DEFAULT_MPESA_ADDRESS=0x48a953cA5cf5298bc6f6Af3C608351f537AAcb9e
 MIN_MPESA_SEND_AMOUNT=100
 MAX_MPESA_SEND_AMOUNT=250000
+MIN_MPESA_WITHDRAW_AMOUNT=20
 DEFAULT_MPESA_ASSET=cUSD
 MPESA_BEARER_TOKEN=eyJeSIsInRcCI6IkpXVCJ.yJwdWJsaWNLZXkiOiIwrrrrrr
 MPESA_ONRAMP_BASE=https://pretium.v1.grassecon.net
 
-# Known stable voucher addresses (USDT, USDm)
-STABLE_VOUCHER_ADDRESSES=0x48065fbBE25f71C9282ddf5e1cD6D6A887483D5e,0x765DE816845861e75A25fCA122bb6898B8B1282a
+# Known stable voucher addresses (USDm, USD₮, USDC)
+STABLE_VOUCHER_ADDRESSES=0x765DE816845861e75A25fCA122bb6898B8B1282a,0x48065fbBE25f71C9282ddf5e1cD6D6A887483D5e,0xcebA9300f2b948710d2653dD7B07f33A8B32118C
+DEFAULT_STABLE_VOUCHER_ADDRESS=0x765DE816845861e75A25fCA122bb6898B8B1282a
+DEFAULT_STABLE_VOUCHER_DECIMALS=18

config/config.go

@@ -102,6 +102,15 @@ func MinMpesaSendAmount() float64 {
 	return f
 }
 
+func MinMpesaWithdrawAmount() float64 {
+	v := env.GetEnv("MIN_MPESA_WITHDRAW_AMOUNT", "20")
+	f, err := strconv.ParseFloat(v, 64)
+	if err != nil {
+		return 20 // fallback
+	}
+	return f
+}
+
 func MaxMpesaSendAmount() float64 {
 	v := env.GetEnv("MAX_MPESA_SEND_AMOUNT", "250000")
 	f, err := strconv.ParseFloat(v, 64)
@@ -125,7 +134,7 @@ func StableVoucherAddresses() []string {
 
 	list := strings.Split(raw, ",")
 	for _, addr := range list {
-		clean := strings.ToLower(strings.TrimSpace(addr))
+		clean := strings.TrimSpace(addr)
 		if clean != "" {
 			parsed = append(parsed, clean)
 		}
@@ -133,3 +142,11 @@ func StableVoucherAddresses() []string {
 
 	return parsed
 }
+
+func DefaultStableVoucherAddress() string {
+	return env.GetEnv("DEFAULT_STABLE_VOUCHER_ADDRESS", "")
+}
+
+func DefaultStableVoucherDecimals() string {
+	return env.GetEnv("DEFAULT_STABLE_VOUCHER_DECIMALS", "")
+}

handlers/application/balance.go

@@ -112,91 +112,115 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i
 		return res, fmt.Errorf("missing session")
 	}
 
-	userStore := h.userdataStore
-
 	code := codeFromCtx(ctx)
 	l := gotext.NewLocale(translationDir, code)
 	l.AddDomain("default")
 
 	flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
-	flag_no_stable_vouchers, _ := h.flagManager.GetFlag("flag_no_stable_vouchers")
-
-	// default response
-	res.FlagReset = append(res.FlagReset, flag_api_call_error)
-	res.Content = l.Get("Credit: %s KSH\nDebt: %s KSH\n", "0", "0")
 
 	// Fetch session data
-	_, _, activeSym, _, publicKey, _, err := h.getSessionData(ctx, sessionId)
+	_, activeBal, activeSym, activeAddress, publicKey, activeDecimal, err := h.getSessionData(ctx, sessionId)
 	if err != nil {
+		res.Content = l.Get("Credit: %s KSH\nDebt: %s %s\n", "0", "0", string(activeSym))
 		return res, nil
 	}
 
+	res.FlagReset = append(res.FlagReset, flag_api_call_error)
+
 	// Resolve active pool
 	activePoolAddress, _, err := h.resolveActivePoolDetails(ctx, sessionId)
 	if err != nil {
 		return res, err
 	}
 
-	// Fetch swappable vouchers
+	// Fetch swappable vouchers (pool view)
 	swappableVouchers, err := h.accountService.GetPoolSwappableFromVouchers(ctx, string(activePoolAddress), string(publicKey))
 	if err != nil {
 		logg.ErrorCtxf(ctx, "failed on GetPoolSwappableFromVouchers", "error", err)
+		res.Content = l.Get("Credit: %s KSH\nDebt: %s %s\n", "0", "0", string(activeSym))
 		return res, nil
 	}
 
 	if len(swappableVouchers) == 0 {
+		res.Content = l.Get("Credit: %s KSH\nDebt: %s %s\n", "0", "0", string(activeSym))
 		return res, nil
 	}
 
-	// Filter stable vouchers (excluding active voucher)
-	filteredSwappableVouchers := make([]dataserviceapi.TokenHoldings, 0)
-	for _, v := range swappableVouchers {
-		if v.TokenSymbol == string(activeSym) {
-			continue
-		}
-		if isStableVoucher(v.TokenAddress) {
-			filteredSwappableVouchers = append(filteredSwappableVouchers, v)
-		}
-	}
-
-	// No stable vouchers → cannot pay debt
-	if len(filteredSwappableVouchers) == 0 {
-		res.FlagSet = append(res.FlagSet, flag_no_stable_vouchers)
+	// Fetch ALL wallet vouchers (voucher holdings view)
+	allVouchers, err := h.accountService.FetchVouchers(ctx, string(publicKey))
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed on FetchVouchers", "error", err)
 		return res, nil
 	}
 
-	res.FlagReset = append(res.FlagReset, flag_no_stable_vouchers)
+	// CREDIT calculation
+	// Rule:
+	// 1. Swap quote of active voucher → first stable in pool from GetPoolSwappableFromVouchers
+	// 2. PLUS all stable balances from FetchVouchers
 
-	// Process stable vouchers for later use
-	data := store.ProcessVouchers(filteredSwappableVouchers)
+	scaledCredit := "0"
 
-	// Find active voucher data
-	activeSymStr := string(activeSym)
-	var activeData *dataserviceapi.TokenHoldings
-	for _, v := range swappableVouchers {
-		if v.TokenSymbol == activeSymStr {
-			activeData = &v
+	// 1. Find first stable voucher in POOL (for swap target)
+	var firstPoolStable *dataserviceapi.TokenHoldings
+	for i := range swappableVouchers {
+		if isStableVoucher(swappableVouchers[i].TokenAddress) {
+			firstPoolStable = &swappableVouchers[i]
 			break
 		}
 	}
 
-	if activeData == nil {
+	// 2. If pool has a stable, get swap quote
+	if firstPoolStable != nil {
+		finalAmountStr, err := store.ParseAndScaleAmount(
+			string(activeBal),
+			string(activeDecimal),
+		)
+		if err != nil {
+			return res, err
+		}
+
+		// swap active -> FIRST stable from pool list
+		r, err := h.accountService.GetPoolSwapQuote(ctx, finalAmountStr, string(publicKey), string(activeAddress), string(activePoolAddress), firstPoolStable.TokenAddress)
+		if err != nil {
+			res.FlagSet = append(res.FlagSet, flag_api_call_error)
+			res.Content = l.Get("Your request failed. Please try again later.")
+			logg.ErrorCtxf(ctx, "failed on poolSwap", "error", err)
 			return res, nil
 		}
 
-	// Credit = active voucher balance
-	scaledCredit := store.ScaleDownBalance(
-		activeData.Balance,
-		activeData.TokenDecimals,
-	)
+		// scale using REAL stable decimals
+		finalQuote := store.ScaleDownBalance(r.OutValue, firstPoolStable.TokenDecimals)
 
-	// Debt = sum of stable vouchers only
-	scaledDebt := "0"
-	for _, v := range filteredSwappableVouchers {
-		scaled := store.ScaleDownBalance(v.Balance, v.TokenDecimals)
-		scaledDebt = store.AddDecimalStrings(scaledDebt, scaled)
+		scaledCredit = store.AddDecimalStrings(scaledCredit, finalQuote)
 	}
 
+	// 3. Add ALL wallet stable balances (from FetchVouchers)
+	for _, v := range allVouchers {
+		if isStableVoucher(v.TokenAddress) {
+			scaled := store.ScaleDownBalance(v.Balance, v.TokenDecimals)
+			scaledCredit = store.AddDecimalStrings(scaledCredit, scaled)
+		}
+	}
+
+	// DEBT calculation
+	// Rule:
+	// - Default = 0
+	// - If active is stable → remain 0
+	// - If active is non-stable and exists in pool → use pool balance
+
+	scaledDebt := "0"
+
+	if !isStableVoucher(string(activeAddress)) {
+		for _, v := range swappableVouchers {
+			if v.TokenSymbol == string(activeSym) {
+				scaledDebt = store.ScaleDownBalance(v.Balance, v.TokenDecimals)
+				break
+			}
+		}
+	}
+
+	formattedDebt, _ := store.TruncateDecimalString(scaledDebt, 2)
+
 	// Fetch MPESA rates
 	rates, err := h.accountService.GetMpesaOnrampRates(ctx)
 	if err != nil {
@@ -207,33 +231,14 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i
 	}
 
 	creditFloat, _ := strconv.ParseFloat(scaledCredit, 64)
-	debtFloat, _ := strconv.ParseFloat(scaledDebt, 64)
-
 	creditKsh := fmt.Sprintf("%f", creditFloat*rates.Buy)
-	debtKsh := fmt.Sprintf("%f", debtFloat*rates.Buy)
-
 	kshFormattedCredit, _ := store.TruncateDecimalString(creditKsh, 0)
-	kshFormattedDebt, _ := store.TruncateDecimalString(debtKsh, 0)
-
-	// Persist swap data
-	dataMap := map[storedb.DataTyp]string{
-		storedb.DATA_POOL_TO_SYMBOLS:   data.Symbols,
-		storedb.DATA_POOL_TO_BALANCES:  data.Balances,
-		storedb.DATA_POOL_TO_DECIMALS:  data.Decimals,
-		storedb.DATA_POOL_TO_ADDRESSES: data.Addresses,
-	}
-
-	for key, value := range dataMap {
-		if err := userStore.WriteEntry(ctx, sessionId, key, []byte(value)); err != nil {
-			logg.ErrorCtxf(ctx, "Failed to write data entry for sessionId: %s", sessionId, "key", key, "error", err)
-			continue
-		}
-	}
 
 	res.Content = l.Get(
-		"Credit: %s KSH\nDebt: %s KSH\n",
+		"Credit: %s KSH\nDebt: %s %s\n",
 		kshFormattedCredit,
-		kshFormattedDebt,
+		formattedDebt,
+		string(activeSym),
 	)
 
 	return res, nil

handlers/application/mpesa.go

@@ -28,20 +28,36 @@ func (h *MenuHandlers) GetMpesaMaxLimit(ctx context.Context, sym string, input [
 	flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
 	flag_low_swap_amount, _ := h.flagManager.GetFlag("flag_low_swap_amount")
 	flag_incorrect_pool, _ := h.flagManager.GetFlag("flag_incorrect_pool")
+	flag_incorrect_voucher, _ := h.flagManager.GetFlag("flag_incorrect_voucher")
 
 	code := codeFromCtx(ctx)
 	l := gotext.NewLocale(translationDir, code)
 	l.AddDomain("default")
 
 	inputStr := string(input)
-	if inputStr == "0" || inputStr == "9" {
+	if inputStr == "0" || inputStr == "99" || inputStr == "88" || inputStr == "98" {
+		res.FlagReset = append(res.FlagReset, flag_low_swap_amount, flag_api_call_error, flag_incorrect_voucher, flag_incorrect_pool)
 		return res, nil
 	}
 
 	userStore := h.userdataStore
+	metadata, err := store.GetOrderedVoucherData(ctx, userStore, sessionId, inputStr)
+	if err != nil {
+		return res, fmt.Errorf("failed to retrieve swap to voucher data: %v", err)
+	}
+	if metadata == nil {
+		res.FlagSet = append(res.FlagSet, flag_incorrect_voucher)
+		return res, nil
+	}
+
+	// Store the active transaction voucher data (from token)
+	if err := store.StoreTransactionVoucher(ctx, h.userdataStore, sessionId, metadata); err != nil {
+		logg.ErrorCtxf(ctx, "failed on StoreTransactionVoucher", "error", err)
+		return res, err
+	}
 
 	// Fetch session data
-	_, activeBal, _, activeAddress, publicKey, activeDecimal, err := h.getSessionData(ctx, sessionId)
+	_, _, _, _, publicKey, _, err := h.getSessionData(ctx, sessionId)
 	if err != nil {
 		return res, err
 	}
@@ -77,14 +93,20 @@ func (h *MenuHandlers) GetMpesaMaxLimit(ctx context.Context, sym string, input [
 		return res, err
 	}
 
-	// fetch data for verification
+	// fetch data for verification (to_voucher data)
 	recipientActiveSym, recipientActiveAddress, recipientActiveDecimal, err := h.getRecipientData(ctx, string(recipientPhoneNumber))
 	if err != nil {
 		return res, err
 	}
 
-	// If RAT is the same as SAT, return early with KSH format
-	if string(activeAddress) == string(recipientActiveAddress) {
+	// Fetch min withdrawal amount from config/env
+	minWithdraw := config.MinMpesaWithdrawAmount() // float64 (20)
+	minKshFormatted, _ := store.TruncateDecimalString(fmt.Sprintf("%f", minWithdraw), 0)
+
+	// If SAT is the same as RAT (default USDm),
+	// or if the voucher is a stable coin
+	// return early with KSH format
+	if string(metadata.TokenAddress) == string(recipientActiveAddress) || isStableVoucher(metadata.TokenAddress) {
 		txType = "normal"
 		// Save the transaction type
 		if err := userStore.WriteEntry(ctx, sessionId, storedb.DATA_SEND_TRANSACTION_TYPE, []byte(txType)); err != nil {
@@ -92,16 +114,26 @@ func (h *MenuHandlers) GetMpesaMaxLimit(ctx context.Context, sym string, input [
 			return res, err
 		}
 
-		activeFloat, _ := strconv.ParseFloat(string(activeBal), 64)
-		ksh := fmt.Sprintf("%f", activeFloat*rates.Buy)
+		activeFloat, _ := strconv.ParseFloat(string(metadata.Balance), 64)
+		kshValue := activeFloat * rates.Buy
 
-		kshFormatted, _ := store.TruncateDecimalString(ksh, 0)
+		maxKshFormatted, _ := store.TruncateDecimalString(fmt.Sprintf("%f", kshValue), 0)
+
+		// Ensure that the max is greater than the min
+		if kshValue < minWithdraw {
+			res.FlagSet = append(res.FlagSet, flag_low_swap_amount)
+			res.Content = l.Get("%s Ksh", maxKshFormatted)
+			return res, nil
+		}
 
 		res.Content = l.Get(
-			"Enter the amount of Mpesa to get: (Max %s Ksh)\n",
-			kshFormatted,
+			"Enter the amount of Mpesa to withdraw: (Min: Ksh %s, Max %s Ksh)\n",
+			minKshFormatted,
+			maxKshFormatted,
 		)
 
+		res.FlagReset = append(res.FlagReset, flag_low_swap_amount, flag_api_call_error, flag_incorrect_voucher, flag_incorrect_pool)
+
 		return res, nil
 	}
 
@@ -111,27 +143,31 @@ func (h *MenuHandlers) GetMpesaMaxLimit(ctx context.Context, sym string, input [
 		return res, err
 	}
 
-	// Check if sender token is swappable
-	canSwap, err := h.accountService.CheckTokenInPool(ctx, string(activePoolAddress), string(activeAddress))
+	// Check if selected token is swappable
+	canSwap, err := h.accountService.CheckTokenInPool(ctx, string(activePoolAddress), string(metadata.TokenAddress))
 	if err != nil {
 		res.FlagSet = append(res.FlagSet, flag_api_call_error)
 		logg.ErrorCtxf(ctx, "failed on CheckTokenInPool", "error", err)
 		return res, nil
 	}
 
-	if !canSwap.CanSwapFrom { // pool issue (TODO on vis)
+	if !canSwap.CanSwapFrom { // pool issue (CATCH on .vis)
 		res.FlagSet = append(res.FlagSet, flag_incorrect_pool)
+		res.Content = "0"
 		return res, nil
 	}
 
 	// retrieve the max credit send amounts
-	_, maxRAT, err := h.calculateSendCreditLimits(ctx, activePoolAddress, activeAddress, recipientActiveAddress, publicKey, activeDecimal, recipientActiveDecimal)
+	_, maxRAT, err := h.calculateSendCreditLimits(ctx, activePoolAddress, []byte(metadata.TokenAddress), recipientActiveAddress, publicKey, []byte(metadata.TokenDecimals), recipientActiveDecimal)
 	if err != nil {
 		res.FlagSet = append(res.FlagSet, flag_api_call_error)
+		res.Content = "0"
 		logg.ErrorCtxf(ctx, "failed on calculateSendCreditLimits", "error", err)
 		return res, nil
 	}
 
+	res.FlagReset = append(res.FlagReset, flag_api_call_error)
+
 	// Fallback if below minimum
 	maxFloat, _ := strconv.ParseFloat(maxRAT, 64)
 	if maxFloat < 0.1 {
@@ -141,6 +177,8 @@ func (h *MenuHandlers) GetMpesaMaxLimit(ctx context.Context, sym string, input [
 		return res, nil
 	}
 
+	res.FlagReset = append(res.FlagReset, flag_low_swap_amount)
+
 	// Save max RAT amount to be used in validating the user's input
 	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT, []byte(maxRAT))
 	if err != nil {
@@ -154,28 +192,31 @@ func (h *MenuHandlers) GetMpesaMaxLimit(ctx context.Context, sym string, input [
 		return res, err
 	}
 
-	// save swap related data for the swap preview
-	metadata := &dataserviceapi.TokenHoldings{
+	// save swap related data for the swap preview (the swap to)
+	swapMetadata := &dataserviceapi.TokenHoldings{
 		TokenAddress:  string(recipientActiveAddress),
 		TokenSymbol:   string(recipientActiveSym),
 		TokenDecimals: string(recipientActiveDecimal),
 	}
 
 	// Store the active swap_to data
-	if err := store.UpdateSwapToVoucherData(ctx, userStore, sessionId, metadata); err != nil {
+	if err := store.UpdateSwapToVoucherData(ctx, userStore, sessionId, swapMetadata); err != nil {
 		logg.ErrorCtxf(ctx, "failed on UpdateSwapToVoucherData", "error", err)
 		return res, err
 	}
 
 	maxKsh := maxFloat * rates.Buy
 	kshStr := fmt.Sprintf("%f", maxKsh)
-	kshFormatted, _ := store.TruncateDecimalString(kshStr, 0)
+	maxKshFormatted, _ := store.TruncateDecimalString(kshStr, 0)
 
 	res.Content = l.Get(
-		"Enter the amount of Mpesa to get: (Max %s Ksh)\n",
-		kshFormatted,
+		"Enter the amount of Mpesa to withdraw: (Min: Ksh %s, Max %s Ksh)\n",
+		minKshFormatted,
+		maxKshFormatted,
 	)
 
+	res.FlagReset = append(res.FlagReset, flag_low_swap_amount, flag_api_call_error, flag_incorrect_voucher, flag_incorrect_pool)
+
 	return res, nil
 }
 
@@ -189,7 +230,7 @@ func (h *MenuHandlers) GetMpesaPreview(ctx context.Context, sym string, input []
 
 	// INPUT IN RAT Ksh
 	inputStr := string(input)
-	if inputStr == "9" {
+	if inputStr == "0" || inputStr == "9" {
 		return res, nil
 	}
 
@@ -219,17 +260,20 @@ func (h *MenuHandlers) GetMpesaPreview(ctx context.Context, sym string, input []
 		return res, nil
 	}
 
+	min := config.MinMpesaWithdrawAmount()
+
+	if kshAmount < min {
+		// if the input is below the minimum
+		res.FlagSet = append(res.FlagSet, flag_invalid_amount)
+		res.Content = inputStr
+		return res, nil
+	}
+
 	// divide by the buy rate
 	inputAmount := kshAmount / rates.Buy
 
-	// store the user's raw input amount in the temporary value
-	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(inputStr))
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to write temporary inputStr entry with", "key", storedb.DATA_TEMPORARY_VALUE, "value", inputStr, "error", err)
-		return res, err
-	}
-
-	swapData, err := store.ReadSwapPreviewData(ctx, userStore, sessionId)
+	// Resolve active pool
+	activePoolAddress, _, err := h.resolveActivePoolDetails(ctx, sessionId)
 	if err != nil {
 		return res, err
 	}
@@ -239,19 +283,21 @@ func (h *MenuHandlers) GetMpesaPreview(ctx context.Context, sym string, input []
 		return res, err
 	}
 
-	if string(transactionType) == "normal" {
-		activeBal, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_BAL)
+	// get the selected voucher
+	mpesaWithdrawalVoucher, err := store.GetTransactionVoucherData(ctx, h.userdataStore, sessionId)
 	if err != nil {
-			logg.ErrorCtxf(ctx, "failed to read activeBal entry with", "key", storedb.DATA_ACTIVE_BAL, "error", err)
-			return res, err
-		}
-		balanceValue, err := strconv.ParseFloat(string(activeBal), 64)
-		if err != nil {
-			logg.ErrorCtxf(ctx, "Failed to convert the activeBal to a float", "error", err)
+		logg.ErrorCtxf(ctx, "failed on GetTransactionVoucherData", "error", err)
 		return res, err
 	}
 
-		if inputAmount > balanceValue {
+	if string(transactionType) == "normal" {
+		// get the max based on the selected voucher balance
+		maxValue, err := strconv.ParseFloat(mpesaWithdrawalVoucher.Balance, 64)
+		if err != nil {
+			logg.ErrorCtxf(ctx, "Failed to convert the stored balance string to a float", "error", err)
+			return res, err
+		}
+		if inputAmount > maxValue {
 			res.FlagSet = append(res.FlagSet, flag_invalid_amount)
 			res.Content = inputStr
 			return res, nil
@@ -270,14 +316,26 @@ func (h *MenuHandlers) GetMpesaPreview(ctx context.Context, sym string, input []
 
 		res.Content = l.Get(
 			"You are sending %s %s in order to receive ~ %s ksh",
-			qouteInputAmount, swapData.ActiveSwapFromSym, inputStr,
+			qouteInputAmount, mpesaWithdrawalVoucher.TokenSymbol, inputStr,
 		)
 
 		return res, nil
 	}
 
+	swapToVoucher, err := store.ReadSwapToVoucher(ctx, h.userdataStore, sessionId)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed on ReadSwapFromVoucher", "error", err)
+		return res, err
+	}
+
+	swapMaxAmount, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read swapMaxAmount entry with", "key", storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT, "error", err)
+		return res, err
+	}
+
 	// use the stored max RAT
-	maxRATValue, err := strconv.ParseFloat(swapData.ActiveSwapMaxAmount, 64)
+	maxRATValue, err := strconv.ParseFloat(string(swapMaxAmount), 64)
 	if err != nil {
 		logg.ErrorCtxf(ctx, "Failed to convert the swapMaxAmount to a float", "error", err)
 		return res, err
@@ -289,15 +347,21 @@ func (h *MenuHandlers) GetMpesaPreview(ctx context.Context, sym string, input []
 		return res, nil
 	}
 
-	formattedAmount := fmt.Sprintf("%f", inputAmount)
+	// Format the amount to 2 decimal places
+	formattedAmount, err := store.TruncateDecimalString(fmt.Sprintf("%f", inputAmount), 2)
+	if err != nil {
+		res.FlagSet = append(res.FlagSet, flag_invalid_amount)
+		res.Content = inputStr
+		return res, nil
+	}
 
-	finalAmountStr, err := store.ParseAndScaleAmount(formattedAmount, swapData.ActiveSwapToDecimal)
+	finalAmountStr, err := store.ParseAndScaleAmount(formattedAmount, swapToVoucher.TokenDecimals)
 	if err != nil {
 		return res, err
 	}
 
 	// call the credit send API to get the reverse quote
-	r, err := h.accountService.GetCreditSendReverseQuote(ctx, swapData.ActivePoolAddress, swapData.ActiveSwapFromAddress, swapData.ActiveSwapToAddress, finalAmountStr)
+	r, err := h.accountService.GetCreditSendReverseQuote(ctx, string(activePoolAddress), mpesaWithdrawalVoucher.TokenAddress, swapToVoucher.TokenAddress, finalAmountStr)
 	if err != nil {
 		res.FlagSet = append(res.FlagSet, flag_api_call_error)
 		res.Content = l.Get("Your request failed. Please try again later.")
@@ -323,13 +387,13 @@ func (h *MenuHandlers) GetMpesaPreview(ctx context.Context, sym string, input []
 	}
 
 	// covert for display
-	quoteInputStr := store.ScaleDownBalance(sendInputAmount, swapData.ActiveSwapFromDecimal)
+	quoteInputStr := store.ScaleDownBalance(sendInputAmount, mpesaWithdrawalVoucher.TokenDecimals)
 	// Format the quoteInputStr amount to 2 decimal places
 	qouteInputAmount, _ := store.TruncateDecimalString(quoteInputStr, 2)
 
 	res.Content = l.Get(
 		"You are sending %s %s in order to receive ~ %s ksh",
-		qouteInputAmount, swapData.ActiveSwapFromSym, inputStr,
+		qouteInputAmount, mpesaWithdrawalVoucher.TokenSymbol, inputStr,
 	)
 
 	return res, nil
@@ -355,13 +419,15 @@ func (h *MenuHandlers) InitiateGetMpesa(ctx context.Context, sym string, input [
 
 	mpesaAddress := config.DefaultMpesaAddress()
 
-	swapData, err := store.ReadSwapPreviewData(ctx, userStore, sessionId)
+	transactionType, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_SEND_TRANSACTION_TYPE)
 	if err != nil {
 		return res, err
 	}
 
-	transactionType, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_SEND_TRANSACTION_TYPE)
+	// get the selected voucher
+	mpesaWithdrawalVoucher, err := store.GetTransactionVoucherData(ctx, h.userdataStore, sessionId)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed on GetTransactionVoucherData", "error", err)
 		return res, err
 	}
 
@@ -372,12 +438,12 @@ func (h *MenuHandlers) InitiateGetMpesa(ctx context.Context, sym string, input [
 			return res, err
 		}
 
-		finalAmountStr, err := store.ParseAndScaleAmount(data.Amount, data.ActiveDecimal)
+		finalAmountStr, err := store.ParseAndScaleAmount(data.Amount, mpesaWithdrawalVoucher.TokenDecimals)
 		if err != nil {
 			return res, err
 		}
 
-		tokenTransfer, err := h.accountService.TokenTransfer(ctx, finalAmountStr, data.PublicKey, mpesaAddress, data.ActiveAddress)
+		tokenTransfer, err := h.accountService.TokenTransfer(ctx, finalAmountStr, data.PublicKey, mpesaAddress, mpesaWithdrawalVoucher.TokenAddress)
 		if err != nil {
 			res.FlagSet = append(res.FlagSet, flag_api_call_error)
 			res.Content = l.Get("Your request failed. Please try again later.")
@@ -387,11 +453,28 @@ func (h *MenuHandlers) InitiateGetMpesa(ctx context.Context, sym string, input [
 
 		logg.InfoCtxf(ctx, "TokenTransfer normal", "trackingId", tokenTransfer.TrackingId)
 
-		res.Content = l.Get("Your request has been sent. You will receive ~ %s ksh", data.TemporaryValue)
+		res.Content = l.Get("Your request has been sent. Please await confirmation")
 
 		res.FlagReset = append(res.FlagReset, flag_account_authorized)
 		return res, nil
+	}
 
+	publicKey, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read publicKey entry", "key", storedb.DATA_PUBLIC_KEY, "error", err)
+		return res, err
+	}
+
+	swapToVoucher, err := store.ReadSwapToVoucher(ctx, h.userdataStore, sessionId)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed on ReadSwapFromVoucher", "error", err)
+		return res, err
+	}
+
+	// Resolve active pool
+	activePoolAddress, _, err := h.resolveActivePoolDetails(ctx, sessionId)
+	if err != nil {
+		return res, err
 	}
 
 	swapAmount, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SWAP_AMOUNT)
@@ -403,7 +486,7 @@ func (h *MenuHandlers) InitiateGetMpesa(ctx context.Context, sym string, input [
 	swapAmountStr := string(swapAmount)
 
 	// Call the poolSwap API
-	poolSwap, err := h.accountService.PoolSwap(ctx, swapAmountStr, swapData.PublicKey, swapData.ActiveSwapFromAddress, swapData.ActivePoolAddress, swapData.ActiveSwapToAddress)
+	poolSwap, err := h.accountService.PoolSwap(ctx, swapAmountStr, string(publicKey), mpesaWithdrawalVoucher.TokenAddress, string(activePoolAddress), swapToVoucher.TokenAddress)
 	if err != nil {
 		flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
 		res.FlagSet = append(res.FlagSet, flag_api_call_error)
@@ -417,18 +500,13 @@ func (h *MenuHandlers) InitiateGetMpesa(ctx context.Context, sym string, input [
 	// TODO: remove this temporary time delay and replace with a swap and send endpoint
 	time.Sleep(1 * time.Second)
 
-	finalKshStr, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE)
-	if err != nil {
-		return res, err
-	}
-
 	amount, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_AMOUNT)
 	if err != nil {
 		return res, err
 	}
 
 	// Initiate a send to mpesa after the swap
-	tokenTransfer, err := h.accountService.TokenTransfer(ctx, string(amount), swapData.PublicKey, mpesaAddress, swapData.ActiveSwapToAddress)
+	tokenTransfer, err := h.accountService.TokenTransfer(ctx, string(amount), string(publicKey), mpesaAddress, swapToVoucher.TokenAddress)
 	if err != nil {
 		res.FlagSet = append(res.FlagSet, flag_api_call_error)
 		res.Content = l.Get("Your request failed. Please try again later.")
@@ -438,7 +516,7 @@ func (h *MenuHandlers) InitiateGetMpesa(ctx context.Context, sym string, input [
 
 	logg.InfoCtxf(ctx, "final TokenTransfer after swap", "trackingId", tokenTransfer.TrackingId)
 
-	res.Content = l.Get("Your request has been sent. You will receive ~ %s ksh", finalKshStr)
+	res.Content = l.Get("Your request has been sent. Please await confirmation")
 	res.FlagReset = append(res.FlagReset, flag_account_authorized)
 	return res, nil
 }
@@ -466,7 +544,7 @@ func (h *MenuHandlers) SendMpesaMinLimit(ctx context.Context, sym string, input
 	kshFormatted, _ := store.TruncateDecimalString(ksh, 0)
 
 	res.Content = l.Get(
-		"Enter the amount of Mpesa to send: (Minimum %s Ksh)\n",
+		"Enter the amount of credit to deposit: (Minimum %s Ksh)\n",
 		kshFormatted,
 	)
 
@@ -535,9 +613,11 @@ func (h *MenuHandlers) SendMpesaPreview(ctx context.Context, sym string, input [
 	estimateStr := fmt.Sprintf("%f", estimateValue)
 	estimateFormatted, _ := store.TruncateDecimalString(estimateStr, 2)
 
+	defaultAsset := config.DefaultMpesaAsset()
+
 	res.Content = l.Get(
-		"You will get a prompt for your M-Pesa PIN shortly to send %s ksh and receive ~ %s cUSD",
-		inputStr, estimateFormatted,
+		"You will get a prompt for your Mpesa PIN shortly to send %s ksh and receive ~ %s %s",
+		inputStr, estimateFormatted, defaultAsset,
 	)
 
 	return res, nil

handlers/application/paydebt.go

@@ -13,7 +13,7 @@ import (
 	"gopkg.in/leonelquinteros/gotext.v1"
 )
 
-// CalculateMaxPayDebt calculates the max debt removal
+// CalculateMaxPayDebt calculates the max debt removal based on the selected voucher
 func (h *MenuHandlers) CalculateMaxPayDebt(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	sessionId, ok := ctx.Value("SessionId").(string)
@@ -29,21 +29,28 @@ func (h *MenuHandlers) CalculateMaxPayDebt(ctx context.Context, sym string, inpu
 	l.AddDomain("default")
 
 	inputStr := string(input)
-	if inputStr == "0" || inputStr == "9" {
+	if inputStr == "0" || inputStr == "99" || inputStr == "88" || inputStr == "98" {
 		res.FlagReset = append(res.FlagReset, flag_low_swap_amount, flag_api_call_error)
 		return res, nil
 	}
 
 	userStore := h.userdataStore
 
+	// Fetch session data
+	_, _, activeSym, activeAddress, publicKey, activeDecimal, err := h.getSessionData(ctx, sessionId)
+	if err != nil {
+		return res, nil
+	}
+
 	// Resolve active pool
-	_, activePoolName, err := h.resolveActivePoolDetails(ctx, sessionId)
+	activePoolAddress, activePoolSymbol, err := h.resolveActivePoolDetails(ctx, sessionId)
 	if err != nil {
 		res.FlagReset = append(res.FlagReset, flag_low_swap_amount, flag_api_call_error)
 		return res, err
 	}
 
-	metadata, err := store.GetSwapToVoucherData(ctx, userStore, sessionId, "1")
+	// get the voucher data based on the input
+	metadata, err := store.GetVoucherData(ctx, userStore, sessionId, inputStr)
 	if err != nil {
 		res.FlagReset = append(res.FlagReset, flag_low_swap_amount, flag_api_call_error)
 		return res, fmt.Errorf("failed to retrieve swap to voucher data: %v", err)
@@ -53,35 +60,27 @@ func (h *MenuHandlers) CalculateMaxPayDebt(ctx context.Context, sym string, inpu
 		return res, nil
 	}
 
-	logg.InfoCtxf(ctx, "Metadata from GetSwapToVoucherData:", "metadata", metadata)
-
-	// Store the active swap_to data
-	if err := store.UpdateSwapToVoucherData(ctx, userStore, sessionId, metadata); err != nil {
-		logg.ErrorCtxf(ctx, "failed on UpdateSwapToVoucherData", "error", err)
-		return res, err
-	}
-
-	swapData, err := store.ReadSwapData(ctx, userStore, sessionId)
-	if err != nil {
-		return res, err
-	}
-
-	// call the api using the ActivePoolAddress, ActiveSwapToAddress as the from (FT), ActiveSwapFromAddress as the to (AT) and PublicKey to get the swap max limit
-	r, err := h.accountService.GetSwapFromTokenMaxLimit(ctx, swapData.ActivePoolAddress, swapData.ActiveSwapToAddress, swapData.ActiveSwapFromAddress, swapData.PublicKey)
+	// Get the max swap limit with the selected voucher
+	r, err := h.accountService.GetSwapFromTokenMaxLimit(ctx, string(activePoolAddress), metadata.TokenAddress, string(activeAddress), string(publicKey))
 	if err != nil {
 		res.FlagSet = append(res.FlagSet, flag_api_call_error)
+		res.Content = "0"
 		logg.ErrorCtxf(ctx, "failed on GetSwapFromTokenMaxLimit", "error", err)
 		return res, nil
 	}
 
-	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(r.Max))
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to write full max amount entry with", "key", storedb.DATA_TEMPORARY_VALUE, "value", r.Max, "error", err)
+	maxLimit := r.Max
+
+	metadata.Balance = maxLimit
+
+	// Store the active swap from data
+	if err := store.UpdateSwapFromVoucherData(ctx, userStore, sessionId, metadata); err != nil {
+		logg.ErrorCtxf(ctx, "failed on UpdateSwapFromVoucherData", "error", err)
 		return res, err
 	}
 
 	// Scale down the amount
-	maxAmountStr := store.ScaleDownBalance(r.Max, swapData.ActiveSwapToDecimal)
+	maxAmountStr := store.ScaleDownBalance(maxLimit, metadata.TokenDecimals)
 	if err != nil {
 		return res, err
 	}
@@ -108,12 +107,32 @@ func (h *MenuHandlers) CalculateMaxPayDebt(ctx context.Context, sym string, inpu
 		return res, err
 	}
 
+	// Do a pool quote to get the max AT that can be removed (gotten)
+	// if we swapped the max of the FT
+
+	// call the API to get the quote
+	qoute, err := h.accountService.GetPoolSwapQuote(ctx, maxLimit, string(publicKey), metadata.TokenAddress, string(activePoolAddress), string(activeAddress))
+	if err != nil {
+		flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
+		res.FlagSet = append(res.FlagSet, flag_api_call_error)
+		res.Content = l.Get("Your request failed. Please try again later.")
+		logg.ErrorCtxf(ctx, "failed on poolSwap", "error", err)
+		return res, nil
+	}
+
+	// Scale down the quoted amount
+	quoteAmountStr := store.ScaleDownBalance(qoute.OutValue, string(activeDecimal))
+
+	// Format to 2 decimal places
+	quoteStr, _ := store.TruncateDecimalString(string(quoteAmountStr), 2)
+
 	res.Content = l.Get(
-		"You can remove a maximum of %s %s from '%s'\n\nEnter amount of %s:",
+		"You can remove a max of %s %s from '%s' pool\nEnter amount of %s:(Max: %s)",
+		quoteStr,
+		string(activeSym),
+		string(activePoolSymbol),
+		metadata.TokenSymbol,
 		maxStr,
-		swapData.ActiveSwapToSym,
-		string(activePoolName),
-		swapData.ActiveSwapToSym,
 	)
 
 	res.FlagReset = append(res.FlagReset, flag_low_swap_amount, flag_api_call_error)
@@ -142,31 +161,48 @@ func (h *MenuHandlers) ConfirmDebtRemoval(ctx context.Context, sym string, input
 
 	userStore := h.userdataStore
 
-	swapData, err := store.ReadSwapPreviewData(ctx, userStore, sessionId)
+	// Fetch session data
+	_, _, activeSym, activeAddress, publicKey, activeDecimal, err := h.getSessionData(ctx, sessionId)
+	if err != nil {
+		return res, nil
+	}
+
+	payDebtVoucher, err := store.ReadSwapFromVoucher(ctx, h.userdataStore, sessionId)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed on ReadSwapFromVoucher", "error", err)
+		return res, err
+	}
+
+	// Resolve active pool
+	activePoolAddress, _, err := h.resolveActivePoolDetails(ctx, sessionId)
 	if err != nil {
 		return res, err
 	}
 
-	maxValue, err := strconv.ParseFloat(swapData.ActiveSwapMaxAmount, 64)
+	swapMaxAmount, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read swapMaxAmount entry with", "key", storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT, "error", err)
+		return res, err
+	}
+
+	maxValue, err := strconv.ParseFloat(string(swapMaxAmount), 64)
 	if err != nil {
 		logg.ErrorCtxf(ctx, "Failed to convert the swapMaxAmount to a float", "error", err)
 		return res, err
 	}
 
 	inputAmount, err := strconv.ParseFloat(inputStr, 64)
-	if err != nil || inputAmount > maxValue {
+	if err != nil || inputAmount > maxValue || inputAmount < 0.1 {
 		res.FlagSet = append(res.FlagSet, flag_invalid_amount)
 		res.Content = inputStr
 		return res, nil
 	}
 
-	storedMax, _ := userStore.ReadEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE)
-
 	var finalAmountStr string
-	if inputStr == swapData.ActiveSwapMaxAmount {
-		finalAmountStr = string(storedMax)
+	if inputStr == string(swapMaxAmount) {
+		finalAmountStr = string(payDebtVoucher.Balance)
 	} else {
-		finalAmountStr, err = store.ParseAndScaleAmount(inputStr, swapData.ActiveSwapToDecimal)
+		finalAmountStr, err = store.ParseAndScaleAmount(inputStr, payDebtVoucher.TokenDecimals)
 		if err != nil {
 			return res, err
 		}
@@ -177,15 +213,9 @@ func (h *MenuHandlers) ConfirmDebtRemoval(ctx context.Context, sym string, input
 		logg.ErrorCtxf(ctx, "failed to write swap amount entry with", "key", storedb.DATA_ACTIVE_SWAP_AMOUNT, "value", finalAmountStr, "error", err)
 		return res, err
 	}
-	// store the user's input amount in the temporary value
-	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(inputStr))
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to write inputStr amount entry with", "key", storedb.DATA_TEMPORARY_VALUE, "value", inputStr, "error", err)
-		return res, err
-	}
 
 	// call the API to get the quote
-	r, err := h.accountService.GetPoolSwapQuote(ctx, finalAmountStr, swapData.PublicKey, swapData.ActiveSwapToAddress, swapData.ActivePoolAddress, swapData.ActiveSwapFromAddress)
+	r, err := h.accountService.GetPoolSwapQuote(ctx, finalAmountStr, string(publicKey), payDebtVoucher.TokenAddress, string(activePoolAddress), string(activeAddress))
 	if err != nil {
 		flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
 		res.FlagSet = append(res.FlagSet, flag_api_call_error)
@@ -194,15 +224,22 @@ func (h *MenuHandlers) ConfirmDebtRemoval(ctx context.Context, sym string, input
 		return res, nil
 	}
 
-	// Scale down the quoted amount
-	quoteAmountStr := store.ScaleDownBalance(r.OutValue, swapData.ActiveSwapFromDecimal)
+	// Scale down the quoted amount (for the AT)
+	quoteAmountStr := store.ScaleDownBalance(r.OutValue, string(activeDecimal))
 
 	// Format to 2 decimal places
 	qouteStr, _ := store.TruncateDecimalString(string(quoteAmountStr), 2)
 
+	// store the quote in the temporary value key
+	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(qouteStr))
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to write swap max amount entry with", "key", storedb.DATA_TEMPORARY_VALUE, "value", qouteStr, "error", err)
+		return res, err
+	}
+
 	res.Content = l.Get(
-		"Please confirm that you will use %s %s to remove your debt of %s %s\n",
-		inputStr, swapData.ActiveSwapToSym, qouteStr, swapData.ActiveSwapFromSym,
+		"Please confirm that you will use %s %s to remove your debt of %s %s\nEnter your PIN:",
+		inputStr, payDebtVoucher.TokenSymbol, qouteStr, string(activeSym),
 	)
 
 	return res, nil
@@ -225,14 +262,21 @@ func (h *MenuHandlers) InitiatePayDebt(ctx context.Context, sym string, input []
 
 	userStore := h.userdataStore
 
+	// Fetch session data
+	_, _, activeSym, activeAddress, publicKey, _, err := h.getSessionData(ctx, sessionId)
+	if err != nil {
+		return res, nil
+	}
+
 	// Resolve active pool
-	_, activePoolName, err := h.resolveActivePoolDetails(ctx, sessionId)
+	activePoolAddress, activePoolSymbol, err := h.resolveActivePoolDetails(ctx, sessionId)
 	if err != nil {
 		return res, err
 	}
 
-	swapData, err := store.ReadSwapPreviewData(ctx, userStore, sessionId)
+	payDebtVoucher, err := store.ReadSwapFromVoucher(ctx, h.userdataStore, sessionId)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed on ReadSwapFromVoucher", "error", err)
 		return res, err
 	}
 
@@ -242,10 +286,16 @@ func (h *MenuHandlers) InitiatePayDebt(ctx context.Context, sym string, input []
 		return res, err
 	}
 
+	debtQuotedAmount, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read debtQuotedAmount entry with", "key", storedb.DATA_TEMPORARY_VALUE, "error", err)
+		return res, err
+	}
+
 	swapAmountStr := string(swapAmount)
 
 	// Call the poolSwap API
-	r, err := h.accountService.PoolSwap(ctx, swapAmountStr, swapData.PublicKey, swapData.ActiveSwapToAddress, swapData.ActivePoolAddress, swapData.ActiveSwapFromAddress)
+	r, err := h.accountService.PoolSwap(ctx, swapAmountStr, string(publicKey), payDebtVoucher.TokenAddress, string(activePoolAddress), string(activeAddress))
 	if err != nil {
 		flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
 		res.FlagSet = append(res.FlagSet, flag_api_call_error)
@@ -259,9 +309,9 @@ func (h *MenuHandlers) InitiatePayDebt(ctx context.Context, sym string, input []
 
 	res.Content = l.Get(
 		"Your request has been sent. You will receive an SMS when your debt of %s %s has been removed from %s.",
-		swapData.TemporaryValue,
-		swapData.ActiveSwapToSym,
-		activePoolName,
+		string(debtQuotedAmount),
+		string(activeSym),
+		activePoolSymbol,
 	)
 
 	res.FlagReset = append(res.FlagReset, flag_account_authorized)
@@ -269,7 +319,7 @@ func (h *MenuHandlers) InitiatePayDebt(ctx context.Context, sym string, input []
 }
 
 func isStableVoucher(tokenAddress string) bool {
-	addr := strings.ToLower(strings.TrimSpace(tokenAddress))
+	addr := strings.TrimSpace(tokenAddress)
 	for _, stable := range config.StableVoucherAddresses() {
 		if addr == stable {
 			return true

handlers/application/pool_deposit.go

@@ -12,8 +12,8 @@ import (
 	"gopkg.in/leonelquinteros/gotext.v1"
 )
 
-// GetPoolDepositVouchers returns a list of stable coins
-func (h *MenuHandlers) GetPoolDepositVouchers(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+// GetOrderedVouchers returns a list of ordered vouchers with stables at the top
+func (h *MenuHandlers) GetOrderedVouchers(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
@@ -26,10 +26,10 @@ func (h *MenuHandlers) GetPoolDepositVouchers(ctx context.Context, sym string, i
 
 	userStore := h.userdataStore
 
-	// Read stable vouchers from the store
-	voucherData, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_STABLE_VOUCHER_SYMBOLS)
+	// Read ordered vouchers from the store
+	voucherData, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ORDERED_VOUCHER_SYMBOLS)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read stable voucherData entires with", "key", storedb.DATA_STABLE_VOUCHER_SYMBOLS, "error", err)
+		logg.ErrorCtxf(ctx, "failed to read stable voucherData entires with", "key", storedb.DATA_ORDERED_VOUCHER_SYMBOLS, "error", err)
 		return res, err
 	}
 
@@ -37,9 +37,9 @@ func (h *MenuHandlers) GetPoolDepositVouchers(ctx context.Context, sym string, i
 		return res, nil
 	}
 
-	voucherBalances, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_STABLE_VOUCHER_BALANCES)
+	voucherBalances, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ORDERED_VOUCHER_BALANCES)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read stable voucherData entires with", "key", storedb.DATA_STABLE_VOUCHER_BALANCES, "error", err)
+		logg.ErrorCtxf(ctx, "failed to read stable voucherData entires with", "key", storedb.DATA_ORDERED_VOUCHER_BALANCES, "error", err)
 		return res, err
 	}
 
@@ -73,7 +73,7 @@ func (h *MenuHandlers) PoolDepositMaxAmount(ctx context.Context, sym string, inp
 	}
 
 	userStore := h.userdataStore
-	metadata, err := store.GetStableVoucherData(ctx, userStore, sessionId, inputStr)
+	metadata, err := store.GetOrderedVoucherData(ctx, userStore, sessionId, inputStr)
 	if err != nil {
 		return res, fmt.Errorf("failed to retrieve swap to voucher data: %v", err)
 	}
@@ -83,8 +83,8 @@ func (h *MenuHandlers) PoolDepositMaxAmount(ctx context.Context, sym string, inp
 	}
 
 	// Store the pool deposit voucher data
-	if err := store.StoreTemporaryVoucher(ctx, h.userdataStore, sessionId, metadata); err != nil {
-		logg.ErrorCtxf(ctx, "failed on StoreTemporaryVoucher", "error", err)
+	if err := store.StoreTransactionVoucher(ctx, h.userdataStore, sessionId, metadata); err != nil {
+		logg.ErrorCtxf(ctx, "failed on StoreTransactionVoucher", "error", err)
 		return res, err
 	}
 
@@ -119,9 +119,9 @@ func (h *MenuHandlers) ConfirmPoolDeposit(ctx context.Context, sym string, input
 
 	userStore := h.userdataStore
 
-	poolDepositVoucher, err := store.GetTemporaryVoucherData(ctx, h.userdataStore, sessionId)
+	poolDepositVoucher, err := store.GetTransactionVoucherData(ctx, h.userdataStore, sessionId)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed on GetTemporaryVoucherData", "error", err)
+		logg.ErrorCtxf(ctx, "failed on GetTransactionVoucherData", "error", err)
 		return res, err
 	}
 
@@ -145,14 +145,14 @@ func (h *MenuHandlers) ConfirmPoolDeposit(ctx context.Context, sym string, input
 	}
 
 	// Resolve active pool
-	_, activePoolName, err := h.resolveActivePoolDetails(ctx, sessionId)
+	_, activePoolSymbol, err := h.resolveActivePoolDetails(ctx, sessionId)
 	if err != nil {
 		return res, err
 	}
 
 	res.Content = l.Get(
 		"You will deposit %s %s into %s\n",
-		inputStr, poolDepositVoucher.TokenSymbol, activePoolName,
+		inputStr, poolDepositVoucher.TokenSymbol, activePoolSymbol,
 	)
 
 	return res, nil
@@ -173,30 +173,41 @@ func (h *MenuHandlers) InitiatePoolDeposit(ctx context.Context, sym string, inpu
 	l := gotext.NewLocale(translationDir, code)
 	l.AddDomain("default")
 
+	userStore := h.userdataStore
+
 	// Resolve active pool
-	activePoolAddress, activePoolName, err := h.resolveActivePoolDetails(ctx, sessionId)
+	activePoolAddress, activePoolSymbol, err := h.resolveActivePoolDetails(ctx, sessionId)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed on resolveActivePoolDetails", "error", err)
 		return res, err
 	}
 
-	poolDepositVoucher, err := store.GetTemporaryVoucherData(ctx, h.userdataStore, sessionId)
+	poolDepositVoucher, err := store.GetTransactionVoucherData(ctx, h.userdataStore, sessionId)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed on GetTemporaryVoucherData", "error", err)
+		logg.ErrorCtxf(ctx, "failed on GetTransactionVoucherData", "error", err)
 		return res, err
 	}
 
-	poolDepositdata, err := store.ReadTransactionData(ctx, h.userdataStore, sessionId)
+	publicKey, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read publicKey entry", "key", storedb.DATA_PUBLIC_KEY, "error", err)
 		return res, err
 	}
 
-	finalAmountStr, err := store.ParseAndScaleAmount(poolDepositdata.Amount, poolDepositVoucher.TokenDecimals)
+	amount, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_AMOUNT)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read amount entry", "key", storedb.DATA_AMOUNT, "error", err)
 		return res, err
 	}
 
-	// Call pool deposit API
-	r, err := h.accountService.PoolDeposit(ctx, finalAmountStr, poolDepositdata.PublicKey, string(activePoolAddress), poolDepositVoucher.TokenAddress)
+	finalAmountStr, err := store.ParseAndScaleAmount(string(amount), poolDepositVoucher.TokenDecimals)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed on ParseAndScaleAmount", "error", err)
+		return res, err
+	}
+
+	// Call token transfer API and send the token to the pool address
+	r, err := h.accountService.TokenTransfer(ctx, finalAmountStr, string(publicKey), string(activePoolAddress), poolDepositVoucher.TokenAddress)
 	if err != nil {
 		flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
 		res.FlagSet = append(res.FlagSet, flag_api_call_error)
@@ -210,9 +221,9 @@ func (h *MenuHandlers) InitiatePoolDeposit(ctx context.Context, sym string, inpu
 
 	res.Content = l.Get(
 		"Your request has been sent. You will receive an SMS when %s %s has been deposited into %s.",
-		poolDepositdata.Amount,
+		string(amount),
 		poolDepositVoucher.TokenSymbol,
-		activePoolName,
+		activePoolSymbol,
 	)
 
 	res.FlagReset = append(res.FlagReset, flag_account_authorized)

handlers/application/pools.go

@@ -3,6 +3,7 @@ package application
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/resource"
@@ -104,6 +105,7 @@ func (h *MenuHandlers) GetDefaultPool(ctx context.Context, sym string, input []b
 
 // ViewPool retrieves the pool details from the user store
 // and displays it to the user for them to select it.
+// if the data does not exist, it calls the API to get the pool details
 func (h *MenuHandlers) ViewPool(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	sessionId, ok := ctx.Value("SessionId").(string)
@@ -131,8 +133,11 @@ func (h *MenuHandlers) ViewPool(ctx context.Context, sym string, input []byte) (
 	if poolData == nil {
 		flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
 
+		// convert to uppercase before the call
+		poolSymbol := strings.ToUpper(inputStr)
+
 		// no match found. Call the API using the inputStr as the symbol
-		poolResp, err := h.accountService.RetrievePoolDetails(ctx, inputStr)
+		poolResp, err := h.accountService.RetrievePoolDetails(ctx, poolSymbol)
 		if err != nil {
 			res.FlagSet = append(res.FlagSet, flag_api_call_error)
 			return res, nil

handlers/application/poolswap.go

@@ -175,6 +175,10 @@ func (h *MenuHandlers) SwapMaxLimit(ctx context.Context, sym string, input []byt
 		return res, nil
 	}
 
+	code := codeFromCtx(ctx)
+	l := gotext.NewLocale(translationDir, code)
+	l.AddDomain("default")
+
 	userStore := h.userdataStore
 	metadata, err := store.GetSwapToVoucherData(ctx, userStore, sessionId, inputStr)
 	if err != nil {
@@ -235,9 +239,9 @@ func (h *MenuHandlers) SwapMaxLimit(ctx context.Context, sym string, input []byt
 		return res, err
 	}
 
-	res.Content = fmt.Sprintf(
-		"Maximum: %s\n\nEnter amount of %s to swap for %s:",
-		maxStr, swapData.ActiveSwapFromSym, swapData.ActiveSwapToSym,
+	res.Content = l.Get(
+		"Maximum: %s %s\n\nEnter amount of %s to swap for %s:",
+		maxStr, swapData.ActiveSwapFromSym, swapData.ActiveSwapFromSym, swapData.ActiveSwapToSym,
 	)
 
 	return res, nil
@@ -323,8 +327,8 @@ func (h *MenuHandlers) SwapPreview(ctx context.Context, sym string, input []byte
 	// Format to 2 decimal places
 	qouteStr, _ := store.TruncateDecimalString(string(quoteAmountStr), 2)
 
-	res.Content = fmt.Sprintf(
-		"You will swap:\n%s %s for %s %s:",
+	res.Content = l.Get(
+		"You will swap %s %s for %s %s:",
 		inputStr, swapData.ActiveSwapFromSym, qouteStr, swapData.ActiveSwapToSym,
 	)
 

handlers/application/send.go

@@ -48,10 +48,10 @@ func (h *MenuHandlers) ValidateRecipient(ctx context.Context, sym string, input
 		return res, nil
 	}
 
-	// save the recipient as the temporaryRecipient
-	err = store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(recipient))
+	// save the recipient under recipient input
+	err = store.WriteEntry(ctx, sessionId, storedb.DATA_RECIPIENT_INPUT, []byte(recipient))
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to write temporaryRecipient entry with", "key", storedb.DATA_TEMPORARY_VALUE, "value", recipient, "error", err)
+		logg.ErrorCtxf(ctx, "failed to write recipient input entry with", "key", storedb.DATA_RECIPIENT_INPUT, "value", recipient, "error", err)
 		return res, err
 	}
 
@@ -203,11 +203,11 @@ func (h *MenuHandlers) determineAndSaveTransactionType(
 	publicKey []byte,
 	recipientPhoneNumber []byte,
 ) error {
-	store := h.userdataStore
+	userStore := h.userdataStore
 	txType := "swap"
 
 	// Read sender's active address
-	senderActiveAddress, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_ADDRESS)
+	senderActiveAddress, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_ADDRESS)
 	if err != nil {
 		logg.ErrorCtxf(ctx, "Failed to read sender active address", "error", err)
 		return err
@@ -215,7 +215,7 @@ func (h *MenuHandlers) determineAndSaveTransactionType(
 
 	var recipientActiveAddress []byte
 	if recipientPhoneNumber != nil {
-		recipientActiveAddress, _ = store.ReadEntry(ctx, string(recipientPhoneNumber), storedb.DATA_ACTIVE_ADDRESS)
+		recipientActiveAddress, _ = userStore.ReadEntry(ctx, string(recipientPhoneNumber), storedb.DATA_ACTIVE_ADDRESS)
 	}
 
 	// recipient has no active token → normal transaction
@@ -227,17 +227,34 @@ func (h *MenuHandlers) determineAndSaveTransactionType(
 	}
 
 	// Save the transaction type
-	if err := store.WriteEntry(ctx, sessionId, storedb.DATA_SEND_TRANSACTION_TYPE, []byte(txType)); err != nil {
+	if err := userStore.WriteEntry(ctx, sessionId, storedb.DATA_SEND_TRANSACTION_TYPE, []byte(txType)); err != nil {
 		logg.ErrorCtxf(ctx, "Failed to write transaction type", "type", txType, "error", err)
 		return err
 	}
 
 	// Save the recipient's phone number only if it exists
 	if recipientPhoneNumber != nil {
-		if err := store.WriteEntry(ctx, sessionId, storedb.DATA_RECIPIENT_PHONE_NUMBER, recipientPhoneNumber); err != nil {
+		if err := userStore.WriteEntry(ctx, sessionId, storedb.DATA_RECIPIENT_PHONE_NUMBER, recipientPhoneNumber); err != nil {
 			logg.ErrorCtxf(ctx, "Failed to write recipient phone number", "type", txType, "error", err)
 			return err
 		}
+
+		// fetch data for use (to_voucher data)
+		recipientActiveSym, recipientActiveAddress, recipientActiveDecimal, err := h.getRecipientData(ctx, string(recipientPhoneNumber))
+		if err != nil {
+			return err
+		}
+		swapMetadata := &dataserviceapi.TokenHoldings{
+			TokenAddress:  string(recipientActiveAddress),
+			TokenSymbol:   string(recipientActiveSym),
+			TokenDecimals: string(recipientActiveDecimal),
+		}
+
+		// Store the active swap_to data
+		if err := store.UpdateSwapToVoucherData(ctx, userStore, sessionId, swapMetadata); err != nil {
+			logg.ErrorCtxf(ctx, "failed on UpdateSwapToVoucherData", "error", err)
+			return err
+		}
 	} else {
 		logg.InfoCtxf(ctx, "No recipient phone number found for public key", "publicKey", string(publicKey))
 	}
@@ -309,6 +326,7 @@ func (h *MenuHandlers) ResetTransactionAmount(ctx context.Context, sym string, i
 }
 
 // MaxAmount checks the transaction type to determine the displayed max amount.
+// Checks whether the user selected a custom voucher
 // If the transaction type is "swap", it checks the max swappable amount and sets this as the content.
 // If the transaction type is "normal", gets the current sender's balance from the store and sets it as
 // the result content.
@@ -334,9 +352,54 @@ func (h *MenuHandlers) MaxAmount(ctx context.Context, sym string, input []byte)
 		return res, err
 	}
 
+	customVoucherSelection, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_TRANSACTION_CUSTOM_VOUCHER_STATE)
+	if err == nil {
+		customVoucherValue, _ := strconv.ParseUint(string(customVoucherSelection), 0, 64)
+		if customVoucherValue == 1 {
+			// use the custom voucher
+			customTransactionVoucher, err := store.GetTransactionVoucherData(ctx, h.userdataStore, sessionId)
+			if err != nil {
+				logg.ErrorCtxf(ctx, "failed on GetTransactionVoucherData", "error", err)
+				return res, err
+			}
+
+			activeSym = []byte(customTransactionVoucher.TokenSymbol)
+			activeBal = []byte(customTransactionVoucher.Balance)
+			activeDecimal = []byte(customTransactionVoucher.TokenDecimals)
+			activeAddress = []byte(customTransactionVoucher.TokenAddress)
+		}
+	}
+
 	// 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)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "Failed to read recipient's address", "error", err)
+		return res, err
+	}
+	if string(recipientAddress) == config.DefaultMpesaAddress() && isStableVoucher(string(activeAddress)) {
+		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")
+	} else {
+		transactionType = []byte("swap")
+	}
+
 	// If normal transaction return balance
 	if string(transactionType) == "normal" {
 		res.FlagReset = append(res.FlagReset, flag_swap_transaction)
@@ -364,12 +427,15 @@ func (h *MenuHandlers) MaxAmount(ctx context.Context, sym string, input []byte)
 		return res, nil
 	}
 
-	// Get the recipient's phone number to read other data items
+	// Get the recipient's phone number to read other data items (*)
 	recipientPhoneNumber, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_RECIPIENT_PHONE_NUMBER)
-	if err != nil {
-		// invalid state
-		return res, err
+	if err != nil || !phone.IsValidPhoneNumber(string(recipientPhoneNumber)) {
+		// revert to normal transaction
+		res.FlagReset = append(res.FlagReset, flag_swap_transaction)
+		res.Content = l.Get("Maximum amount: %s %s\nEnter amount:", formattedBalance, string(activeSym))
+		return res, nil
 	}
+
 	recipientActiveSym, recipientActiveAddress, recipientActiveDecimal, err := h.getRecipientData(ctx, string(recipientPhoneNumber))
 	if err != nil {
 		return res, err
@@ -479,7 +545,7 @@ func (h *MenuHandlers) getRecipientData(ctx context.Context, sessionId string) (
 	return
 }
 
-func (h *MenuHandlers) resolveActivePoolDetails(ctx context.Context, sessionId string) (defaultPoolAddress, defaultPoolName []byte, err error) {
+func (h *MenuHandlers) resolveActivePoolDetails(ctx context.Context, sessionId string) (defaultPoolAddress, defaultPoolSymbol []byte, err error) {
 	store := h.userdataStore
 
 	// Try read address
@@ -489,21 +555,21 @@ func (h *MenuHandlers) resolveActivePoolDetails(ctx context.Context, sessionId s
 		return nil, nil, err
 	}
 
-	// Try read name
-	defaultPoolName, err = store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_POOL_NAME)
+	// Try read symbol
+	defaultPoolSymbol, err = store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_POOL_SYM)
 	if err != nil && !db.IsNotFound(err) {
 		logg.ErrorCtxf(ctx, "failed to read active pool name", "error", err)
 		return nil, nil, err
 	}
 
 	// If both exist, return them
-	if defaultPoolAddress != nil && defaultPoolName != nil {
-		return defaultPoolAddress, defaultPoolName, nil
+	if defaultPoolAddress != nil && defaultPoolSymbol != nil {
+		return defaultPoolAddress, defaultPoolSymbol, nil
 	}
 
 	// Fallback to config defaults
 	defaultPoolAddress = []byte(config.DefaultPoolAddress())
-	defaultPoolName = []byte(config.DefaultPoolName())
+	defaultPoolSymbol = []byte(config.DefaultPoolSymbol())
 
 	if err := store.WriteEntry(
 		ctx,
@@ -518,14 +584,14 @@ func (h *MenuHandlers) resolveActivePoolDetails(ctx context.Context, sessionId s
 	if err := store.WriteEntry(
 		ctx,
 		sessionId,
-		storedb.DATA_ACTIVE_POOL_NAME,
-		defaultPoolName,
+		storedb.DATA_ACTIVE_POOL_SYM,
+		defaultPoolSymbol,
 	); err != nil {
-		logg.ErrorCtxf(ctx, "failed to write default pool name", "error", err)
+		logg.ErrorCtxf(ctx, "failed to write default pool symbol", "error", err)
 		return nil, nil, err
 	}
 
-	return defaultPoolAddress, defaultPoolName, nil
+	return defaultPoolAddress, defaultPoolSymbol, nil
 }
 
 func (h *MenuHandlers) calculateSendCreditLimits(ctx context.Context, poolAddress, fromAddress, toAddress, publicKey, fromDecimal, toDecimal []byte) (string, string, error) {
@@ -560,9 +626,14 @@ func (h *MenuHandlers) ValidateAmount(ctx context.Context, sym string, input []b
 		return res, fmt.Errorf("missing session")
 	}
 	flag_invalid_amount, _ := h.flagManager.GetFlag("flag_invalid_amount")
-	userStore := h.userdataStore
 
-	var balanceValue float64
+	inputStr := string(input)
+	if inputStr == "0" {
+		res.FlagReset = append(res.FlagReset, flag_invalid_amount)
+		return res, nil
+	}
+
+	userStore := h.userdataStore
 
 	// retrieve the active balance
 	activeBal, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_BAL)
@@ -570,32 +641,40 @@ func (h *MenuHandlers) ValidateAmount(ctx context.Context, sym string, input []b
 		logg.ErrorCtxf(ctx, "failed to read activeBal entry with", "key", storedb.DATA_ACTIVE_BAL, "error", err)
 		return res, err
 	}
-	balanceValue, err = strconv.ParseFloat(string(activeBal), 64)
+
+	customVoucherSelection, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_TRANSACTION_CUSTOM_VOUCHER_STATE)
+	if err == nil {
+		customVoucherValue, _ := strconv.ParseUint(string(customVoucherSelection), 0, 64)
+		if customVoucherValue == 1 {
+			// use the custom voucher
+			customTransactionVoucher, err := store.GetTransactionVoucherData(ctx, h.userdataStore, sessionId)
+			if err != nil {
+				logg.ErrorCtxf(ctx, "failed on GetTransactionVoucherData", "error", err)
+				return res, err
+			}
+
+			activeBal = []byte(customTransactionVoucher.Balance)
+		}
+	}
+
+	maxValue, err := strconv.ParseFloat(string(activeBal), 64)
 	if err != nil {
 		logg.ErrorCtxf(ctx, "Failed to convert the activeBal to a float", "error", err)
 		return res, err
 	}
 
-	// Extract numeric part from the input amount
-	amountStr := strings.TrimSpace(string(input))
-	inputAmount, err := strconv.ParseFloat(amountStr, 64)
-	if err != nil {
+	inputAmount, err := strconv.ParseFloat(inputStr, 64)
+	if err != nil || inputAmount > maxValue || inputAmount < 0.1 {
 		res.FlagSet = append(res.FlagSet, flag_invalid_amount)
-		res.Content = amountStr
-		return res, nil
-	}
-
-	if inputAmount > balanceValue || inputAmount < 0.1{
-		res.FlagSet = append(res.FlagSet, flag_invalid_amount)
-		res.Content = amountStr
+		res.Content = inputStr
 		return res, nil
 	}
 
 	// Format the amount to 2 decimal places before saving (truncated)
-	formattedAmount, err := store.TruncateDecimalString(amountStr, 2)
+	formattedAmount, err := store.TruncateDecimalString(inputStr, 2)
 	if err != nil {
 		res.FlagSet = append(res.FlagSet, flag_invalid_amount)
-		res.Content = amountStr
+		res.Content = inputStr
 		return res, nil
 	}
 
@@ -667,8 +746,62 @@ func (h *MenuHandlers) GetAmount(ctx context.Context, sym string, input []byte)
 	return res, nil
 }
 
-// InitiateTransaction calls the TokenTransfer and returns a confirmation based on the result.
-func (h *MenuHandlers) InitiateTransaction(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+// NormalTransactionPreview displays the token transfer preview awaiting authorization
+func (h *MenuHandlers) NormalTransactionPreview(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	// Input in RAT
+	inputStr := string(input)
+	if inputStr == "0" {
+		return res, nil
+	}
+
+	code := codeFromCtx(ctx)
+	l := gotext.NewLocale(translationDir, code)
+	l.AddDomain("default")
+
+	userStore := h.userdataStore
+
+	data, err := store.ReadTransactionData(ctx, h.userdataStore, sessionId)
+	if err != nil {
+		return res, err
+	}
+
+	customVoucherSelection, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_TRANSACTION_CUSTOM_VOUCHER_STATE)
+	if err == nil {
+		customVoucherValue, _ := strconv.ParseUint(string(customVoucherSelection), 0, 64)
+		if customVoucherValue == 1 {
+			// use the custom voucher
+			customTransactionVoucher, err := store.GetTransactionVoucherData(ctx, h.userdataStore, sessionId)
+			if err != nil {
+				logg.ErrorCtxf(ctx, "failed on GetTransactionVoucherData", "error", err)
+				return res, err
+			}
+
+			data.ActiveSym = customTransactionVoucher.TokenSymbol
+			data.ActiveDecimal = customTransactionVoucher.TokenDecimals
+			data.ActiveAddress = customTransactionVoucher.TokenAddress
+		}
+	}
+
+	res.Content = l.Get(
+		"%s will receive %s %s from %s",
+		data.RecipientInput,
+		data.Amount,
+		data.ActiveSym,
+		sessionId,
+	)
+
+	return res, nil
+}
+
+// InitiateNormalTransaction calls the TokenTransfer and returns a confirmation based on the result.
+// used for non-swap transactions
+func (h *MenuHandlers) InitiateNormalTransaction(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	var err error
 	sessionId, ok := ctx.Value("SessionId").(string)
@@ -678,6 +811,8 @@ func (h *MenuHandlers) InitiateTransaction(ctx context.Context, sym string, inpu
 
 	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
 
+	userStore := h.userdataStore
+
 	code := codeFromCtx(ctx)
 	l := gotext.NewLocale(translationDir, code)
 	l.AddDomain("default")
@@ -687,6 +822,23 @@ func (h *MenuHandlers) InitiateTransaction(ctx context.Context, sym string, inpu
 		return res, err
 	}
 
+	customVoucherSelection, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_TRANSACTION_CUSTOM_VOUCHER_STATE)
+	if err == nil {
+		customVoucherValue, _ := strconv.ParseUint(string(customVoucherSelection), 0, 64)
+		if customVoucherValue == 1 {
+			// use the custom voucher
+			customTransactionVoucher, err := store.GetTransactionVoucherData(ctx, h.userdataStore, sessionId)
+			if err != nil {
+				logg.ErrorCtxf(ctx, "failed on GetTransactionVoucherData", "error", err)
+				return res, err
+			}
+
+			data.ActiveSym = customTransactionVoucher.TokenSymbol
+			data.ActiveDecimal = customTransactionVoucher.TokenDecimals
+			data.ActiveAddress = customTransactionVoucher.TokenAddress
+		}
+	}
+
 	finalAmountStr, err := store.ParseAndScaleAmount(data.Amount, data.ActiveDecimal)
 	if err != nil {
 		return res, err
@@ -718,7 +870,7 @@ func (h *MenuHandlers) InitiateTransaction(ctx context.Context, sym string, inpu
 
 	res.Content = l.Get(
 		"Your request has been sent. %s will receive %s %s from %s.",
-		data.TemporaryValue,
+		data.RecipientInput,
 		data.Amount,
 		data.ActiveSym,
 		sessionId,
@@ -750,19 +902,40 @@ func (h *MenuHandlers) TransactionSwapPreview(ctx context.Context, sym string, i
 
 	userStore := h.userdataStore
 
-	recipientPhoneNumber, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_RECIPIENT_PHONE_NUMBER)
+	// the initial recipient that the sender input
+	recipientInput, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_RECIPIENT_INPUT)
 	if err != nil {
 		// invalid state
 		return res, err
 	}
 
-	swapData, err := store.ReadSwapPreviewData(ctx, userStore, sessionId)
+	// Resolve active pool
+	activePoolAddress, _, err := h.resolveActivePoolDetails(ctx, sessionId)
 	if err != nil {
 		return res, err
 	}
 
+	// get the selected voucher
+	selectedVoucher, err := store.GetTransactionVoucherData(ctx, h.userdataStore, sessionId)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed on GetTransactionVoucherData", "error", err)
+		return res, err
+	}
+
+	swapToVoucher, err := store.ReadSwapToVoucher(ctx, h.userdataStore, sessionId)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed on ReadSwapFromVoucher", "error", err)
+		return res, err
+	}
+
+	swapMaxAmount, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read swapMaxAmount entry with", "key", storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT, "error", err)
+		return res, err
+	}
+
 	// use the stored max RAT
-	maxRATValue, err := strconv.ParseFloat(swapData.ActiveSwapMaxAmount, 64)
+	maxRATValue, err := strconv.ParseFloat(string(swapMaxAmount), 64)
 	if err != nil {
 		logg.ErrorCtxf(ctx, "Failed to convert the swapMaxAmount to a float", "error", err)
 		return res, err
@@ -783,13 +956,13 @@ func (h *MenuHandlers) TransactionSwapPreview(ctx context.Context, sym string, i
 		return res, nil
 	}
 
-	finalAmountStr, err := store.ParseAndScaleAmount(formattedAmount, swapData.ActiveSwapToDecimal)
+	finalAmountStr, err := store.ParseAndScaleAmount(formattedAmount, swapToVoucher.TokenDecimals)
 	if err != nil {
 		return res, err
 	}
 
 	// call the credit send API to get the reverse quote
-	r, err := h.accountService.GetCreditSendReverseQuote(ctx, swapData.ActivePoolAddress, swapData.ActiveSwapFromAddress, swapData.ActiveSwapToAddress, finalAmountStr)
+	r, err := h.accountService.GetCreditSendReverseQuote(ctx, string(activePoolAddress), selectedVoucher.TokenAddress, swapToVoucher.TokenAddress, finalAmountStr)
 	if err != nil {
 		flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
 		res.FlagSet = append(res.FlagSet, flag_api_call_error)
@@ -799,25 +972,18 @@ func (h *MenuHandlers) TransactionSwapPreview(ctx context.Context, sym string, i
 	}
 
 	sendInputAmount := r.InputAmount // amount of SAT that should be swapped
-	sendOutputAmount := r.OutputAmount // amount of RAT that will be received
 
-	// store the sendOutputAmount as the final amount (that will be sent)
-	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_AMOUNT, []byte(sendOutputAmount))
+	// store the finalAmountStr as the final amount (that will be sent after the swap)
+	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_AMOUNT, []byte(finalAmountStr))
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to write output amount value entry with", "key", storedb.DATA_AMOUNT, "value", sendOutputAmount, "error", err)
+		logg.ErrorCtxf(ctx, "failed to write output amount value entry with", "key", storedb.DATA_AMOUNT, "value", finalAmountStr, "error", err)
 		return res, err
 	}
 
-	// Scale down the quoted output amount
-	quoteAmountStr := store.ScaleDownBalance(sendOutputAmount, swapData.ActiveSwapToDecimal)
-
-	// Format the qouteAmount amount to 2 decimal places
-	qouteAmount, _ := store.TruncateDecimalString(quoteAmountStr, 2)
-
 	// store the qouteAmount in the temporary value
-	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(qouteAmount))
+	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(inputStr))
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to write temporary qouteAmount entry with", "key", storedb.DATA_TEMPORARY_VALUE, "value", qouteAmount, "error", err)
+		logg.ErrorCtxf(ctx, "failed to write temporary inputStr entry with", "key", storedb.DATA_TEMPORARY_VALUE, "value", inputStr, "error", err)
 		return res, err
 	}
 
@@ -830,7 +996,9 @@ func (h *MenuHandlers) TransactionSwapPreview(ctx context.Context, sym string, i
 
 	res.Content = l.Get(
 		"%s will receive %s %s",
-		string(recipientPhoneNumber), qouteAmount, swapData.ActiveSwapToSym,
+		string(recipientInput),
+		inputStr,
+		swapToVoucher.TokenSymbol,
 	)
 
 	return res, nil
@@ -854,11 +1022,37 @@ func (h *MenuHandlers) TransactionInitiateSwap(ctx context.Context, sym string,
 
 	userStore := h.userdataStore
 
-	swapData, err := store.ReadSwapPreviewData(ctx, userStore, sessionId)
+	// Resolve active pool
+	activePoolAddress, _, err := h.resolveActivePoolDetails(ctx, sessionId)
 	if err != nil {
 		return res, err
 	}
 
+	// get the selected voucher
+	selectedVoucher, err := store.GetTransactionVoucherData(ctx, h.userdataStore, sessionId)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed on GetTransactionVoucherData", "error", err)
+		return res, err
+	}
+
+	publicKey, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read publicKey entry", "key", storedb.DATA_PUBLIC_KEY, "error", err)
+		return res, err
+	}
+
+	swapToVoucher, err := store.ReadSwapToVoucher(ctx, h.userdataStore, sessionId)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed on ReadSwapFromVoucher", "error", err)
+		return res, err
+	}
+
+	quotedAmount, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read quotedAmount entry with", "key", storedb.DATA_TEMPORARY_VALUE, "error", err)
+		return res, err
+	}
+
 	swapAmount, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SWAP_AMOUNT)
 	if err != nil {
 		logg.ErrorCtxf(ctx, "failed to read swapAmount entry with", "key", storedb.DATA_ACTIVE_SWAP_AMOUNT, "error", err)
@@ -868,7 +1062,7 @@ func (h *MenuHandlers) TransactionInitiateSwap(ctx context.Context, sym string,
 	swapAmountStr := string(swapAmount)
 
 	// Call the poolSwap API
-	poolSwap, err := h.accountService.PoolSwap(ctx, swapAmountStr, swapData.PublicKey, swapData.ActiveSwapFromAddress, swapData.ActivePoolAddress, swapData.ActiveSwapToAddress)
+	poolSwap, err := h.accountService.PoolSwap(ctx, swapAmountStr, string(publicKey), selectedVoucher.TokenAddress, string(activePoolAddress), swapToVoucher.TokenAddress)
 	if err != nil {
 		flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
 		res.FlagSet = append(res.FlagSet, flag_api_call_error)
@@ -889,7 +1083,7 @@ func (h *MenuHandlers) TransactionInitiateSwap(ctx context.Context, sym string,
 		logg.ErrorCtxf(ctx, "failed to read swapAmount entry with", "key", storedb.DATA_ACTIVE_SWAP_AMOUNT, "error", err)
 		return res, err
 	}
-	recipientPhoneNumber, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_RECIPIENT_PHONE_NUMBER)
+	recipientInput, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_RECIPIENT_INPUT)
 	if err != nil {
 		// invalid state
 		return res, err
@@ -903,7 +1097,7 @@ func (h *MenuHandlers) TransactionInitiateSwap(ctx context.Context, sym string,
 	}
 
 	// Call TokenTransfer with the expected swap amount
-	tokenTransfer, err := h.accountService.TokenTransfer(ctx, string(amount), swapData.PublicKey, string(recipientPublicKey), swapData.ActiveSwapToAddress)
+	tokenTransfer, err := h.accountService.TokenTransfer(ctx, string(amount), string(publicKey), string(recipientPublicKey), swapToVoucher.TokenAddress)
 	if err != nil {
 		flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
 		res.FlagSet = append(res.FlagSet, flag_api_call_error)
@@ -917,9 +1111,9 @@ func (h *MenuHandlers) TransactionInitiateSwap(ctx context.Context, sym string,
 
 	res.Content = l.Get(
 		"Your request has been sent. %s will receive %s %s from %s.",
-		string(recipientPhoneNumber),
-		swapData.TemporaryValue,
-		swapData.ActiveSwapToSym,
+		string(recipientInput),
+		string(quotedAmount),
+		swapToVoucher.TokenSymbol,
 		sessionId,
 	)
 
@@ -932,10 +1126,11 @@ func (h *MenuHandlers) ClearTransactionTypeFlag(ctx context.Context, sym string,
 	var res resource.Result
 
 	flag_swap_transaction, _ := h.flagManager.GetFlag("flag_swap_transaction")
+	flag_multiple_voucher, _ := h.flagManager.GetFlag("flag_multiple_voucher")
 
 	inputStr := string(input)
 	if inputStr == "0" {
-		res.FlagReset = append(res.FlagReset, flag_swap_transaction)
+		res.FlagReset = append(res.FlagReset, flag_swap_transaction, flag_multiple_voucher)
 		return res, nil
 	}
 

handlers/application/send_test.go

@@ -452,7 +452,7 @@ func TestGetAmount(t *testing.T) {
 	assert.Equal(t, formattedAmount, res.Content)
 }
 
-func TestInitiateTransaction(t *testing.T) {
+func TestInitiateNormalTransaction(t *testing.T) {
 	sessionId := "254712345678"
 	ctx, store := InitializeTestStore(t)
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
@@ -538,7 +538,7 @@ func TestInitiateTransaction(t *testing.T) {
 			mockAccountService.On("TokenTransfer").Return(tt.TransferResponse, nil)
 
 			// Call the method under test
-			res, _ := h.InitiateTransaction(ctx, "transaction_reset_amount", []byte(""))
+			res, _ := h.InitiateNormalTransaction(ctx, "transaction_reset_amount", []byte(""))
 
 			// Assert that no errors occurred
 			assert.NoError(t, err)

handlers/application/vouchers.go

@@ -3,10 +3,12 @@ package application
 import (
 	"context"
 	"fmt"
+	"sort"
 	"strings"
 
 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/resource"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
@@ -15,8 +17,8 @@ import (
 
 // ManageVouchers retrieves the token holdings from the API using the "PublicKey" and
 // 1. sets the first as the default voucher if no active voucher is set.
-// 2. Stores list of vouchers
-// 3. Stores list of filtered stable vouchers
+// 2. Stores list of filtered ordered vouchers (exclude the active voucher)
+// 3. Stores list of  ordered vouchers (all vouchers)
 // 4. updates the balance of the active voucher
 func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
@@ -30,7 +32,7 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
 
 	flag_no_active_voucher, _ := h.flagManager.GetFlag("flag_no_active_voucher")
 	flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
-	flag_no_stable_vouchers, _ := h.flagManager.GetFlag("flag_no_stable_vouchers")
+	flag_multiple_voucher, _ := h.flagManager.GetFlag("flag_multiple_voucher")
 
 	publicKey, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
 	if err != nil {
@@ -71,6 +73,13 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
 		return res, nil
 	}
 
+	// only set the flag if the user has a single voucher
+	if len(vouchersResp) == 1 {
+		res.FlagReset = append(res.FlagReset, flag_multiple_voucher)
+	} else {
+		res.FlagSet = append(res.FlagSet, flag_multiple_voucher)
+	}
+
 	res.FlagReset = append(res.FlagReset, flag_no_active_voucher)
 
 	// add a variable to filter out the active voucher
@@ -146,7 +155,36 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
 		}
 	}
 
-	// Filter out the active voucher from vouchersResp
+	// Build stable voucher priority (lower index = higher priority)
+	stablePriority := make(map[string]int)
+	stableAddresses := config.StableVoucherAddresses()
+	for i, addr := range stableAddresses {
+		stablePriority[addr] = i
+	}
+
+	// Helper: order vouchers (stable first, priority-based)
+	orderVouchers := func(vouchers []dataserviceapi.TokenHoldings) []dataserviceapi.TokenHoldings {
+		stable := make([]dataserviceapi.TokenHoldings, 0)
+		nonStable := make([]dataserviceapi.TokenHoldings, 0)
+
+		for _, v := range vouchers {
+			if isStableVoucher(v.TokenAddress) {
+				stable = append(stable, v)
+			} else {
+				nonStable = append(nonStable, v)
+			}
+		}
+
+		sort.SliceStable(stable, func(i, j int) bool {
+			ai := stablePriority[stable[i].TokenAddress]
+			aj := stablePriority[stable[j].TokenAddress]
+			return ai < aj
+		})
+
+		return append(stable, nonStable...)
+	}
+
+	// Remove active voucher
 	filteredVouchers := make([]dataserviceapi.TokenHoldings, 0, len(vouchersResp))
 	for _, v := range vouchersResp {
 		if v.TokenSymbol != activeSymStr {
@@ -154,8 +192,11 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
 		}
 	}
 
-	// Store all voucher data (excluding the current active voucher)
-	data := store.ProcessVouchers(filteredVouchers)
+	// Order remaining vouchers
+	orderedFilteredVouchers := orderVouchers(filteredVouchers)
+
+	// Process & store
+	data := store.ProcessVouchers(orderedFilteredVouchers)
 
 	dataMap := map[storedb.DataTyp]string{
 		storedb.DATA_VOUCHER_SYMBOLS:   data.Symbols,
@@ -168,39 +209,24 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
 	for key, value := range dataMap {
 		if err := userStore.WriteEntry(ctx, sessionId, key, []byte(value)); err != nil {
 			logg.ErrorCtxf(ctx, "Failed to write data entry for sessionId: %s", sessionId, "key", key, "error", err)
-			continue
 		}
 	}
 
-	// Filter stable vouchers
-	filteredStableVouchers := make([]dataserviceapi.TokenHoldings, 0)
-	for _, v := range vouchersResp {
+	// Order all vouchers
+	orderedVouchers := orderVouchers(vouchersResp)
 
-		if isStableVoucher(v.TokenAddress) {
-			filteredStableVouchers = append(filteredStableVouchers, v)
-		}
-	}
+	// Process ALL vouchers (stable first)
+	orderedVoucherData := store.ProcessVouchers(orderedVouchers)
 
-	// No stable vouchers
-	if len(filteredStableVouchers) == 0 {
-		res.FlagSet = append(res.FlagSet, flag_no_stable_vouchers)
-		return res, nil
-	}
-
-	res.FlagReset = append(res.FlagReset, flag_no_stable_vouchers)
-
-	// Process stable vouchers for later use
-	stableVoucherData := store.ProcessVouchers(filteredStableVouchers)
-
-	stableVoucherDataMap := map[storedb.DataTyp]string{
-		storedb.DATA_STABLE_VOUCHER_SYMBOLS:   stableVoucherData.Symbols,
-		storedb.DATA_STABLE_VOUCHER_BALANCES:  stableVoucherData.Balances,
-		storedb.DATA_STABLE_VOUCHER_DECIMALS:  stableVoucherData.Decimals,
-		storedb.DATA_STABLE_VOUCHER_ADDRESSES: stableVoucherData.Addresses,
+	orderedVoucherDataMap := map[storedb.DataTyp]string{
+		storedb.DATA_ORDERED_VOUCHER_SYMBOLS:   orderedVoucherData.Symbols,
+		storedb.DATA_ORDERED_VOUCHER_BALANCES:  orderedVoucherData.Balances,
+		storedb.DATA_ORDERED_VOUCHER_DECIMALS:  orderedVoucherData.Decimals,
+		storedb.DATA_ORDERED_VOUCHER_ADDRESSES: orderedVoucherData.Addresses,
 	}
 
 	// Write data entries
-	for key, value := range stableVoucherDataMap {
+	for key, value := range orderedVoucherDataMap {
 		if err := userStore.WriteEntry(ctx, sessionId, key, []byte(value)); err != nil {
 			logg.ErrorCtxf(ctx, "Failed to write data entry for sessionId: %s", sessionId, "key", key, "error", err)
 			continue
@@ -211,6 +237,7 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
 }
 
 // GetVoucherList fetches the list of vouchers from the store and formats them.
+// does not include the active voucher and is used in select_voucher and pay_debt
 func (h *MenuHandlers) GetVoucherList(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	sessionId, ok := ctx.Value("SessionId").(string)
@@ -239,7 +266,12 @@ func (h *MenuHandlers) GetVoucherList(ctx context.Context, sym string, input []b
 	}
 
 	if len(voucherData) == 0 {
+		if sym == "get_paydebt_voucher_list" {
+			res.Content = l.Get("You need another voucher to proceed. Only found %s.", string(activeSym))
+		} else {
 			res.Content = l.Get("Your active voucher %s is already set", string(activeSym))
+		}
+
 		return res, nil
 	}
 
@@ -291,8 +323,8 @@ func (h *MenuHandlers) ViewVoucher(ctx context.Context, sym string, input []byte
 		return res, nil
 	}
 
-	if err := store.StoreTemporaryVoucher(ctx, h.userdataStore, sessionId, metadata); err != nil {
-		logg.ErrorCtxf(ctx, "failed on StoreTemporaryVoucher", "error", err)
+	if err := store.StoreTransactionVoucher(ctx, h.userdataStore, sessionId, metadata); err != nil {
+		logg.ErrorCtxf(ctx, "failed on StoreTransactionVoucher", "error", err)
 		return res, err
 	}
 
@@ -320,9 +352,9 @@ func (h *MenuHandlers) SetVoucher(ctx context.Context, sym string, input []byte)
 	}
 
 	// Get temporary data
-	tempData, err := store.GetTemporaryVoucherData(ctx, h.userdataStore, sessionId)
+	tempData, err := store.GetTransactionVoucherData(ctx, h.userdataStore, sessionId)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed on GetTemporaryVoucherData", "error", err)
+		logg.ErrorCtxf(ctx, "failed on GetTransactionVoucherData", "error", err)
 		return res, err
 	}
 
@@ -370,3 +402,50 @@ func (h *MenuHandlers) GetVoucherDetails(ctx context.Context, sym string, input
 
 	return res, nil
 }
+
+// ValidateCreditVoucher sets the selected voucher as the active transaction voucher
+func (h *MenuHandlers) ValidateCreditVoucher(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	code := codeFromCtx(ctx)
+	l := gotext.NewLocale(translationDir, code)
+	l.AddDomain("default")
+
+	flag_incorrect_voucher, _ := h.flagManager.GetFlag("flag_incorrect_voucher")
+
+	res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
+
+	inputStr := string(input)
+	if inputStr == "0" || inputStr == "99" || inputStr == "88" || inputStr == "98" {
+		return res, nil
+	}
+
+	userStore := h.userdataStore
+	metadata, err := store.GetOrderedVoucherData(ctx, userStore, sessionId, inputStr)
+	if err != nil {
+		return res, fmt.Errorf("failed to retrieve swap to voucher data: %v", err)
+	}
+	if metadata == nil {
+		res.FlagSet = append(res.FlagSet, flag_incorrect_voucher)
+		return res, nil
+	}
+
+	// Store the transaction voucher data
+	if err := store.StoreTransactionVoucher(ctx, h.userdataStore, sessionId, metadata); err != nil {
+		logg.ErrorCtxf(ctx, "failed on StoreTransactionVoucher", "error", err)
+		return res, err
+	}
+
+	// Store the state of the custom transaction voucher
+	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_TRANSACTION_CUSTOM_VOUCHER_STATE, []byte("1"))
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to write custom transaction voucher", "key", storedb.DATA_TRANSACTION_CUSTOM_VOUCHER_STATE, "error", err)
+		return res, err
+	}
+
+	return res, nil
+}

handlers/local.go

@@ -105,12 +105,14 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("get_profile_info", appHandlers.GetProfileInfo)
 	ls.DbRs.AddLocalFunc("verify_yob", appHandlers.VerifyYob)
 	ls.DbRs.AddLocalFunc("reset_incorrect_date_format", appHandlers.ResetIncorrectYob)
-	ls.DbRs.AddLocalFunc("initiate_transaction", appHandlers.InitiateTransaction)
+	ls.DbRs.AddLocalFunc("normal_transaction_preview", appHandlers.NormalTransactionPreview)
+	ls.DbRs.AddLocalFunc("initiate_normal_transaction", appHandlers.InitiateNormalTransaction)
 	ls.DbRs.AddLocalFunc("confirm_pin_change", appHandlers.ConfirmPinChange)
 	ls.DbRs.AddLocalFunc("quit_with_help", appHandlers.QuitWithHelp)
 	ls.DbRs.AddLocalFunc("fetch_community_balance", appHandlers.FetchCommunityBalance)
 	ls.DbRs.AddLocalFunc("manage_vouchers", appHandlers.ManageVouchers)
-	ls.DbRs.AddLocalFunc("get_vouchers", appHandlers.GetVoucherList)
+	ls.DbRs.AddLocalFunc("get_voucher_list", appHandlers.GetVoucherList)
+	ls.DbRs.AddLocalFunc("get_paydebt_voucher_list", appHandlers.GetVoucherList)
 	ls.DbRs.AddLocalFunc("view_voucher", appHandlers.ViewVoucher)
 	ls.DbRs.AddLocalFunc("set_voucher", appHandlers.SetVoucher)
 	ls.DbRs.AddLocalFunc("get_voucher_details", appHandlers.GetVoucherDetails)
@@ -150,10 +152,11 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("calculate_max_pay_debt", appHandlers.CalculateMaxPayDebt)
 	ls.DbRs.AddLocalFunc("confirm_debt_removal", appHandlers.ConfirmDebtRemoval)
 	ls.DbRs.AddLocalFunc("initiate_pay_debt", appHandlers.InitiatePayDebt)
-	ls.DbRs.AddLocalFunc("get_pool_deposit_vouchers", appHandlers.GetPoolDepositVouchers)
+	ls.DbRs.AddLocalFunc("get_ordered_vouchers", appHandlers.GetOrderedVouchers)
 	ls.DbRs.AddLocalFunc("pool_deposit_max_amount", appHandlers.PoolDepositMaxAmount)
 	ls.DbRs.AddLocalFunc("confirm_pool_deposit", appHandlers.ConfirmPoolDeposit)
 	ls.DbRs.AddLocalFunc("initiate_pool_deposit", appHandlers.InitiatePoolDeposit)
+	ls.DbRs.AddLocalFunc("validate_credit_voucher", appHandlers.ValidateCreditVoucher)
 
 	ls.first = appHandlers.Init
 

services/registration/calculate_max_pay_debt.vis

@@ -0,0 +1,10 @@
+LOAD reset_transaction_amount 10
+RELOAD reset_transaction_amount
+MAP calculate_max_pay_debt
+MOUT back 0
+HALT
+LOAD confirm_debt_removal 140
+RELOAD confirm_debt_removal
+CATCH invalid_pay_debt_amount flag_invalid_amount 1
+INCMP _ 0
+INCMP confirm_debt_removal *

services/registration/confirm_debt_removal

@@ -1,2 +1 @@
 {{.confirm_debt_removal}}
-Enter your PIN:

services/registration/confirm_debt_removal.vis

@@ -1,7 +1,4 @@
-LOAD confirm_debt_removal 0
 MAP confirm_debt_removal
-CATCH api_failure flag_api_call_error 1
-CATCH invalid_credit_send_amount flag_invalid_amount 1
 MOUT back 0
 MOUT quit 9
 HALT

services/registration/credit_amount.vis

@@ -13,7 +13,4 @@ LOAD validate_amount 64
 RELOAD validate_amount
 CATCH invalid_amount flag_invalid_amount 1
 INCMP _ 0
-LOAD get_recipient 0
-LOAD get_sender 64
-LOAD get_amount 32
 INCMP transaction_pin *

services/registration/credit_send.vis

@@ -3,10 +3,13 @@ RELOAD transaction_reset
 CATCH no_voucher flag_no_active_voucher 1
 MOUT back 0
 HALT
+LOAD clear_trans_type_flag 6
+RELOAD clear_trans_type_flag
 LOAD validate_recipient 50
 RELOAD validate_recipient
 CATCH api_failure flag_api_call_error 1
 CATCH invalid_recipient flag_invalid_recipient 1
 CATCH invite_recipient flag_invalid_recipient_with_invite 1
+CATCH credit_vouchers flag_multiple_voucher 1
 INCMP _ 0
 INCMP credit_amount *

services/registration/credit_vouchers

@@ -0,0 +1 @@
+{{.get_ordered_vouchers}}

services/registration/credit_vouchers.vis

@@ -0,0 +1,15 @@
+LOAD get_ordered_vouchers 0
+MAP get_ordered_vouchers
+MOUT back 0
+MOUT quit 99
+MNEXT next 88
+MPREV prev 98
+HALT
+INCMP > 88
+INCMP < 98
+INCMP _ 0
+INCMP quit 99
+LOAD validate_credit_voucher 67
+RELOAD validate_credit_voucher
+CATCH . flag_incorrect_voucher 1
+INCMP credit_amount *

services/registration/get_mpesa

@@ -1 +1 @@
-{{.get_mpesa_max_limit}}
+{{.get_ordered_vouchers}}

services/registration/get_mpesa.vis

@@ -1,10 +1,19 @@
 CATCH no_voucher flag_no_active_voucher 1
-LOAD get_mpesa_max_limit 0
-RELOAD get_mpesa_max_limit
-MAP get_mpesa_max_limit
+LOAD get_ordered_vouchers 0
+MAP get_ordered_vouchers
 MOUT back 0
-MOUT quit 9
+MOUT quit 99
+MNEXT next 88
+MPREV prev 98
 HALT
+INCMP > 88
+INCMP < 98
 INCMP _ 0
-INCMP quit 9
-INCMP get_mpesa_confirmation *
+INCMP quit 99
+LOAD get_mpesa_max_limit 89
+RELOAD get_mpesa_max_limit
+CATCH . flag_incorrect_voucher 1
+CATCH low_withdraw_mpesa_amount flag_incorrect_pool 1
+CATCH low_withdraw_mpesa_amount flag_low_swap_amount 1
+CATCH low_withdraw_mpesa_amount flag_api_call_error 1
+INCMP mpesa_max_limit *

services/registration/get_mpesa_confirmation.vis

@@ -1,7 +1,4 @@
-LOAD get_mpesa_preview 0
 MAP get_mpesa_preview
-CATCH api_failure flag_api_call_error 1
-CATCH invalid_credit_send_amount flag_invalid_amount 1
 MOUT back 0
 MOUT quit 9
 HALT

services/registration/get_mpesa_menu

@@ -1 +1 @@
-Get M-Pesa
+Withdraw

services/registration/invalid_get_mpesa_amount

@@ -0,0 +1 @@
+Amount {{.get_mpesa_preview}} is invalid, please try again:

services/registration/invalid_get_mpesa_amount.vis

@@ -0,0 +1,7 @@
+MAP get_mpesa_preview
+RELOAD reset_transaction_amount
+MOUT retry 1
+MOUT quit 9
+HALT
+INCMP _ 1
+INCMP quit 9

services/registration/invalid_get_mpesa_amount_swa

@@ -0,0 +1 @@
+Kiwango {{.get_mpesa_preview}} sio sahihi, tafadhali weka tena:

services/registration/invalid_pay_debt_amount

@@ -0,0 +1 @@
+Amount {{.confirm_debt_removal}} is invalid, please try again:

services/registration/invalid_pay_debt_amount.vis

@@ -0,0 +1,7 @@
+MAP confirm_debt_removal
+RELOAD reset_transaction_amount
+MOUT retry 1
+MOUT quit 9
+HALT
+INCMP _ 1
+INCMP quit 9

services/registration/invalid_pay_debt_amount_swa

@@ -0,0 +1 @@
+Kiwango {{.confirm_debt_removal}} sio sahihi, tafadhali weka tena:

services/registration/locale/swa/default.po

@@ -59,24 +59,24 @@ msgid "Enter the amount of M-Pesa to get: (Max %s Ksh)\n"
 msgstr "Weka kiasi cha M-Pesa cha kupata: (Kikomo %s Ksh)\n"
 
 msgid "You are sending %s %s in order to receive ~ %s ksh"
-msgstr "Unatuma ~ %s %s ili upoke %s ksh"
+msgstr "Unatuma ~ %s %s ili upokee %s ksh"
 
-msgid "Your request has been sent. You will receive ~ %s ksh"
-msgstr "Ombi lako limetumwa. Utapokea ~ %s ksh"
+msgid "Your request has been sent. Please await confirmation"
+msgstr "Ombi lako limetumwa. Tafadhali subiri"
 
 msgid "Enter the amount of M-Pesa to send: (Minimum %s Ksh)\n"
 msgstr "Weka kiasi cha M-Pesa cha kutuma: (Kima cha chini %s Ksh)\n"
 
-msgid "You will get a prompt for your M-Pesa PIN shortly to send %s ksh and receive ~ %s cUSD"
-msgstr "Utapokea kidokezo cha PIN yako ya M-Pesa hivi karibuni kutuma %s ksh na kupokea ~ %s cUSD"
+msgid "You will get a prompt for your Mpesa PIN shortly to send %s ksh and receive ~ %s %s"
+msgstr "Utapokea kidokezo cha PIN yako ya Mpesa hivi karibuni kutuma %s ksh na kupokea ~ %s %s"
 
 msgid "Your request has been sent. Thank you for using Sarafu"
 msgstr "Ombi lako limetumwa. Asante kwa kutumia huduma ya Sarafu"
 
-msgid "You can remove a maximum of %s %s from '%s' pool\n\nEnter amount of %s:"
-msgstr "Unaweza kuondoa kiwango cha juu cha %s %s kutoka kwenye '%s'\n\nWeka kiwango cha %s:"
+msgid "You can remove a max of %s %s from '%s' pool\nEnter amount of %s:(Max: %s)"
+msgstr "Unaweza kuondoa kiwango cha juu cha %s %s kutoka kwenye '%s'\n\nWeka kiwango cha %s:(Kikomo: %s)"
 
-msgid "Please confirm that you will use %s %s to remove your debt of %s %s\n"
+msgid "Please confirm that you will use %s %s to remove your debt of %s %s\nEnter your PIN:"
 msgstr "Tafadhali thibitisha kwamba utatumia %s %s kulipa deni lako la %s %s.\nWeka PIN yako:"
 
 msgid "Your active voucher %s is already set"
@@ -90,3 +90,24 @@ msgstr "Utaweka %s %s kwenye %s\n"
 
 msgid "Your request has been sent. You will receive an SMS when %s %s has been deposited into %s."
 msgstr "Ombi lako limetumwa. Utapokea ujumbe wakati %s %s itawekwa kwenye %s."
+
+msgid "%s will receive %s %s from %s"
+msgstr %s atapokea %s %s kutoka kwa %s"
+
+msgid "You need another voucher to proceed. Only found %s."
+msgstr "Unahitaji kua na sarafu nyingine. Tumepata tu %s."
+
+msgid "Maximum: %s %s\n\nEnter amount of %s to swap for %s:"
+msgstr "Kikimo: %s %s\n\nWeka kiasi cha %s kitakacho badilishwa kua %s:"
+
+msgid "You will swap %s %s for %s %s:"
+msgstr "Utabadilisha %s %s kua %s %s:"
+
+msgid "Your request has been sent. You will receive an SMS when your debt of %s %s has been removed from %s."
+msgstr "Ombi lako limetumwa. Utapokea ujumbe wakati deni lako la %s %s litatolewa kwa %s."
+
+msgid "Enter the amount of Mpesa to withdraw: (Min: Ksh %s, Max %s Ksh)\n"
+msgstr "Weka kiasi cha Mpesa utakacho toa: (Min: Ksh %s, Max %s Ksh)\n"
+
+msgid "Enter the amount of credit to deposit: (Minimum %s Ksh)\n"
+msgstr "Weka kiasi utakacho weka (Kima cha chini: %s Ksh)\n"

services/registration/low_pay_debt_amount

@@ -1 +1 @@
-You have a low debt amount
+Available amount {{.calculate_max_pay_debt}} is too low, please choose a different voucher:

services/registration/low_pay_debt_amount.vis

@@ -1,5 +1,6 @@
+MAP calculate_max_pay_debt
 MOUT back 0
 MOUT quit 9
 HALT
-INCMP ^ 0
+INCMP _ 0
 INCMP quit 9

services/registration/low_pay_debt_amount_swa

@@ -1 +1 @@
-Kiasi cha deni lako ni cha chini sana
+Kiasi kinachopatikana {{.calculate_max_pay_debt}} ni cha chini sana, tafadhali chagua sarafu tofauti:

services/registration/low_swap_amount

@@ -1 +1 @@
-Available amount {{.swap_max_limit}} is too low, please try again:
+Available amount {{.swap_max_limit}} is too low, please choose a different voucher:

services/registration/low_swap_amount_swa

@@ -1 +1 @@
-Kiasi kinachopatikana {{.swap_max_limit}} ni cha chini sana, tafadhali jaribu tena:
+Kiasi kinachopatikana {{.swap_max_limit}} ni cha chini sana, tafadhali chagua sarafu tofauti:

services/registration/low_withdraw_mpesa_amount

@@ -0,0 +1 @@
+Available amount {{.get_mpesa_max_limit}} is too low, please choose a different voucher:

services/registration/low_withdraw_mpesa_amount.vis

@@ -0,0 +1,6 @@
+MAP get_mpesa_max_limit
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP _ 0
+INCMP quit 9

services/registration/low_withdraw_mpesa_amount_swa

@@ -0,0 +1 @@
+Kiasi kinachopatikana {{.get_mpesa_max_limit}} ni cha chini sana, tafadhali chagua sarafu tofauti:

services/registration/mpesa_max_limit

@@ -0,0 +1 @@
+{{.get_mpesa_max_limit}}

services/registration/mpesa_max_limit.vis

@@ -0,0 +1,13 @@
+LOAD reset_transaction_amount 10
+RELOAD reset_transaction_amount
+MAP get_mpesa_max_limit
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP _ 0
+INCMP quit 9
+LOAD get_mpesa_preview 90
+RELOAD get_mpesa_preview
+CATCH api_failure flag_api_call_error 1
+CATCH invalid_get_mpesa_amount flag_invalid_amount 1
+INCMP get_mpesa_confirmation *

services/registration/pay_debt

@@ -1 +1 @@
-{{.calculate_max_pay_debt}}
+{{.get_paydebt_voucher_list}}

services/registration/pay_debt.vis

@@ -1,10 +1,18 @@
 CATCH no_voucher flag_no_active_voucher 1
-CATCH no_stable_voucher flag_no_stable_vouchers 1
+LOAD get_paydebt_voucher_list 0
+MAP get_paydebt_voucher_list
+MOUT back 0
+MOUT quit 99
+MNEXT next 88
+MPREV prev 98
+HALT
+INCMP > 88
+INCMP < 98
+INCMP _ 0
+INCMP quit 99
 LOAD calculate_max_pay_debt 0
 RELOAD calculate_max_pay_debt
-MAP calculate_max_pay_debt
+CATCH . flag_incorrect_voucher 1
 CATCH low_pay_debt_amount flag_low_swap_amount 1
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP confirm_debt_removal *
+CATCH low_pay_debt_amount flag_api_call_error 1
+INCMP calculate_max_pay_debt *

services/registration/pool_deposit

@@ -1 +1 @@
-{{.get_pool_deposit_vouchers}}
+{{.get_ordered_vouchers}}

services/registration/pool_deposit.vis

@@ -1,7 +1,6 @@
 CATCH no_voucher flag_no_active_voucher 1
-CATCH no_stable_voucher flag_no_stable_vouchers 1
-LOAD get_pool_deposit_vouchers 0
-MAP get_pool_deposit_vouchers
+LOAD get_ordered_vouchers 0
+MAP get_ordered_vouchers
 MOUT back 0
 MOUT quit 99
 MNEXT next 88

services/registration/pp.csv

@@ -37,3 +37,4 @@ flag,flag_low_swap_amount,43,this is set when the swap max limit is less than 0.
 flag,flag_alias_unavailable,44,this is set when the preferred alias is not available
 flag,flag_swap_transaction,45,this is set when the transaction will involve performing a swap
 flag,flag_no_stable_vouchers,46,this is set when the user does not have a stable voucher
+flag,flag_multiple_voucher,47,this is set when the user only has a multiple voucher

services/registration/select_voucher

@@ -1 +1 @@
-{{.get_vouchers}}
+{{.get_voucher_list}}

services/registration/select_voucher.vis

@@ -1,6 +1,6 @@
 CATCH no_voucher flag_no_active_voucher 1
-LOAD get_vouchers 0
-MAP get_vouchers
+LOAD get_voucher_list 0
+MAP get_voucher_list
 MOUT back 0
 MOUT quit 99
 MNEXT next 88

services/registration/send_mpesa_confirmation

@@ -1,3 +1,2 @@
 {{.send_mpesa_preview}}
-
-Please enter your account PIN to confirm:
+Enter your PIN to confirm:

services/registration/send_mpesa_confirmation_swa

@@ -1,3 +1,2 @@
 {{.send_mpesa_preview}}
-
-Tafadhali weka PIN ya akaunti yako kudhibitisha:
+Weka PIN yako kudhibitisha:

services/registration/send_mpesa_menu

@@ -1 +1 @@
-Send M-Pesa
+Top-up

services/registration/swap_to_list.vis

@@ -12,7 +12,7 @@ INCMP > 88
 INCMP < 98
 INCMP _ 0
 INCMP quit 99
-LOAD swap_max_limit 64
+LOAD swap_max_limit 138
 RELOAD swap_max_limit
 CATCH api_failure flag_api_call_error 1
 CATCH . flag_incorrect_voucher 1

services/registration/transaction_initiated.vis

@@ -1,10 +1,4 @@
 LOAD reset_incorrect_pin 6
 CATCH _ flag_account_authorized 0
-RELOAD get_amount
-MAP get_amount
-RELOAD get_recipient
-MAP get_recipient
-RELOAD get_sender
-MAP get_sender
-LOAD initiate_transaction 0
+LOAD initiate_normal_transaction 0
 HALT

services/registration/transaction_pin

@@ -1,2 +1,2 @@
-{{.get_recipient}} will receive {{.get_amount}} from {{.get_sender}}
+{{.normal_transaction_preview}}
 Please enter your PIN to confirm:

services/registration/transaction_pin.vis

@@ -1,9 +1,5 @@
-RELOAD get_amount
-MAP get_amount
-RELOAD get_recipient
-MAP get_recipient
-RELOAD get_sender
-MAP get_sender
+LOAD normal_transaction_preview 0
+MAP normal_transaction_preview
 MOUT back 0
 MOUT quit 9
 LOAD authorize_account 6

services/registration/transaction_pin_swa

@@ -1,2 +0,0 @@
-{{.get_recipient}} atapokea {{.get_amount}} kutoka kwa {{.get_sender}}
-Tafadhali weka PIN yako kudhibitisha:

store/db/db.go

@@ -93,6 +93,14 @@ const (
 	DATA_SEND_TRANSACTION_TYPE
 	// Holds the recipient formatted phone number
 	DATA_RECIPIENT_PHONE_NUMBER
+	// Currently active swap from balance for the swap
+	DATA_ACTIVE_SWAP_FROM_BALANCE
+	// Holds the state whether the transaction uses a custom voucher
+	DATA_TRANSACTION_CUSTOM_VOUCHER_STATE
+	// Holds the initial recipient input given by the user
+	DATA_RECIPIENT_INPUT
+	// Holds the transaction voucher
+	DATA_TRANSACTION_CUSTOM_VOUCHER
 )
 
 const (
@@ -104,14 +112,14 @@ const (
 	DATA_VOUCHER_DECIMALS
 	// List of voucher EVM addresses for vouchers valid in the user context.
 	DATA_VOUCHER_ADDRESSES
-	// List of stable voucher symbols in the user context.
-	DATA_STABLE_VOUCHER_SYMBOLS
-	// List of stable voucher decimal counts for vouchers valid in the user context.
-	DATA_STABLE_VOUCHER_BALANCES
-	// List of stable voucher decimal counts for vouchers valid in the user context.
-	DATA_STABLE_VOUCHER_DECIMALS
-	// List of stable voucher EVM addresses for vouchers valid in the user context.
-	DATA_STABLE_VOUCHER_ADDRESSES
+	// List of ordered voucher symbols in the user context.
+	DATA_ORDERED_VOUCHER_SYMBOLS
+	// List of ordered voucher balances in the user context.
+	DATA_ORDERED_VOUCHER_BALANCES
+	// List of ordered voucher decimals in the user context.
+	DATA_ORDERED_VOUCHER_DECIMALS
+	// List of ordered voucher EVM addresses in the user context.
+	DATA_ORDERED_VOUCHER_ADDRESSES
 )
 
 const (

store/swap.go

@@ -189,3 +189,74 @@ func UpdateSwapToVoucherData(ctx context.Context, store DataStore, sessionId str
 
 	return nil
 }
+
+// UpdateSwapFromVoucherData updates the active swap from voucher data in the DataStore.
+func UpdateSwapFromVoucherData(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
+	logg.InfoCtxf(ctx, "UpdateSwapFromVoucherData", "data", data)
+	// Active swap to voucher data entries
+	activeEntries := map[storedb.DataTyp][]byte{
+		storedb.DATA_ACTIVE_SWAP_FROM_SYM:     []byte(data.TokenSymbol),
+		storedb.DATA_ACTIVE_SWAP_FROM_DECIMAL: []byte(data.TokenDecimals),
+		storedb.DATA_ACTIVE_SWAP_FROM_ADDRESS: []byte(data.TokenAddress),
+		storedb.DATA_ACTIVE_SWAP_FROM_BALANCE: []byte(data.Balance),
+	}
+
+	// Write active data
+	for key, value := range activeEntries {
+		if err := store.WriteEntry(ctx, sessionId, key, value); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// ReadSwapFromVoucher retrieves the voucher being swapped into the pool (swap from)
+func ReadSwapFromVoucher(ctx context.Context, store DataStore, sessionId string) (*dataserviceapi.TokenHoldings, error) {
+	keys := []storedb.DataTyp{
+		storedb.DATA_ACTIVE_SWAP_FROM_SYM,
+		storedb.DATA_ACTIVE_SWAP_FROM_DECIMAL,
+		storedb.DATA_ACTIVE_SWAP_FROM_ADDRESS,
+		storedb.DATA_ACTIVE_SWAP_FROM_BALANCE,
+	}
+	data := make(map[storedb.DataTyp]string)
+
+	for _, key := range keys {
+		value, err := store.ReadEntry(ctx, sessionId, key)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get data key %x: %v", key, err)
+		}
+		data[key] = string(value)
+	}
+
+	return &dataserviceapi.TokenHoldings{
+		TokenSymbol:   data[storedb.DATA_ACTIVE_SWAP_FROM_SYM],
+		Balance:       data[storedb.DATA_ACTIVE_SWAP_FROM_BALANCE],
+		TokenDecimals: data[storedb.DATA_ACTIVE_SWAP_FROM_DECIMAL],
+		TokenAddress:  data[storedb.DATA_ACTIVE_SWAP_FROM_ADDRESS],
+	}, nil
+}
+
+// ReadSwapToVoucher retrieves the swap to voucher being swapped from the pool
+func ReadSwapToVoucher(ctx context.Context, store DataStore, sessionId string) (*dataserviceapi.TokenHoldings, error) {
+	keys := []storedb.DataTyp{
+		storedb.DATA_ACTIVE_SWAP_TO_SYM,
+		storedb.DATA_ACTIVE_SWAP_TO_DECIMAL,
+		storedb.DATA_ACTIVE_SWAP_TO_ADDRESS,
+	}
+	data := make(map[storedb.DataTyp]string)
+
+	for _, key := range keys {
+		value, err := store.ReadEntry(ctx, sessionId, key)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get data key %x: %v", key, err)
+		}
+		data[key] = string(value)
+	}
+
+	return &dataserviceapi.TokenHoldings{
+		TokenSymbol:   data[storedb.DATA_ACTIVE_SWAP_TO_SYM],
+		TokenDecimals: data[storedb.DATA_ACTIVE_SWAP_TO_DECIMAL],
+		TokenAddress:  data[storedb.DATA_ACTIVE_SWAP_TO_ADDRESS],
+	}, nil
+}

store/tokens.go

@@ -13,7 +13,7 @@ import (
 )
 
 type TransactionData struct {
-	TemporaryValue string
+	RecipientInput string
 	ActiveSym      string
 	Amount         string
 	PublicKey      string
@@ -77,7 +77,7 @@ func ParseAndScaleAmount(storedAmount, activeDecimal string) (string, error) {
 func ReadTransactionData(ctx context.Context, store DataStore, sessionId string) (TransactionData, error) {
 	data := TransactionData{}
 	fieldToKey := map[string]storedb.DataTyp{
-		"TemporaryValue": storedb.DATA_TEMPORARY_VALUE,
+		"RecipientInput": storedb.DATA_RECIPIENT_INPUT,
 		"ActiveSym":      storedb.DATA_ACTIVE_SYM,
 		"Amount":         storedb.DATA_AMOUNT,
 		"PublicKey":      storedb.DATA_PUBLIC_KEY,

store/tokens_test.go

@@ -221,7 +221,7 @@ func TestReadTransactionData(t *testing.T) {
 
 	// Test transaction data
 	transactionData := map[storedb.DataTyp]string{
-		storedb.DATA_TEMPORARY_VALUE: "0712345678",
+		storedb.DATA_RECIPIENT_INPUT: "0712345678",
 		storedb.DATA_ACTIVE_SYM:      "SRF",
 		storedb.DATA_AMOUNT:          "1000000",
 		storedb.DATA_PUBLIC_KEY:      publicKey,
@@ -238,7 +238,7 @@ func TestReadTransactionData(t *testing.T) {
 	}
 
 	expectedResult := TransactionData{
-		TemporaryValue: "0712345678",
+		RecipientInput: "0712345678",
 		ActiveSym:      "SRF",
 		Amount:         "1000000",
 		PublicKey:      publicKey,

store/vouchers.go

@@ -120,13 +120,13 @@ func GetVoucherData(ctx context.Context, store DataStore, sessionId string, inpu
 	}, nil
 }
 
-// GetStableVoucherData retrieves and matches stable voucher data
-func GetStableVoucherData(ctx context.Context, store DataStore, sessionId string, input string) (*dataserviceapi.TokenHoldings, error) {
+// GetOrderedVoucherData retrieves and matches ordered voucher data
+func GetOrderedVoucherData(ctx context.Context, store DataStore, sessionId string, input string) (*dataserviceapi.TokenHoldings, error) {
 	keys := []storedb.DataTyp{
-		storedb.DATA_STABLE_VOUCHER_SYMBOLS,
-		storedb.DATA_STABLE_VOUCHER_BALANCES,
-		storedb.DATA_STABLE_VOUCHER_DECIMALS,
-		storedb.DATA_STABLE_VOUCHER_ADDRESSES,
+		storedb.DATA_ORDERED_VOUCHER_SYMBOLS,
+		storedb.DATA_ORDERED_VOUCHER_BALANCES,
+		storedb.DATA_ORDERED_VOUCHER_DECIMALS,
+		storedb.DATA_ORDERED_VOUCHER_ADDRESSES,
 	}
 	data := make(map[storedb.DataTyp]string)
 
@@ -139,10 +139,10 @@ func GetStableVoucherData(ctx context.Context, store DataStore, sessionId string
 	}
 
 	symbol, balance, decimal, address := MatchVoucher(input,
-		data[storedb.DATA_STABLE_VOUCHER_SYMBOLS],
-		data[storedb.DATA_STABLE_VOUCHER_BALANCES],
-		data[storedb.DATA_STABLE_VOUCHER_DECIMALS],
-		data[storedb.DATA_STABLE_VOUCHER_ADDRESSES],
+		data[storedb.DATA_ORDERED_VOUCHER_SYMBOLS],
+		data[storedb.DATA_ORDERED_VOUCHER_BALANCES],
+		data[storedb.DATA_ORDERED_VOUCHER_DECIMALS],
+		data[storedb.DATA_ORDERED_VOUCHER_ADDRESSES],
 	)
 
 	if symbol == "" {
@@ -159,6 +159,10 @@ func GetStableVoucherData(ctx context.Context, store DataStore, sessionId string
 
 // MatchVoucher finds the matching voucher symbol, balance, decimals and contract address based on the input.
 func MatchVoucher(input, symbols, balances, decimals, addresses string) (symbol, balance, decimal, address string) {
+	// case for invalid input with no current symbols
+	if symbols == "" {
+		return
+	}
 	symList := strings.Split(symbols, "\n")
 	balList := strings.Split(balances, "\n")
 	decList := strings.Split(decimals, "\n")
@@ -185,20 +189,20 @@ func MatchVoucher(input, symbols, balances, decimals, addresses string) (symbol,
 	return
 }
 
-// StoreTemporaryVoucher saves voucher metadata as temporary entries in the DataStore.
-func StoreTemporaryVoucher(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
+// StoreTransactionVoucher saves voucher metadata in the DataStore.
+func StoreTransactionVoucher(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
 	tempData := fmt.Sprintf("%s,%s,%s,%s", data.TokenSymbol, data.Balance, data.TokenDecimals, data.TokenAddress)
 
-	if err := store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(tempData)); err != nil {
+	if err := store.WriteEntry(ctx, sessionId, storedb.DATA_TRANSACTION_CUSTOM_VOUCHER, []byte(tempData)); err != nil {
 		return err
 	}
 
 	return nil
 }
 
-// GetTemporaryVoucherData retrieves temporary voucher metadata from the DataStore.
-func GetTemporaryVoucherData(ctx context.Context, store DataStore, sessionId string) (*dataserviceapi.TokenHoldings, error) {
-	temp_data, err := store.ReadEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE)
+// GetTransactionVoucherData retrieves the transaction voucher metadata from the DataStore.
+func GetTransactionVoucherData(ctx context.Context, store DataStore, sessionId string) (*dataserviceapi.TokenHoldings, error) {
+	temp_data, err := store.ReadEntry(ctx, sessionId, storedb.DATA_TRANSACTION_CUSTOM_VOUCHER)
 	if err != nil {
 		return nil, err
 	}

store/vouchers_test.go

@@ -118,7 +118,7 @@ func TestStoreTemporaryVoucher(t *testing.T) {
 	}
 
 	// Execute the function being tested
-	err := StoreTemporaryVoucher(ctx, store, sessionId, voucherData)
+	err := StoreTransactionVoucher(ctx, store, sessionId, voucherData)
 	require.NoError(t, err)
 
 	// Verify stored data
@@ -142,11 +142,11 @@ func TestGetTemporaryVoucherData(t *testing.T) {
 	}
 
 	// Store the data
-	err := StoreTemporaryVoucher(ctx, store, sessionId, tempData)
+	err := StoreTransactionVoucher(ctx, store, sessionId, tempData)
 	require.NoError(t, err)
 
 	// Execute the function being tested
-	data, err := GetTemporaryVoucherData(ctx, store, sessionId)
+	data, err := GetTransactionVoucherData(ctx, store, sessionId)
 	require.NoError(t, err)
 	require.Equal(t, tempData, data)
 }
@@ -170,7 +170,7 @@ func TestUpdateVoucherData(t *testing.T) {
 		TokenDecimals: "8",
 		TokenAddress:  "0xold",
 	}
-	require.NoError(t, StoreTemporaryVoucher(ctx, store, sessionId, tempData))
+	require.NoError(t, StoreTransactionVoucher(ctx, store, sessionId, tempData))
 
 	// Execute update
 	err := UpdateVoucherData(ctx, store, sessionId, newData)