From adb7a402d0bc97a533ca571b3d3f2c1b5e2fde5e Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 22 Jan 2026 17:40:13 +0300 Subject: [PATCH 01/74] added the Pay debt top node --- services/registration/main.vis | 26 +++++++++++++------------ services/registration/pay_debt | 2 ++ services/registration/pay_debt.vis | 6 ++++++ services/registration/pay_debt_menu | 1 + services/registration/pay_debt_menu_swa | 1 + services/registration/pay_debt_swa | 2 ++ 6 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 services/registration/pay_debt create mode 100644 services/registration/pay_debt.vis create mode 100644 services/registration/pay_debt_menu create mode 100644 services/registration/pay_debt_menu_swa create mode 100644 services/registration/pay_debt_swa diff --git a/services/registration/main.vis b/services/registration/main.vis index f210214..d23ae05 100644 --- a/services/registration/main.vis +++ b/services/registration/main.vis @@ -7,20 +7,22 @@ LOAD check_balance 128 RELOAD check_balance MAP check_balance MOUT send 1 -MOUT swap 2 -MOUT vouchers 3 -MOUT select_pool 4 -MOUT mpesa 5 -MOUT account 6 -MOUT help 7 +MOUT pay_debt 2 +MOUT swap 3 +MOUT vouchers 4 +MOUT select_pool 5 +MOUT mpesa 6 +MOUT account 7 +MOUT help 8 MOUT quit 9 HALT INCMP credit_send 1 -INCMP swap_to_list 2 -INCMP my_vouchers 3 -INCMP select_pool 4 -INCMP mpesa 5 -INCMP my_account 6 -INCMP help 7 +INCMP pay_debt 2 +INCMP swap_to_list 3 +INCMP my_vouchers 4 +INCMP select_pool 5 +INCMP mpesa 6 +INCMP my_account 7 +INCMP help 8 INCMP quit 9 INCMP . * diff --git a/services/registration/pay_debt b/services/registration/pay_debt new file mode 100644 index 0000000..6c4e62c --- /dev/null +++ b/services/registration/pay_debt @@ -0,0 +1,2 @@ +{{.calculate_pay_debt}} +Enter amount: \ No newline at end of file diff --git a/services/registration/pay_debt.vis b/services/registration/pay_debt.vis new file mode 100644 index 0000000..325a256 --- /dev/null +++ b/services/registration/pay_debt.vis @@ -0,0 +1,6 @@ +LOAD calculate_pay_debt 0 +RELOAD calculate_pay_debt +MAP calculate_pay_debt +MOUT back 0 +HALT +INCMP confirm_debt_removal * diff --git a/services/registration/pay_debt_menu b/services/registration/pay_debt_menu new file mode 100644 index 0000000..0f0629e --- /dev/null +++ b/services/registration/pay_debt_menu @@ -0,0 +1 @@ +Pay debt \ No newline at end of file diff --git a/services/registration/pay_debt_menu_swa b/services/registration/pay_debt_menu_swa new file mode 100644 index 0000000..7fc9f8a --- /dev/null +++ b/services/registration/pay_debt_menu_swa @@ -0,0 +1 @@ +Lipa deni \ No newline at end of file diff --git a/services/registration/pay_debt_swa b/services/registration/pay_debt_swa new file mode 100644 index 0000000..1e828f0 --- /dev/null +++ b/services/registration/pay_debt_swa @@ -0,0 +1,2 @@ +{{.calculate_pay_debt}} +Weka kiwango: \ No newline at end of file -- 2.45.2 From 7441fde4af0c93d594ad8dd39d5d050262555f88 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 22 Jan 2026 17:40:49 +0300 Subject: [PATCH 02/74] added translations for the pay debt node --- services/registration/locale/swa/default.po | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/services/registration/locale/swa/default.po b/services/registration/locale/swa/default.po index 6ed288b..b77b0c6 100644 --- a/services/registration/locale/swa/default.po +++ b/services/registration/locale/swa/default.po @@ -71,4 +71,10 @@ msgid "You will get a prompt for your M-Pesa PIN shortly to send %s ksh and rece msgstr "Utapokea kidokezo cha PIN yako ya M-Pesa hivi karibuni kutuma %s ksh na kupokea ~ %s cUSD" msgid "Your request has been sent. Thank you for using Sarafu" -msgstr "Ombi lako limetumwa. Asante kwa kutumia huduma ya Sarafu" \ No newline at end of file +msgstr "Ombi lako limetumwa. Asante kwa kutumia huduma ya Sarafu" + +msgid "You can remove a maximum of %s %s from %s pool\n" +msgstr "Unaweza kuondoa kiwango cha juu cha %s %s kutoka kwenye bwawa la %s.\n" + +msgid "Please confirm that you will use %s %s to remove your debt of %s %s\n" +msgstr "Tafadhali thibitisha kwamba utatumia %s %s kulipa deni lako la %s %s.\nWeka PIN yako:" \ No newline at end of file -- 2.45.2 From d0f7692fa21323f182996a2351241493628f81c6 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 22 Jan 2026 17:42:10 +0300 Subject: [PATCH 03/74] added a node for the pay debt confirmation --- services/registration/confirm_debt_removal | 2 ++ services/registration/confirm_debt_removal.vis | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 services/registration/confirm_debt_removal create mode 100644 services/registration/confirm_debt_removal.vis diff --git a/services/registration/confirm_debt_removal b/services/registration/confirm_debt_removal new file mode 100644 index 0000000..3943b54 --- /dev/null +++ b/services/registration/confirm_debt_removal @@ -0,0 +1,2 @@ +{{.confirm_debt_removal}} +Enter your PIN: \ No newline at end of file diff --git a/services/registration/confirm_debt_removal.vis b/services/registration/confirm_debt_removal.vis new file mode 100644 index 0000000..e5c79c8 --- /dev/null +++ b/services/registration/confirm_debt_removal.vis @@ -0,0 +1,13 @@ +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 +LOAD authorize_account 6 +RELOAD authorize_account +CATCH incorrect_pin flag_incorrect_pin 1 +INCMP _ 0 +INCMP quit 9 +INCMP initiate_pay_debt * -- 2.45.2 From 101955c1b342324d948477ad3a4fb4679652b95b Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 22 Jan 2026 17:42:27 +0300 Subject: [PATCH 04/74] added a node to initialize the pay debt --- services/registration/initiate_pay_debt.vis | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 services/registration/initiate_pay_debt.vis diff --git a/services/registration/initiate_pay_debt.vis b/services/registration/initiate_pay_debt.vis new file mode 100644 index 0000000..7d20dbf --- /dev/null +++ b/services/registration/initiate_pay_debt.vis @@ -0,0 +1,4 @@ +LOAD reset_incorrect_pin 6 +CATCH _ flag_account_authorized 0 +LOAD initiate_pay_debt 0 +HALT -- 2.45.2 From cbe5b211d8829bb486e8ea010e6d13bcc7c4657f Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 22 Jan 2026 17:42:52 +0300 Subject: [PATCH 05/74] added the local functions to the menu handler --- handlers/local.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/handlers/local.go b/handlers/local.go index a34be02..b3204a1 100644 --- a/handlers/local.go +++ b/handlers/local.go @@ -146,6 +146,9 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService) ls.DbRs.AddLocalFunc("send_mpesa_min_limit", appHandlers.SendMpesaMinLimit) ls.DbRs.AddLocalFunc("send_mpesa_preview", appHandlers.SendMpesaPreview) ls.DbRs.AddLocalFunc("initiate_send_mpesa", appHandlers.InitiateSendMpesa) + ls.DbRs.AddLocalFunc("calculate_pay_debt", appHandlers.CalculatePayDebt) + ls.DbRs.AddLocalFunc("confirm_debt_removal", appHandlers.ConfirmDebtRemoval) + ls.DbRs.AddLocalFunc("initiate_pay_debt", appHandlers.InitiatePayDebt) ls.first = appHandlers.Init -- 2.45.2 From e2ff3d20d5a76bbe72a26fec4e63c85b33e55c98 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Mon, 26 Jan 2026 13:28:31 +0300 Subject: [PATCH 06/74] updated the resolveActivePoolAddress to resolveActivePoolDetails --- handlers/application/mpesa.go | 2 +- handlers/application/send.go | 59 ++++++++++++++++++++++++++--------- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/handlers/application/mpesa.go b/handlers/application/mpesa.go index a1b9e02..876cd95 100644 --- a/handlers/application/mpesa.go +++ b/handlers/application/mpesa.go @@ -106,7 +106,7 @@ func (h *MenuHandlers) GetMpesaMaxLimit(ctx context.Context, sym string, input [ } // Resolve active pool address - activePoolAddress, err := h.resolveActivePoolAddress(ctx, sessionId) + activePoolAddress, _, err := h.resolveActivePoolDetails(ctx, sessionId) if err != nil { return res, err } diff --git a/handlers/application/send.go b/handlers/application/send.go index bbcea64..f7cdbfc 100644 --- a/handlers/application/send.go +++ b/handlers/application/send.go @@ -345,7 +345,7 @@ func (h *MenuHandlers) MaxAmount(ctx context.Context, sym string, input []byte) } // Resolve active pool address - activePoolAddress, err := h.resolveActivePoolAddress(ctx, sessionId) + activePoolAddress, _, err := h.resolveActivePoolDetails(ctx, sessionId) if err != nil { return res, err } @@ -479,22 +479,53 @@ func (h *MenuHandlers) getRecipientData(ctx context.Context, sessionId string) ( return } -func (h *MenuHandlers) resolveActivePoolAddress(ctx context.Context, sessionId string) ([]byte, error) { +func (h *MenuHandlers) resolveActivePoolDetails(ctx context.Context, sessionId string) (defaultPoolAddress, defaultPoolName []byte, err error) { store := h.userdataStore - addr, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_POOL_ADDRESS) - if err == nil { - return addr, nil + + // Try read address + defaultPoolAddress, err = store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_POOL_ADDRESS) + if err != nil && !db.IsNotFound(err) { + logg.ErrorCtxf(ctx, "failed to read active pool address", "error", err) + return nil, nil, err } - if db.IsNotFound(err) { - defaultAddr := []byte(config.DefaultPoolAddress()) - if err := store.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_POOL_ADDRESS, defaultAddr); err != nil { - logg.ErrorCtxf(ctx, "failed to write default pool address", "error", err) - return nil, err - } - return defaultAddr, nil + + // Try read name + defaultPoolName, err = store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_POOL_NAME) + if err != nil && !db.IsNotFound(err) { + logg.ErrorCtxf(ctx, "failed to read active pool name", "error", err) + return nil, nil, err } - logg.ErrorCtxf(ctx, "failed to read active pool address", "error", err) - return nil, err + + // If both exist, return them + if defaultPoolAddress != nil && defaultPoolName != nil { + return defaultPoolAddress, defaultPoolName, nil + } + + // Fallback to config defaults + defaultPoolAddress = []byte(config.DefaultPoolAddress()) + defaultPoolName = []byte(config.DefaultPoolName()) + + if err := store.WriteEntry( + ctx, + sessionId, + storedb.DATA_ACTIVE_POOL_ADDRESS, + defaultPoolAddress, + ); err != nil { + logg.ErrorCtxf(ctx, "failed to write default pool address", "error", err) + return nil, nil, err + } + + if err := store.WriteEntry( + ctx, + sessionId, + storedb.DATA_ACTIVE_POOL_NAME, + defaultPoolName, + ); err != nil { + logg.ErrorCtxf(ctx, "failed to write default pool name", "error", err) + return nil, nil, err + } + + return defaultPoolAddress, defaultPoolName, nil } func (h *MenuHandlers) calculateSendCreditLimits(ctx context.Context, poolAddress, fromAddress, toAddress, publicKey, fromDecimal, toDecimal []byte) (string, string, error) { -- 2.45.2 From f7de79f51aec0e2d3d792b44aed437f35b3e118c Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Mon, 26 Jan 2026 13:32:44 +0300 Subject: [PATCH 07/74] added option to go back to the main menu --- services/registration/pay_debt.vis | 1 + 1 file changed, 1 insertion(+) diff --git a/services/registration/pay_debt.vis b/services/registration/pay_debt.vis index 325a256..eee4b2c 100644 --- a/services/registration/pay_debt.vis +++ b/services/registration/pay_debt.vis @@ -3,4 +3,5 @@ RELOAD calculate_pay_debt MAP calculate_pay_debt MOUT back 0 HALT +INCMP _ 0 INCMP confirm_debt_removal * -- 2.45.2 From 07e0e877d57a1fc9d91a1072e776a2b1406534f4 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 29 Jan 2026 16:08:53 +0300 Subject: [PATCH 08/74] added data keys for the credit and debt values --- store/db/db.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/store/db/db.go b/store/db/db.go index 4cc3f57..5ecce84 100644 --- a/store/db/db.go +++ b/store/db/db.go @@ -93,6 +93,10 @@ const ( DATA_SEND_TRANSACTION_TYPE // Holds the recipient formatted phone number DATA_RECIPIENT_PHONE_NUMBER + // holds the current credit of the user + DATA_CURRENT_CREDIT + // holds the current debt of the user + DATA_CURRENT_DEBT ) const ( -- 2.45.2 From cfc38402f0a9efe3a43bb397136ce5bff13c06c1 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 29 Jan 2026 16:14:04 +0300 Subject: [PATCH 09/74] display the credit and debt --- handlers/application/balance.go | 41 +++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/handlers/application/balance.go b/handlers/application/balance.go index f5c0a0b..b27ab28 100644 --- a/handlers/application/balance.go +++ b/handlers/application/balance.go @@ -52,7 +52,25 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt return res, err } } - content, err = loadUserContent(ctx, string(activeSym), string(activeBal), string(accAlias)) + + // get current credit + currentCredit, err := store.ReadEntry(ctx, sessionId, storedb.DATA_CURRENT_CREDIT) + if err != nil { + if !db.IsNotFound(err) { + logg.ErrorCtxf(ctx, "failed to read currentCredit entry with", "key", storedb.DATA_CURRENT_CREDIT, "error", err) + return res, err + } + } + // get current debt + currentDebt, err := store.ReadEntry(ctx, sessionId, storedb.DATA_CURRENT_DEBT) + if err != nil { + if !db.IsNotFound(err) { + logg.ErrorCtxf(ctx, "failed to read currentDebt entry with", "key", storedb.DATA_CURRENT_DEBT, "error", err) + return res, err + } + } + + content, err = loadUserContent(ctx, string(activeSym), string(activeBal), string(accAlias), string(currentCredit), string(currentDebt)) if err != nil { return res, err } @@ -62,7 +80,7 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt } // loadUserContent loads the main user content in the main menu: the alias, balance and active symbol associated with active voucher -func loadUserContent(ctx context.Context, activeSym string, balance string, alias string) (string, error) { +func loadUserContent(ctx context.Context, activeSym, balance, alias, currectCredit, currentDebt string) (string, error) { var content string code := codeFromCtx(ctx) @@ -75,12 +93,25 @@ func loadUserContent(ctx context.Context, activeSym string, balance string, alia formattedAmount = "0.00" } - // format the final output + formattedCredit, err := store.TruncateDecimalString(currectCredit, 0) + if err != nil { + formattedCredit = "0" + } + + formattedDebt, err := store.TruncateDecimalString(currentDebt, 0) + if err != nil { + formattedDebt = "0" + } + + // format the final outputs balStr := fmt.Sprintf("%s %s", formattedAmount, activeSym) + creditStr := fmt.Sprintf("Credit: %s ksh", formattedCredit) + debtStr := fmt.Sprintf("Debt: %s ksh", formattedDebt) + if alias != "" { - content = l.Get("%s\nBalance: %s\n", alias, balStr) + content = l.Get("%s\nBalance: %s\n%s\n%s", alias, balStr, creditStr, debtStr) } else { - content = l.Get("Balance: %s\n", balStr) + content = l.Get("Balance: %s\n%s\n%s", balStr, creditStr, debtStr) } return content, nil } -- 2.45.2 From 6bb87a7b3316edb1294a055dbc35f8b25548a801 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 29 Jan 2026 16:57:00 +0300 Subject: [PATCH 10/74] added the CalculateCreditAndDebt function --- handlers/application/balance.go | 113 ++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/handlers/application/balance.go b/handlers/application/balance.go index b27ab28..dfab8ff 100644 --- a/handlers/application/balance.go +++ b/handlers/application/balance.go @@ -3,11 +3,13 @@ package application import ( "context" "fmt" + "strconv" "git.defalsify.org/vise.git/db" "git.defalsify.org/vise.git/resource" "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" "gopkg.in/leonelquinteros/gotext.v1" ) @@ -129,3 +131,114 @@ func (h *MenuHandlers) FetchCommunityBalance(ctx context.Context, sym string, in res.Content = l.Get("Community Balance: 0.00") return res, nil } + +// CalculateCreditAndDebt calls the API to get the credit and debt +// uses the pretium rates to convert the value to Ksh +func (h *MenuHandlers) CalculateCreditAndDebt(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") + } + + 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") + + // Fetch session data + _, _, activeSym, _, publicKey, _, err := h.getSessionData(ctx, sessionId) + if err != nil { + return res, err + } + + // Get active pool address and symbol or fall back to default + activePoolAddress, _, err := h.resolveActivePoolDetails(ctx, sessionId) + if err != nil { + return res, err + } + + // call the api using the activePoolAddress to get a list of SwapToSymbolsData + swappableVouchers, err := h.accountService.GetPoolSwappableFromVouchers(ctx, string(activePoolAddress), string(publicKey)) + if err != nil { + res.FlagSet = append(res.FlagSet, flag_api_call_error) + logg.ErrorCtxf(ctx, "failed on GetPoolSwappableFromVouchers", "error", err) + return res, err + } + + logg.InfoCtxf(ctx, "GetPoolSwappableFromVouchers", "swappable vouchers", swappableVouchers) + + // Return if there are no vouchers + if len(swappableVouchers) == 0 { + return res, nil + } + + // Find the matching voucher data + activeSymStr := string(activeSym) + var activeData *dataserviceapi.TokenHoldings + for _, voucher := range swappableVouchers { + if voucher.TokenSymbol == activeSymStr { + activeData = &voucher + break + } + } + + if activeData == nil { + logg.InfoCtxf(ctx, "activeSym not found in vouchers, returning 0", "activeSym", activeSymStr) + return res, nil + } + + // Scale down the active balance (credit) + // Max swappable value from pool using the active token + scaledCredit := store.ScaleDownBalance(activeData.Balance, activeData.TokenDecimals) + + // Calculate total debt (sum of other vouchers) + scaledDebt := "0" + + for _, voucher := range swappableVouchers { + // Skip the active token + if voucher.TokenSymbol == activeSymStr { + continue + } + + scaled := store.ScaleDownBalance(voucher.Balance, voucher.TokenDecimals) + + // Add scaled balances (decimal-safe) + scaledDebt = store.AddDecimalStrings(scaledDebt, scaled) + } + + // call the mpesa rates API to get the rates + rates, err := h.accountService.GetMpesaOnrampRates(ctx) + 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 GetMpesaOnrampRates", "error", err) + return res, nil + } + + creditFloat, _ := strconv.ParseFloat(scaledCredit, 64) + creditksh := fmt.Sprintf("%f", creditFloat*rates.Buy) + kshFormattedCredit, _ := store.TruncateDecimalString(creditksh, 0) + + debtFloat, _ := strconv.ParseFloat(scaledDebt, 64) + debtksh := fmt.Sprintf("%f", debtFloat*rates.Buy) + kshFormattedDebt, _ := store.TruncateDecimalString(debtksh, 0) + + dataMap := map[storedb.DataTyp]string{ + storedb.DATA_CURRENT_CREDIT: kshFormattedCredit, + storedb.DATA_CURRENT_DEBT: kshFormattedDebt, + } + + // Write data entries + 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 + } + } + + return res, nil +} -- 2.45.2 From ea9875584fd2666193fb56a0456fe78f46e4324a Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 29 Jan 2026 16:59:02 +0300 Subject: [PATCH 11/74] added the calc_credit_debt to the main.vis and local handler --- handlers/local.go | 1 + services/registration/main.vis | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/handlers/local.go b/handlers/local.go index b3204a1..4c13794 100644 --- a/handlers/local.go +++ b/handlers/local.go @@ -81,6 +81,7 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService) ls.DbRs.AddLocalFunc("check_account_status", appHandlers.CheckAccountStatus) ls.DbRs.AddLocalFunc("authorize_account", appHandlers.Authorize) ls.DbRs.AddLocalFunc("quit", appHandlers.Quit) + ls.DbRs.AddLocalFunc("calc_credit_debt", appHandlers.CalculateCreditAndDebt) ls.DbRs.AddLocalFunc("check_balance", appHandlers.CheckBalance) ls.DbRs.AddLocalFunc("validate_recipient", appHandlers.ValidateRecipient) ls.DbRs.AddLocalFunc("transaction_reset", appHandlers.TransactionReset) diff --git a/services/registration/main.vis b/services/registration/main.vis index d23ae05..2ce38f3 100644 --- a/services/registration/main.vis +++ b/services/registration/main.vis @@ -3,7 +3,10 @@ RELOAD clear_temporary_value LOAD manage_vouchers 160 RELOAD manage_vouchers CATCH api_failure flag_api_call_error 1 -LOAD check_balance 128 +LOAD calc_credit_debt 60 +RELOAD calc_credit_debt +CATCH api_failure flag_api_call_error 1 +LOAD check_balance 148 RELOAD check_balance MAP check_balance MOUT send 1 -- 2.45.2 From 0a69e04229bacda9a9febbdf802892c5b4c38c49 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 29 Jan 2026 17:00:24 +0300 Subject: [PATCH 12/74] added helper functions to add scaled down balances --- store/vouchers.go | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/store/vouchers.go b/store/vouchers.go index efb59ed..dc849c6 100644 --- a/store/vouchers.go +++ b/store/vouchers.go @@ -225,3 +225,46 @@ func FormatVoucherList(ctx context.Context, symbolsData, balancesData string) [] } return combined } + +// AddDecimalStrings adds two decimal numbers represented as strings +// and returns the result as a string without losing precision. +func AddDecimalStrings(a, b string) string { + x, ok := new(big.Rat).SetString(a) + if !ok { + x = new(big.Rat) + } + + y, ok := new(big.Rat).SetString(b) + if !ok { + y = new(big.Rat) + } + + x.Add(x, y) + + // Convert back to string without scientific notation + return x.FloatString(maxDecimalPlaces(x, y)) +} + +// maxDecimalPlaces ensures we preserve enough decimal precision +func maxDecimalPlaces(rats ...*big.Rat) int { + max := 0 + for _, r := range rats { + if r == nil { + continue + } + if d := decimalPlaces(r); d > max { + max = d + } + } + return max +} + +func decimalPlaces(r *big.Rat) int { + s := r.FloatString(18) + for i := len(s) - 1; i >= 0; i-- { + if s[i] == '.' { + return len(s) - i - 1 + } + } + return 0 +} -- 2.45.2 From ead5dd7b8c2f79524e6ef252ace3de0086e1314d Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 29 Jan 2026 17:10:20 +0300 Subject: [PATCH 13/74] store the filtered vouchers from the GetPoolSwappableFromVouchers --- handlers/application/balance.go | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/handlers/application/balance.go b/handlers/application/balance.go index dfab8ff..e3b67ec 100644 --- a/handlers/application/balance.go +++ b/handlers/application/balance.go @@ -176,6 +176,19 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i return res, nil } + // Filter out the active voucher from swappableVouchers + filteredSwappableVouchers := make([]dataserviceapi.TokenHoldings, 0, len(swappableVouchers)) + for _, s := range swappableVouchers { + if s.TokenSymbol != string(activeSym) { + filteredSwappableVouchers = append(filteredSwappableVouchers, s) + } + } + + // Store as filtered swap to list data (excluding the current active voucher) for future reference + data := store.ProcessVouchers(filteredSwappableVouchers) + + logg.InfoCtxf(ctx, "ProcessVouchers", "data", data) + // Find the matching voucher data activeSymStr := string(activeSym) var activeData *dataserviceapi.TokenHoldings @@ -228,8 +241,12 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i kshFormattedDebt, _ := store.TruncateDecimalString(debtksh, 0) dataMap := map[storedb.DataTyp]string{ - storedb.DATA_CURRENT_CREDIT: kshFormattedCredit, - storedb.DATA_CURRENT_DEBT: kshFormattedDebt, + 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, + storedb.DATA_CURRENT_CREDIT: kshFormattedCredit, + storedb.DATA_CURRENT_DEBT: kshFormattedDebt, } // Write data entries -- 2.45.2 From 46e98b5b9ebffc6fea869582fabf7b7ea0fa16a9 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 29 Jan 2026 19:17:38 +0300 Subject: [PATCH 14/74] update the translations --- services/registration/locale/swa/default.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/registration/locale/swa/default.po b/services/registration/locale/swa/default.po index b77b0c6..e1188d7 100644 --- a/services/registration/locale/swa/default.po +++ b/services/registration/locale/swa/default.po @@ -73,8 +73,8 @@ msgstr "Utapokea kidokezo cha PIN yako ya M-Pesa hivi karibuni kutuma %s ksh na 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" -msgstr "Unaweza kuondoa kiwango cha juu cha %s %s kutoka kwenye bwawa la %s.\n" +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 "Please confirm that you will use %s %s to remove your debt of %s %s\n" msgstr "Tafadhali thibitisha kwamba utatumia %s %s kulipa deni lako la %s %s.\nWeka PIN yako:" \ No newline at end of file -- 2.45.2 From a4f036c88d8c8d937b817ec77c83cb4d036627a2 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 29 Jan 2026 19:29:35 +0300 Subject: [PATCH 15/74] remove the amount as it is present in the response content --- services/registration/pay_debt | 3 +-- services/registration/pay_debt_swa | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/services/registration/pay_debt b/services/registration/pay_debt index 6c4e62c..0fa2022 100644 --- a/services/registration/pay_debt +++ b/services/registration/pay_debt @@ -1,2 +1 @@ -{{.calculate_pay_debt}} -Enter amount: \ No newline at end of file +{{.calculate_pay_debt}} \ No newline at end of file diff --git a/services/registration/pay_debt_swa b/services/registration/pay_debt_swa index 1e828f0..0fa2022 100644 --- a/services/registration/pay_debt_swa +++ b/services/registration/pay_debt_swa @@ -1,2 +1 @@ -{{.calculate_pay_debt}} -Weka kiwango: \ No newline at end of file +{{.calculate_pay_debt}} \ No newline at end of file -- 2.45.2 From 88b5a33c2e1b50d2979dfd9d02ee8e4db003afe3 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 29 Jan 2026 19:37:33 +0300 Subject: [PATCH 16/74] update the sym name to be more descriptive --- handlers/local.go | 2 +- services/registration/pay_debt | 2 +- services/registration/pay_debt.vis | 6 +++--- services/registration/pay_debt_swa | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/handlers/local.go b/handlers/local.go index 4c13794..7c4b696 100644 --- a/handlers/local.go +++ b/handlers/local.go @@ -147,7 +147,7 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService) ls.DbRs.AddLocalFunc("send_mpesa_min_limit", appHandlers.SendMpesaMinLimit) ls.DbRs.AddLocalFunc("send_mpesa_preview", appHandlers.SendMpesaPreview) ls.DbRs.AddLocalFunc("initiate_send_mpesa", appHandlers.InitiateSendMpesa) - ls.DbRs.AddLocalFunc("calculate_pay_debt", appHandlers.CalculatePayDebt) + 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) diff --git a/services/registration/pay_debt b/services/registration/pay_debt index 0fa2022..1e2b322 100644 --- a/services/registration/pay_debt +++ b/services/registration/pay_debt @@ -1 +1 @@ -{{.calculate_pay_debt}} \ No newline at end of file +{{.calculate_max_pay_debt}} \ No newline at end of file diff --git a/services/registration/pay_debt.vis b/services/registration/pay_debt.vis index eee4b2c..1b5a819 100644 --- a/services/registration/pay_debt.vis +++ b/services/registration/pay_debt.vis @@ -1,6 +1,6 @@ -LOAD calculate_pay_debt 0 -RELOAD calculate_pay_debt -MAP calculate_pay_debt +LOAD calculate_max_pay_debt 0 +RELOAD calculate_max_pay_debt +MAP calculate_max_pay_debt MOUT back 0 HALT INCMP _ 0 diff --git a/services/registration/pay_debt_swa b/services/registration/pay_debt_swa index 0fa2022..1e2b322 100644 --- a/services/registration/pay_debt_swa +++ b/services/registration/pay_debt_swa @@ -1 +1 @@ -{{.calculate_pay_debt}} \ No newline at end of file +{{.calculate_max_pay_debt}} \ No newline at end of file -- 2.45.2 From 4dfccb3ff2fc176d1ccb0e4d84be48fa079b532e Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 30 Jan 2026 10:22:36 +0300 Subject: [PATCH 17/74] log the correct fields --- handlers/application/poolswap.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handlers/application/poolswap.go b/handlers/application/poolswap.go index 7426cd9..1c6f923 100644 --- a/handlers/application/poolswap.go +++ b/handlers/application/poolswap.go @@ -303,7 +303,7 @@ func (h *MenuHandlers) SwapPreview(ctx context.Context, sym string, input []byte // 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 swap amount entry with", "key", storedb.DATA_ACTIVE_SWAP_AMOUNT, "value", finalAmountStr, "error", err) + logg.ErrorCtxf(ctx, "failed to write inputStr amount entry with", "key", storedb.DATA_TEMPORARY_VALUE, "value", inputStr, "error", err) return res, err } -- 2.45.2 From ca2a50375b1225d8067d92351d807f98ebdf3436 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 30 Jan 2026 15:13:33 +0300 Subject: [PATCH 18/74] added functions to perform the debt removal --- handlers/application/paydebt.go | 263 ++++++++++++++++++++++++++++++++ 1 file changed, 263 insertions(+) create mode 100644 handlers/application/paydebt.go diff --git a/handlers/application/paydebt.go b/handlers/application/paydebt.go new file mode 100644 index 0000000..b60c426 --- /dev/null +++ b/handlers/application/paydebt.go @@ -0,0 +1,263 @@ +package application + +import ( + "context" + "fmt" + "strconv" + + "git.defalsify.org/vise.git/resource" + "git.grassecon.net/grassrootseconomics/sarafu-vise/store" + storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db" + "gopkg.in/leonelquinteros/gotext.v1" +) + +// CalculateMaxPayDebt calculates the max debt removal +func (h *MenuHandlers) CalculateMaxPayDebt(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") + } + + flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error") + flag_low_swap_amount, _ := h.flagManager.GetFlag("flag_low_swap_amount") + + code := codeFromCtx(ctx) + l := gotext.NewLocale(translationDir, code) + l.AddDomain("default") + + inputStr := string(input) + if inputStr == "0" || inputStr == "9" { + return res, nil + } + + userStore := h.userdataStore + + // Resolve active pool + _, activePoolName, err := h.resolveActivePoolDetails(ctx, sessionId) + if err != nil { + return res, err + } + + metadata, err := store.GetSwapToVoucherData(ctx, userStore, sessionId, "1") + 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_api_call_error) + 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, ActiveSwapFromAddress as the to (FT), ActiveSwapToAddress as the from (AT) and PublicKey to get the swap max limit + r, err := h.accountService.GetSwapFromTokenMaxLimit(ctx, swapData.ActivePoolAddress, swapData.ActiveSwapToAddress, swapData.ActiveSwapFromAddress, swapData.PublicKey) + if err != nil { + res.FlagSet = append(res.FlagSet, flag_api_call_error) + 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) + return res, err + } + + // Scale down the amount + maxAmountStr := store.ScaleDownBalance(r.Max, swapData.ActiveSwapFromDecimal) + if err != nil { + return res, err + } + + maxAmountFloat, err := strconv.ParseFloat(maxAmountStr, 64) + if err != nil { + logg.ErrorCtxf(ctx, "failed to parse maxAmountStr as float", "value", maxAmountStr, "error", err) + return res, err + } + + // Format to 2 decimal places + maxStr, _ := store.TruncateDecimalString(string(maxAmountStr), 2) + + if maxAmountFloat < 0.1 { + // return with low amount flag + res.Content = maxStr + res.FlagSet = append(res.FlagSet, flag_low_swap_amount) + return res, nil + } + + err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT, []byte(maxStr)) + if err != nil { + logg.ErrorCtxf(ctx, "failed to write swap max amount entry with", "key", storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT, "value", maxStr, "error", err) + return res, err + } + + res.Content = l.Get( + "You can remove a maximum of %s %s from '%s'\n\nEnter amount of %s:", + maxStr, + swapData.ActiveSwapToSym, + string(activePoolName), + swapData.ActiveSwapToSym, + ) + + return res, nil +} + +// ConfirmDebtRemoval displays the debt preview for a confirmation +func (h *MenuHandlers) ConfirmDebtRemoval(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") + } + + inputStr := string(input) + if inputStr == "0" { + return res, nil + } + + flag_invalid_amount, _ := h.flagManager.GetFlag("flag_invalid_amount") + + code := codeFromCtx(ctx) + l := gotext.NewLocale(translationDir, code) + l.AddDomain("default") + + userStore := h.userdataStore + + swapData, err := store.ReadSwapPreviewData(ctx, userStore, sessionId) + if err != nil { + return res, err + } + + maxValue, err := strconv.ParseFloat(swapData.ActiveSwapMaxAmount, 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 { + res.FlagSet = append(res.FlagSet, flag_invalid_amount) + res.Content = inputStr + return res, nil + } + + // Format the amount to 2 decimal places + formattedAmount, err := store.TruncateDecimalString(inputStr, 2) + if err != nil { + res.FlagSet = append(res.FlagSet, flag_invalid_amount) + res.Content = inputStr + return res, nil + } + + finalAmountStr, err := store.ParseAndScaleAmount(formattedAmount, swapData.ActiveSwapFromDecimal) + if err != nil { + return res, err + } + + err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_SWAP_AMOUNT, []byte(finalAmountStr)) + if err != nil { + 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) + 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(r.OutValue, swapData.ActiveSwapToDecimal) + + // Format to 2 decimal places + qouteStr, _ := store.TruncateDecimalString(string(quoteAmountStr), 2) + + 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, + ) + + return res, nil +} + +// InitiatePayDebt calls the poolSwap to swap the token for the active voucher. +func (h *MenuHandlers) InitiatePayDebt(ctx context.Context, sym string, input []byte) (resource.Result, error) { + var res resource.Result + var err error + sessionId, ok := ctx.Value("SessionId").(string) + if !ok { + return res, fmt.Errorf("missing session") + } + + flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized") + + code := codeFromCtx(ctx) + l := gotext.NewLocale(translationDir, code) + l.AddDomain("default") + + userStore := h.userdataStore + + // Resolve active pool + _, activePoolName, err := h.resolveActivePoolDetails(ctx, sessionId) + if err != nil { + return res, err + } + + swapData, err := store.ReadSwapPreviewData(ctx, userStore, sessionId) + if err != nil { + 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) + 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) + 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 + } + + trackingId := r.TrackingId + logg.InfoCtxf(ctx, "poolSwap", "trackingId", trackingId) + + 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.ActiveSwapFromSym, + activePoolName, + ) + + res.FlagReset = append(res.FlagReset, flag_account_authorized) + return res, nil +} -- 2.45.2 From 277e4e179d88eaeb491a2a58d782f6955ade91fd Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 30 Jan 2026 16:33:44 +0300 Subject: [PATCH 19/74] added a CATCH for a low amount response from the API --- services/registration/low_pay_debt_amount | 1 + services/registration/low_pay_debt_amount.vis | 5 +++++ services/registration/low_pay_debt_amount_swa | 1 + services/registration/pay_debt.vis | 1 + 4 files changed, 8 insertions(+) create mode 100644 services/registration/low_pay_debt_amount create mode 100644 services/registration/low_pay_debt_amount.vis create mode 100644 services/registration/low_pay_debt_amount_swa diff --git a/services/registration/low_pay_debt_amount b/services/registration/low_pay_debt_amount new file mode 100644 index 0000000..56f14ae --- /dev/null +++ b/services/registration/low_pay_debt_amount @@ -0,0 +1 @@ +You have a low debt amount \ No newline at end of file diff --git a/services/registration/low_pay_debt_amount.vis b/services/registration/low_pay_debt_amount.vis new file mode 100644 index 0000000..832ef22 --- /dev/null +++ b/services/registration/low_pay_debt_amount.vis @@ -0,0 +1,5 @@ +MOUT back 0 +MOUT quit 9 +HALT +INCMP ^ 0 +INCMP quit 9 diff --git a/services/registration/low_pay_debt_amount_swa b/services/registration/low_pay_debt_amount_swa new file mode 100644 index 0000000..26fcfc0 --- /dev/null +++ b/services/registration/low_pay_debt_amount_swa @@ -0,0 +1 @@ +Kiasi cha deni lako ni cha chini sana \ No newline at end of file diff --git a/services/registration/pay_debt.vis b/services/registration/pay_debt.vis index 1b5a819..91bdf8e 100644 --- a/services/registration/pay_debt.vis +++ b/services/registration/pay_debt.vis @@ -1,6 +1,7 @@ LOAD calculate_max_pay_debt 0 RELOAD calculate_max_pay_debt MAP calculate_max_pay_debt +CATCH low_pay_debt_amount flag_low_swap_amount 1 MOUT back 0 HALT INCMP _ 0 -- 2.45.2 From 99893eac5c0d0a6c13711e9bd96dad5c7b782225 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 30 Jan 2026 16:34:52 +0300 Subject: [PATCH 20/74] include the ActiveSwapToDecimal on the SwapData --- store/swap.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/store/swap.go b/store/swap.go index 3510720..097ad4a 100644 --- a/store/swap.go +++ b/store/swap.go @@ -18,6 +18,7 @@ type SwapData struct { ActiveSwapFromAddress string ActiveSwapToSym string ActiveSwapToAddress string + ActiveSwapToDecimal string } type SwapPreviewData struct { @@ -43,6 +44,7 @@ func ReadSwapData(ctx context.Context, store DataStore, sessionId string) (SwapD "ActiveSwapFromAddress": storedb.DATA_ACTIVE_ADDRESS, "ActiveSwapToSym": storedb.DATA_ACTIVE_SWAP_TO_SYM, "ActiveSwapToAddress": storedb.DATA_ACTIVE_SWAP_TO_ADDRESS, + "ActiveSwapToDecimal": storedb.DATA_ACTIVE_SWAP_TO_DECIMAL, } v := reflect.ValueOf(&data).Elem() -- 2.45.2 From 3949959aa36e9153a98019f4ce4d816e93989a6f Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 30 Jan 2026 16:41:44 +0300 Subject: [PATCH 21/74] use the correct terms for clarity --- handlers/application/paydebt.go | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/handlers/application/paydebt.go b/handlers/application/paydebt.go index b60c426..086b660 100644 --- a/handlers/application/paydebt.go +++ b/handlers/application/paydebt.go @@ -61,7 +61,7 @@ func (h *MenuHandlers) CalculateMaxPayDebt(ctx context.Context, sym string, inpu return res, err } - // call the api using the ActivePoolAddress, ActiveSwapFromAddress as the to (FT), ActiveSwapToAddress as the from (AT) and PublicKey to get the swap max limit + // 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) if err != nil { res.FlagSet = append(res.FlagSet, flag_api_call_error) @@ -76,7 +76,7 @@ func (h *MenuHandlers) CalculateMaxPayDebt(ctx context.Context, sym string, inpu } // Scale down the amount - maxAmountStr := store.ScaleDownBalance(r.Max, swapData.ActiveSwapFromDecimal) + maxAmountStr := store.ScaleDownBalance(r.Max, swapData.ActiveSwapToDecimal) if err != nil { return res, err } @@ -153,17 +153,16 @@ func (h *MenuHandlers) ConfirmDebtRemoval(ctx context.Context, sym string, input return res, nil } - // Format the amount to 2 decimal places - formattedAmount, err := store.TruncateDecimalString(inputStr, 2) - if err != nil { - res.FlagSet = append(res.FlagSet, flag_invalid_amount) - res.Content = inputStr - return res, nil - } + storedMax, _ := userStore.ReadEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE) - finalAmountStr, err := store.ParseAndScaleAmount(formattedAmount, swapData.ActiveSwapFromDecimal) - if err != nil { - return res, err + var finalAmountStr string + if inputStr == swapData.ActiveSwapMaxAmount { + finalAmountStr = string(storedMax) + } else { + finalAmountStr, err = store.ParseAndScaleAmount(inputStr, swapData.ActiveSwapToDecimal) + if err != nil { + return res, err + } } err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_SWAP_AMOUNT, []byte(finalAmountStr)) @@ -254,7 +253,7 @@ 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.ActiveSwapFromSym, + swapData.ActiveSwapToSym, activePoolName, ) -- 2.45.2 From 0b3b407ab7876500acb772e66f5294e31aafe30d Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Tue, 3 Feb 2026 13:31:44 +0300 Subject: [PATCH 22/74] add a CATCH for users who do not have vouchers --- services/registration/pay_debt.vis | 1 + 1 file changed, 1 insertion(+) diff --git a/services/registration/pay_debt.vis b/services/registration/pay_debt.vis index 91bdf8e..94fcc99 100644 --- a/services/registration/pay_debt.vis +++ b/services/registration/pay_debt.vis @@ -1,3 +1,4 @@ +CATCH no_voucher flag_no_active_voucher 1 LOAD calculate_max_pay_debt 0 RELOAD calculate_max_pay_debt MAP calculate_max_pay_debt -- 2.45.2 From 85b8775fd0b03fa0c4b73dc0125388767d2a0e4a Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Tue, 3 Feb 2026 13:32:13 +0300 Subject: [PATCH 23/74] return nil instead of an error to prevent failure --- handlers/application/balance.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/handlers/application/balance.go b/handlers/application/balance.go index e3b67ec..d2d92d7 100644 --- a/handlers/application/balance.go +++ b/handlers/application/balance.go @@ -152,7 +152,8 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i // Fetch session data _, _, activeSym, _, publicKey, _, err := h.getSessionData(ctx, sessionId) if err != nil { - return res, err + // return if the user does not have an active voucher + return res, nil } // Get active pool address and symbol or fall back to default @@ -166,7 +167,7 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i if err != nil { res.FlagSet = append(res.FlagSet, flag_api_call_error) logg.ErrorCtxf(ctx, "failed on GetPoolSwappableFromVouchers", "error", err) - return res, err + return res, nil } logg.InfoCtxf(ctx, "GetPoolSwappableFromVouchers", "swappable vouchers", swappableVouchers) -- 2.45.2 From 42f7b0f8a792154e595028b8c3aa19f03f221bf6 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Tue, 3 Feb 2026 13:34:05 +0300 Subject: [PATCH 24/74] remove the api failure flag if no swappable vouchers are found --- handlers/application/balance.go | 1 - 1 file changed, 1 deletion(-) diff --git a/handlers/application/balance.go b/handlers/application/balance.go index d2d92d7..5a6c1b2 100644 --- a/handlers/application/balance.go +++ b/handlers/application/balance.go @@ -165,7 +165,6 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i // call the api using the activePoolAddress to get a list of SwapToSymbolsData swappableVouchers, err := h.accountService.GetPoolSwappableFromVouchers(ctx, string(activePoolAddress), string(publicKey)) if err != nil { - res.FlagSet = append(res.FlagSet, flag_api_call_error) logg.ErrorCtxf(ctx, "failed on GetPoolSwappableFromVouchers", "error", err) return res, nil } -- 2.45.2 From 9ef27fda14e7c8c262bccbc4c48f08147269bf76 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Tue, 3 Feb 2026 13:36:14 +0300 Subject: [PATCH 25/74] reset the api_call_error flag --- handlers/application/balance.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/handlers/application/balance.go b/handlers/application/balance.go index 5a6c1b2..6702cf8 100644 --- a/handlers/application/balance.go +++ b/handlers/application/balance.go @@ -149,6 +149,8 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error") + res.FlagReset = append(res.FlagReset, flag_api_call_error) + // Fetch session data _, _, activeSym, _, publicKey, _, err := h.getSessionData(ctx, sessionId) if err != nil { -- 2.45.2 From fd7b3af57c255f77b7ed4c37935142e343bb9fa5 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Tue, 3 Feb 2026 14:19:10 +0300 Subject: [PATCH 26/74] added next and prev inputs for long menus --- services/registration/main.vis | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/registration/main.vis b/services/registration/main.vis index 2ce38f3..c4e4ca6 100644 --- a/services/registration/main.vis +++ b/services/registration/main.vis @@ -18,6 +18,8 @@ MOUT mpesa 6 MOUT account 7 MOUT help 8 MOUT quit 9 +MNEXT next 11 +MPREV prev 22 HALT INCMP credit_send 1 INCMP pay_debt 2 @@ -28,4 +30,6 @@ INCMP mpesa 6 INCMP my_account 7 INCMP help 8 INCMP quit 9 +INCMP > 11 +INCMP < 22 INCMP . * -- 2.45.2 From 94b2eca1866948f4da0f541f98b2af0f1e17ad39 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Tue, 3 Feb 2026 14:23:21 +0300 Subject: [PATCH 27/74] debug: change the size outputs --- services/registration/main.vis | 2 +- services/registration/root.vis | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/registration/main.vis b/services/registration/main.vis index c4e4ca6..0c903b6 100644 --- a/services/registration/main.vis +++ b/services/registration/main.vis @@ -1,6 +1,6 @@ LOAD clear_temporary_value 2 RELOAD clear_temporary_value -LOAD manage_vouchers 160 +LOAD manage_vouchers 0 RELOAD manage_vouchers CATCH api_failure flag_api_call_error 1 LOAD calc_credit_debt 60 diff --git a/services/registration/root.vis b/services/registration/root.vis index 035db83..921ac98 100644 --- a/services/registration/root.vis +++ b/services/registration/root.vis @@ -7,7 +7,7 @@ CATCH blocked_account flag_account_blocked 1 CATCH select_language flag_language_set 0 CATCH terms flag_account_created 0 CATCH create_pin flag_pin_set 0 -LOAD check_account_status 0 +LOAD check_account_status 40 RELOAD check_account_status CATCH api_failure flag_api_call_error 1 CATCH account_pending flag_account_pending 1 -- 2.45.2 From 70ae3c7818bbbc3005cfeac269612fc8af352508 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Tue, 3 Feb 2026 14:32:21 +0300 Subject: [PATCH 28/74] debug: shorten the displayed content --- handlers/application/balance.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/handlers/application/balance.go b/handlers/application/balance.go index 6702cf8..2b6463b 100644 --- a/handlers/application/balance.go +++ b/handlers/application/balance.go @@ -107,13 +107,13 @@ func loadUserContent(ctx context.Context, activeSym, balance, alias, currectCred // format the final outputs balStr := fmt.Sprintf("%s %s", formattedAmount, activeSym) - creditStr := fmt.Sprintf("Credit: %s ksh", formattedCredit) - debtStr := fmt.Sprintf("Debt: %s ksh", formattedDebt) + creditStr := fmt.Sprintf("C: %s ksh", formattedCredit) + debtStr := fmt.Sprintf("D: %s ksh", formattedDebt) if alias != "" { - content = l.Get("%s\nBalance: %s\n%s\n%s", alias, balStr, creditStr, debtStr) + content = l.Get("%s\nBal: %s\n%s\n%s", alias, balStr, creditStr, debtStr) } else { - content = l.Get("Balance: %s\n%s\n%s", balStr, creditStr, debtStr) + content = l.Get("Bal: %s\n%s\n%s", balStr, creditStr, debtStr) } return content, nil } -- 2.45.2 From e4c10d23d3d8c8ccc0be1be9df798e8d95c67cc1 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Tue, 3 Feb 2026 16:49:11 +0300 Subject: [PATCH 29/74] reset the flags to clear out old states --- handlers/application/paydebt.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/handlers/application/paydebt.go b/handlers/application/paydebt.go index 086b660..896dabd 100644 --- a/handlers/application/paydebt.go +++ b/handlers/application/paydebt.go @@ -28,6 +28,7 @@ func (h *MenuHandlers) CalculateMaxPayDebt(ctx context.Context, sym string, inpu inputStr := string(input) if inputStr == "0" || inputStr == "9" { + res.FlagReset = append(res.FlagReset, flag_low_swap_amount, flag_api_call_error) return res, nil } @@ -36,11 +37,13 @@ func (h *MenuHandlers) CalculateMaxPayDebt(ctx context.Context, sym string, inpu // Resolve active pool _, activePoolName, 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") 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) } if metadata == nil { @@ -111,6 +114,8 @@ func (h *MenuHandlers) CalculateMaxPayDebt(ctx context.Context, sym string, inpu swapData.ActiveSwapToSym, ) + res.FlagReset = append(res.FlagReset, flag_low_swap_amount, flag_api_call_error) + return res, nil } -- 2.45.2 From 7783ba8835f0a942cf35048216468cfabb6c4a3e Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Tue, 3 Feb 2026 17:02:44 +0300 Subject: [PATCH 30/74] removed unused data keys --- store/db/db.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/store/db/db.go b/store/db/db.go index 5ecce84..4cc3f57 100644 --- a/store/db/db.go +++ b/store/db/db.go @@ -93,10 +93,6 @@ const ( DATA_SEND_TRANSACTION_TYPE // Holds the recipient formatted phone number DATA_RECIPIENT_PHONE_NUMBER - // holds the current credit of the user - DATA_CURRENT_CREDIT - // holds the current debt of the user - DATA_CURRENT_DEBT ) const ( -- 2.45.2 From 6a4909b8a1bd4f9b9dd794937c722bd27a3aabc8 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Tue, 3 Feb 2026 17:03:38 +0300 Subject: [PATCH 31/74] separate the main balance from the credit and debt calculation and UI --- handlers/application/balance.go | 43 ++++++--------------------------- 1 file changed, 8 insertions(+), 35 deletions(-) diff --git a/handlers/application/balance.go b/handlers/application/balance.go index 2b6463b..b0db61a 100644 --- a/handlers/application/balance.go +++ b/handlers/application/balance.go @@ -55,24 +55,7 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt } } - // get current credit - currentCredit, err := store.ReadEntry(ctx, sessionId, storedb.DATA_CURRENT_CREDIT) - if err != nil { - if !db.IsNotFound(err) { - logg.ErrorCtxf(ctx, "failed to read currentCredit entry with", "key", storedb.DATA_CURRENT_CREDIT, "error", err) - return res, err - } - } - // get current debt - currentDebt, err := store.ReadEntry(ctx, sessionId, storedb.DATA_CURRENT_DEBT) - if err != nil { - if !db.IsNotFound(err) { - logg.ErrorCtxf(ctx, "failed to read currentDebt entry with", "key", storedb.DATA_CURRENT_DEBT, "error", err) - return res, err - } - } - - content, err = loadUserContent(ctx, string(activeSym), string(activeBal), string(accAlias), string(currentCredit), string(currentDebt)) + content, err = loadUserContent(ctx, string(activeSym), string(activeBal), string(accAlias)) if err != nil { return res, err } @@ -82,7 +65,7 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt } // loadUserContent loads the main user content in the main menu: the alias, balance and active symbol associated with active voucher -func loadUserContent(ctx context.Context, activeSym, balance, alias, currectCredit, currentDebt string) (string, error) { +func loadUserContent(ctx context.Context, activeSym, balance, alias string) (string, error) { var content string code := codeFromCtx(ctx) @@ -95,25 +78,13 @@ func loadUserContent(ctx context.Context, activeSym, balance, alias, currectCred formattedAmount = "0.00" } - formattedCredit, err := store.TruncateDecimalString(currectCredit, 0) - if err != nil { - formattedCredit = "0" - } - - formattedDebt, err := store.TruncateDecimalString(currentDebt, 0) - if err != nil { - formattedDebt = "0" - } - // format the final outputs balStr := fmt.Sprintf("%s %s", formattedAmount, activeSym) - creditStr := fmt.Sprintf("C: %s ksh", formattedCredit) - debtStr := fmt.Sprintf("D: %s ksh", formattedDebt) if alias != "" { - content = l.Get("%s\nBal: %s\n%s\n%s", alias, balStr, creditStr, debtStr) + content = l.Get("%s\nBalance: %s\n", alias, balStr) } else { - content = l.Get("Bal: %s\n%s\n%s", balStr, creditStr, debtStr) + content = l.Get("Balance: %s\n", balStr) } return content, nil } @@ -149,7 +120,9 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error") + // set the default flag set/reset and content 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) @@ -247,8 +220,6 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i storedb.DATA_POOL_TO_BALANCES: data.Balances, storedb.DATA_POOL_TO_DECIMALS: data.Decimals, storedb.DATA_POOL_TO_ADDRESSES: data.Addresses, - storedb.DATA_CURRENT_CREDIT: kshFormattedCredit, - storedb.DATA_CURRENT_DEBT: kshFormattedDebt, } // Write data entries @@ -259,5 +230,7 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i } } + res.Content = l.Get("Credit: %s KSH\nDebt: %s KSH\n", kshFormattedCredit, kshFormattedDebt) + return res, nil } -- 2.45.2 From 0f7be3147e501f66ff7c014b296b1b98f0c298b9 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Tue, 3 Feb 2026 17:04:58 +0300 Subject: [PATCH 32/74] move the pay debt functionality to the mpesa menu --- services/registration/main.vis | 35 ++++++++++++--------------------- services/registration/mpesa | 2 +- services/registration/mpesa.vis | 17 +++++++++++----- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/services/registration/main.vis b/services/registration/main.vis index 0c903b6..1766c10 100644 --- a/services/registration/main.vis +++ b/services/registration/main.vis @@ -1,35 +1,26 @@ LOAD clear_temporary_value 2 RELOAD clear_temporary_value -LOAD manage_vouchers 0 +LOAD manage_vouchers 160 RELOAD manage_vouchers CATCH api_failure flag_api_call_error 1 -LOAD calc_credit_debt 60 -RELOAD calc_credit_debt -CATCH api_failure flag_api_call_error 1 LOAD check_balance 148 RELOAD check_balance MAP check_balance MOUT send 1 -MOUT pay_debt 2 -MOUT swap 3 -MOUT vouchers 4 -MOUT select_pool 5 -MOUT mpesa 6 -MOUT account 7 -MOUT help 8 +MOUT swap 2 +MOUT vouchers 3 +MOUT select_pool 4 +MOUT mpesa 5 +MOUT account 6 +MOUT help 7 MOUT quit 9 -MNEXT next 11 -MPREV prev 22 HALT INCMP credit_send 1 -INCMP pay_debt 2 -INCMP swap_to_list 3 -INCMP my_vouchers 4 -INCMP select_pool 5 -INCMP mpesa 6 -INCMP my_account 7 -INCMP help 8 +INCMP swap_to_list 2 +INCMP my_vouchers 3 +INCMP select_pool 4 +INCMP mpesa 5 +INCMP my_account 6 +INCMP help 7 INCMP quit 9 -INCMP > 11 -INCMP < 22 INCMP . * diff --git a/services/registration/mpesa b/services/registration/mpesa index afae8c1..61e50b4 100644 --- a/services/registration/mpesa +++ b/services/registration/mpesa @@ -1 +1 @@ -{{.check_balance}} \ No newline at end of file +{{.calc_credit_debt}} \ No newline at end of file diff --git a/services/registration/mpesa.vis b/services/registration/mpesa.vis index a51c002..91e75ae 100644 --- a/services/registration/mpesa.vis +++ b/services/registration/mpesa.vis @@ -1,9 +1,16 @@ -MAP check_balance -MOUT get_mpesa 1 -MOUT send_mpesa 2 +LOAD calc_credit_debt 150 +RELOAD calc_credit_debt +CATCH api_failure flag_api_call_error 1 +MAP calc_credit_debt +MOUT pay_debt 1 +MOUT get_mpesa 2 +MOUT send_mpesa 3 +MOUT back 0 MOUT quit 9 HALT -INCMP get_mpesa 1 -INCMP send_mpesa 2 +INCMP ^ 0 +INCMP pay_debt 1 +INCMP get_mpesa 2 +INCMP send_mpesa 3 INCMP quit 9 INCMP . * -- 2.45.2 From 7b461d9b640800c8c15964803cb73b9acacb9f17 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Wed, 4 Feb 2026 16:17:07 +0300 Subject: [PATCH 33/74] add the env example for the Stable vouchers addresses --- .env.example | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.env.example b/.env.example index 3b311ed..2afa594 100644 --- a/.env.example +++ b/.env.example @@ -37,3 +37,6 @@ MAX_MPESA_SEND_AMOUNT=250000 DEFAULT_MPESA_ASSET=cUSD MPESA_BEARER_TOKEN=eyJeSIsInRcCI6IkpXVCJ.yJwdWJsaWNLZXkiOiIwrrrrrr MPESA_ONRAMP_BASE=https://pretium.v1.grassecon.net + +# Stable vouchers allowed for Pay Debt (USDT, USDm) +STABLE_VOUCHER_ADDRESSES=0x48065fbBE25f71C9282ddf5e1cD6D6A887483D5e,0x765DE816845861e75A25fCA122bb6898B8B1282a -- 2.45.2 From f77c82f418a4a240898a1710a68384984ce7323e Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Wed, 4 Feb 2026 16:21:25 +0300 Subject: [PATCH 34/74] added a flag for flag_no_pay_debt_vouchers --- services/registration/pp.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/services/registration/pp.csv b/services/registration/pp.csv index 16fccbd..92ba16d 100644 --- a/services/registration/pp.csv +++ b/services/registration/pp.csv @@ -36,3 +36,4 @@ flag,flag_incorrect_pool,42,this is set when the user selects an invalid pool flag,flag_low_swap_amount,43,this is set when the swap max limit is less than 0.1 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_pay_debt_vouchers,46,this is set when the user does not have a stable voucher to pay debt -- 2.45.2 From 3a4f824ab9eddde1388d9670f6fd97b7ec1385c3 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Wed, 4 Feb 2026 16:31:32 +0300 Subject: [PATCH 35/74] added a CATCH when no stable voucher exists during the pay debt --- services/registration/no_stable_voucher | 1 + services/registration/no_stable_voucher.vis | 5 +++++ services/registration/no_stable_voucher_swa | 1 + services/registration/pay_debt.vis | 1 + 4 files changed, 8 insertions(+) create mode 100644 services/registration/no_stable_voucher create mode 100644 services/registration/no_stable_voucher.vis create mode 100644 services/registration/no_stable_voucher_swa diff --git a/services/registration/no_stable_voucher b/services/registration/no_stable_voucher new file mode 100644 index 0000000..2988bb3 --- /dev/null +++ b/services/registration/no_stable_voucher @@ -0,0 +1 @@ +No stable voucher found \ No newline at end of file diff --git a/services/registration/no_stable_voucher.vis b/services/registration/no_stable_voucher.vis new file mode 100644 index 0000000..832ef22 --- /dev/null +++ b/services/registration/no_stable_voucher.vis @@ -0,0 +1,5 @@ +MOUT back 0 +MOUT quit 9 +HALT +INCMP ^ 0 +INCMP quit 9 diff --git a/services/registration/no_stable_voucher_swa b/services/registration/no_stable_voucher_swa new file mode 100644 index 0000000..ab8cbf2 --- /dev/null +++ b/services/registration/no_stable_voucher_swa @@ -0,0 +1 @@ +Hakuna sarafu thabiti iliyopatikana \ No newline at end of file diff --git a/services/registration/pay_debt.vis b/services/registration/pay_debt.vis index 94fcc99..147fe06 100644 --- a/services/registration/pay_debt.vis +++ b/services/registration/pay_debt.vis @@ -1,4 +1,5 @@ CATCH no_voucher flag_no_active_voucher 1 +CATCH no_stable_voucher flag_no_pay_debt_vouchers 1 LOAD calculate_max_pay_debt 0 RELOAD calculate_max_pay_debt MAP calculate_max_pay_debt -- 2.45.2 From ce36e584dde347263e95ea1cb9c1d820bf0b1ff8 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Wed, 4 Feb 2026 16:35:07 +0300 Subject: [PATCH 36/74] check whether any of the users vouchers are stables or set a flag --- config/config.go | 19 +++++++ handlers/application/balance.go | 88 +++++++++++++++++---------------- handlers/application/paydebt.go | 12 +++++ 3 files changed, 77 insertions(+), 42 deletions(-) diff --git a/config/config.go b/config/config.go index 522e9cb..7ee27e0 100644 --- a/config/config.go +++ b/config/config.go @@ -114,3 +114,22 @@ func MaxMpesaSendAmount() float64 { func DefaultMpesaAsset() string { return env.GetEnv("DEFAULT_MPESA_ASSET", "") } + +func StableVoucherAddresses() []string { + var parsed []string + + raw := env.GetEnv("STABLE_VOUCHER_ADDRESSES", "") + if raw == "" { + return parsed + } + + list := strings.Split(raw, ",") + for _, addr := range list { + clean := strings.ToLower(strings.TrimSpace(addr)) + if clean != "" { + parsed = append(parsed, clean) + } + } + + return parsed +} \ No newline at end of file diff --git a/handlers/application/balance.go b/handlers/application/balance.go index b0db61a..b45e369 100644 --- a/handlers/application/balance.go +++ b/handlers/application/balance.go @@ -119,86 +119,85 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i l.AddDomain("default") flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error") + flag_no_pay_debt_vouchers, _ := h.flagManager.GetFlag("flag_no_pay_debt_vouchers") - // set the default flag set/reset and content + // 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) if err != nil { - // return if the user does not have an active voucher return res, nil } - // Get active pool address and symbol or fall back to default + // Resolve active pool activePoolAddress, _, err := h.resolveActivePoolDetails(ctx, sessionId) if err != nil { return res, err } - // call the api using the activePoolAddress to get a list of SwapToSymbolsData + // Fetch swappable vouchers swappableVouchers, err := h.accountService.GetPoolSwappableFromVouchers(ctx, string(activePoolAddress), string(publicKey)) if err != nil { logg.ErrorCtxf(ctx, "failed on GetPoolSwappableFromVouchers", "error", err) return res, nil } - logg.InfoCtxf(ctx, "GetPoolSwappableFromVouchers", "swappable vouchers", swappableVouchers) - - // Return if there are no vouchers if len(swappableVouchers) == 0 { return res, nil } - // Filter out the active voucher from swappableVouchers - filteredSwappableVouchers := make([]dataserviceapi.TokenHoldings, 0, len(swappableVouchers)) - for _, s := range swappableVouchers { - if s.TokenSymbol != string(activeSym) { - filteredSwappableVouchers = append(filteredSwappableVouchers, s) + // 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) } } - // Store as filtered swap to list data (excluding the current active voucher) for future reference + // No stable vouchers → cannot pay debt + if len(filteredSwappableVouchers) == 0 { + res.FlagSet = append(res.FlagSet, flag_no_pay_debt_vouchers) + return res, nil + } + + res.FlagReset = append(res.FlagReset, flag_no_pay_debt_vouchers) + + // Process stable vouchers for later use data := store.ProcessVouchers(filteredSwappableVouchers) - logg.InfoCtxf(ctx, "ProcessVouchers", "data", data) - - // Find the matching voucher data + // Find active voucher data activeSymStr := string(activeSym) var activeData *dataserviceapi.TokenHoldings - for _, voucher := range swappableVouchers { - if voucher.TokenSymbol == activeSymStr { - activeData = &voucher + for _, v := range swappableVouchers { + if v.TokenSymbol == activeSymStr { + activeData = &v break } } if activeData == nil { - logg.InfoCtxf(ctx, "activeSym not found in vouchers, returning 0", "activeSym", activeSymStr) return res, nil } - // Scale down the active balance (credit) - // Max swappable value from pool using the active token - scaledCredit := store.ScaleDownBalance(activeData.Balance, activeData.TokenDecimals) + // Credit = active voucher balance + scaledCredit := store.ScaleDownBalance( + activeData.Balance, + activeData.TokenDecimals, + ) - // Calculate total debt (sum of other vouchers) + // Debt = sum of stable vouchers only scaledDebt := "0" - - for _, voucher := range swappableVouchers { - // Skip the active token - if voucher.TokenSymbol == activeSymStr { - continue - } - - scaled := store.ScaleDownBalance(voucher.Balance, voucher.TokenDecimals) - - // Add scaled balances (decimal-safe) + for _, v := range filteredSwappableVouchers { + scaled := store.ScaleDownBalance(v.Balance, v.TokenDecimals) scaledDebt = store.AddDecimalStrings(scaledDebt, scaled) } - // call the mpesa rates API to get the rates + // Fetch MPESA rates rates, err := h.accountService.GetMpesaOnrampRates(ctx) if err != nil { res.FlagSet = append(res.FlagSet, flag_api_call_error) @@ -208,13 +207,15 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i } creditFloat, _ := strconv.ParseFloat(scaledCredit, 64) - creditksh := fmt.Sprintf("%f", creditFloat*rates.Buy) - kshFormattedCredit, _ := store.TruncateDecimalString(creditksh, 0) - debtFloat, _ := strconv.ParseFloat(scaledDebt, 64) - debtksh := fmt.Sprintf("%f", debtFloat*rates.Buy) - kshFormattedDebt, _ := store.TruncateDecimalString(debtksh, 0) + 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, @@ -222,7 +223,6 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i storedb.DATA_POOL_TO_ADDRESSES: data.Addresses, } - // Write data entries 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) @@ -230,7 +230,11 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i } } - res.Content = l.Get("Credit: %s KSH\nDebt: %s KSH\n", kshFormattedCredit, kshFormattedDebt) + res.Content = l.Get( + "Credit: %s KSH\nDebt: %s KSH\n", + kshFormattedCredit, + kshFormattedDebt, + ) return res, nil } diff --git a/handlers/application/paydebt.go b/handlers/application/paydebt.go index 896dabd..d38ed6c 100644 --- a/handlers/application/paydebt.go +++ b/handlers/application/paydebt.go @@ -4,8 +4,10 @@ import ( "context" "fmt" "strconv" + "strings" "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" "gopkg.in/leonelquinteros/gotext.v1" @@ -265,3 +267,13 @@ func (h *MenuHandlers) InitiatePayDebt(ctx context.Context, sym string, input [] res.FlagReset = append(res.FlagReset, flag_account_authorized) return res, nil } + +func isStableVoucher(tokenAddress string) bool { + addr := strings.ToLower(strings.TrimSpace(tokenAddress)) + for _, stable := range config.StableVoucherAddresses() { + if addr == stable { + return true + } + } + return false +} -- 2.45.2 From c57aa220e669ae79892fe1bc2e7652206b9f5cc6 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Wed, 4 Feb 2026 17:02:24 +0300 Subject: [PATCH 37/74] show a default message if the user only has 1 voucher --- handlers/application/vouchers.go | 17 ++++++++++++++++- services/registration/select_voucher | 1 - 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/handlers/application/vouchers.go b/handlers/application/vouchers.go index 1d9d9aa..895d9c6 100644 --- a/handlers/application/vouchers.go +++ b/handlers/application/vouchers.go @@ -181,8 +181,18 @@ func (h *MenuHandlers) GetVoucherList(ctx context.Context, sym string, input []b return res, fmt.Errorf("missing session") } + code := codeFromCtx(ctx) + l := gotext.NewLocale(translationDir, code) + l.AddDomain("default") + userStore := h.userdataStore + // Fetch session data + _, _, activeSym, _, _, _, err := h.getSessionData(ctx, sessionId) + if err != nil { + return res, nil + } + // Read vouchers from the store voucherData, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_VOUCHER_SYMBOLS) logg.InfoCtxf(ctx, "reading voucherData in GetVoucherList", "sessionId", sessionId, "key", storedb.DATA_VOUCHER_SYMBOLS, "voucherData", voucherData) @@ -191,6 +201,11 @@ func (h *MenuHandlers) GetVoucherList(ctx context.Context, sym string, input []b return res, err } + if len(voucherData) == 0 { + res.Content = l.Get("Your active voucher %s is already set", string(activeSym)) + return res, nil + } + voucherBalances, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_VOUCHER_BALANCES) logg.InfoCtxf(ctx, "reading voucherBalances in GetVoucherList", "sessionId", sessionId, "key", storedb.DATA_VOUCHER_BALANCES, "voucherBalances", voucherBalances) if err != nil { @@ -203,7 +218,7 @@ func (h *MenuHandlers) GetVoucherList(ctx context.Context, sym string, input []b logg.InfoCtxf(ctx, "final output for GetVoucherList", "sessionId", sessionId, "finalOutput", finalOutput) - res.Content = finalOutput + res.Content = l.Get("Select number or symbol from your vouchers:\n%s", finalOutput) return res, nil } diff --git a/services/registration/select_voucher b/services/registration/select_voucher index 084b9b8..ed8140f 100644 --- a/services/registration/select_voucher +++ b/services/registration/select_voucher @@ -1,2 +1 @@ -Select number or symbol from your vouchers: {{.get_vouchers}} \ No newline at end of file -- 2.45.2 From 8223a0b4d5c544c2c9c6aa683c2a57f4af3c1099 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Wed, 4 Feb 2026 17:02:50 +0300 Subject: [PATCH 38/74] added translations for voucher selection --- services/registration/locale/swa/default.po | 8 +++++++- services/registration/select_voucher_swa | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 services/registration/select_voucher_swa diff --git a/services/registration/locale/swa/default.po b/services/registration/locale/swa/default.po index e1188d7..2892ce8 100644 --- a/services/registration/locale/swa/default.po +++ b/services/registration/locale/swa/default.po @@ -77,4 +77,10 @@ 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 "Please confirm that you will use %s %s to remove your debt of %s %s\n" -msgstr "Tafadhali thibitisha kwamba utatumia %s %s kulipa deni lako la %s %s.\nWeka PIN yako:" \ No newline at end of file +msgstr "Tafadhali thibitisha kwamba utatumia %s %s kulipa deni lako la %s %s.\nWeka PIN yako:" + +msgid "Your active voucher %s is already set" +msgstr "Sarafu yako %s ishachaguliwa" + +msgid "Select number or symbol from your vouchers:\n%s" +msgstr "Chagua nambari au ishara kutoka kwa sarafu zako:\n%s" \ No newline at end of file diff --git a/services/registration/select_voucher_swa b/services/registration/select_voucher_swa deleted file mode 100644 index b4720bf..0000000 --- a/services/registration/select_voucher_swa +++ /dev/null @@ -1,2 +0,0 @@ -Chagua nambari au ishara kutoka kwa salio zako: -{{.get_vouchers}} \ No newline at end of file -- 2.45.2 From 916ac11585c580bf045b616a5279503a8741f6d9 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 5 Feb 2026 19:58:14 +0300 Subject: [PATCH 39/74] use the correct decimal when displaying the quote --- handlers/application/paydebt.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handlers/application/paydebt.go b/handlers/application/paydebt.go index d38ed6c..faf6a04 100644 --- a/handlers/application/paydebt.go +++ b/handlers/application/paydebt.go @@ -195,7 +195,7 @@ func (h *MenuHandlers) ConfirmDebtRemoval(ctx context.Context, sym string, input } // Scale down the quoted amount - quoteAmountStr := store.ScaleDownBalance(r.OutValue, swapData.ActiveSwapToDecimal) + quoteAmountStr := store.ScaleDownBalance(r.OutValue, swapData.ActiveSwapFromDecimal) // Format to 2 decimal places qouteStr, _ := store.TruncateDecimalString(string(quoteAmountStr), 2) -- 2.45.2 From 7f2467873fdb88679842dbdf3dda41140294d7be Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 6 Feb 2026 14:05:54 +0300 Subject: [PATCH 40/74] added the pool deposit menu node --- services/registration/mpesa.vis | 10 ++++++---- services/registration/pool_deposit | 1 + services/registration/pool_deposit.vis | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 services/registration/pool_deposit create mode 100644 services/registration/pool_deposit.vis diff --git a/services/registration/mpesa.vis b/services/registration/mpesa.vis index 91e75ae..73a4a55 100644 --- a/services/registration/mpesa.vis +++ b/services/registration/mpesa.vis @@ -3,14 +3,16 @@ RELOAD calc_credit_debt CATCH api_failure flag_api_call_error 1 MAP calc_credit_debt MOUT pay_debt 1 -MOUT get_mpesa 2 -MOUT send_mpesa 3 +MOUT deposit 2 +MOUT get_mpesa 3 +MOUT send_mpesa 4 MOUT back 0 MOUT quit 9 HALT INCMP ^ 0 INCMP pay_debt 1 -INCMP get_mpesa 2 -INCMP send_mpesa 3 +INCMP pool_deposit 2 +INCMP get_mpesa 3 +INCMP send_mpesa 4 INCMP quit 9 INCMP . * diff --git a/services/registration/pool_deposit b/services/registration/pool_deposit new file mode 100644 index 0000000..841c240 --- /dev/null +++ b/services/registration/pool_deposit @@ -0,0 +1 @@ +{{.get_pool_deposit_vouchers}} diff --git a/services/registration/pool_deposit.vis b/services/registration/pool_deposit.vis new file mode 100644 index 0000000..d93dfec --- /dev/null +++ b/services/registration/pool_deposit.vis @@ -0,0 +1,14 @@ +CATCH no_voucher flag_no_active_voucher 1 +CATCH no_stable_voucher flag_no_pay_debt_vouchers 1 +LOAD get_pool_deposit_vouchers 0 +MAP get_pool_deposit_vouchers +MOUT back 0 +MOUT quit 99 +MNEXT next 88 +MPREV prev 98 +HALT +INCMP > 88 +INCMP < 98 +INCMP _ 0 +INCMP quit 99 +INCMP pool_deposit_amount * -- 2.45.2 From 1902ce226d6b89c0d6e57cbf686572d220bafc59 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 6 Feb 2026 14:09:40 +0300 Subject: [PATCH 41/74] added the pool deposit menu titles --- services/registration/deposit_menu | 1 + services/registration/deposit_menu_swa | 1 + 2 files changed, 2 insertions(+) create mode 100644 services/registration/deposit_menu create mode 100644 services/registration/deposit_menu_swa diff --git a/services/registration/deposit_menu b/services/registration/deposit_menu new file mode 100644 index 0000000..3f5281f --- /dev/null +++ b/services/registration/deposit_menu @@ -0,0 +1 @@ +Pool deposit \ No newline at end of file diff --git a/services/registration/deposit_menu_swa b/services/registration/deposit_menu_swa new file mode 100644 index 0000000..ca76c1a --- /dev/null +++ b/services/registration/deposit_menu_swa @@ -0,0 +1 @@ +Weka kwa bwawa \ No newline at end of file -- 2.45.2 From f6dcc6db0e884850822a640fcdf943343991f8d7 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 6 Feb 2026 14:10:42 +0300 Subject: [PATCH 42/74] added the pool deposit amount node --- services/registration/pool_deposit_amount | 1 + services/registration/pool_deposit_amount.vis | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 services/registration/pool_deposit_amount create mode 100644 services/registration/pool_deposit_amount.vis diff --git a/services/registration/pool_deposit_amount b/services/registration/pool_deposit_amount new file mode 100644 index 0000000..ff3d119 --- /dev/null +++ b/services/registration/pool_deposit_amount @@ -0,0 +1 @@ +{{.pool_deposit_max_amount}} \ No newline at end of file diff --git a/services/registration/pool_deposit_amount.vis b/services/registration/pool_deposit_amount.vis new file mode 100644 index 0000000..68e6c8e --- /dev/null +++ b/services/registration/pool_deposit_amount.vis @@ -0,0 +1,8 @@ +LOAD pool_deposit_max_amount 0 +RELOAD pool_deposit_max_amount +CATCH _ flag_incorrect_voucher 1 +MAP pool_deposit_max_amount +MOUT back 0 +HALT +INCMP _ 0 +INCMP pool_deposit_confirmation * -- 2.45.2 From 16adfdaa8a898d674e1470aa5b5948dd34119c58 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 6 Feb 2026 16:18:14 +0300 Subject: [PATCH 43/74] added data keys to easily manage a user's stable coins --- store/db/db.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/store/db/db.go b/store/db/db.go index 4cc3f57..7260243 100644 --- a/store/db/db.go +++ b/store/db/db.go @@ -65,7 +65,7 @@ const ( DATA_ACCOUNT_ALIAS //currently suggested alias by the api awaiting user's confirmation as accepted account alias DATA_SUGGESTED_ALIAS - //Key used to store a value of 1 for a user to reset their own PIN once they access the menu. + //Key used to store a value of 1 for a user to reset their own PIN once they access the menu. DATA_SELF_PIN_RESET // Holds the active pool contract address for the swap DATA_ACTIVE_POOL_ADDRESS @@ -104,7 +104,14 @@ const ( DATA_VOUCHER_DECIMALS // List of voucher EVM addresses for vouchers valid in the user context. DATA_VOUCHER_ADDRESSES - // List of senders for valid transactions in the user context. + // 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 ) const ( -- 2.45.2 From f61b56407b5734b63b11ba9c3a2a2456db62f149 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 6 Feb 2026 16:19:45 +0300 Subject: [PATCH 44/74] rename the flag to flag_no_stable_vouchers --- handlers/application/balance.go | 6 +++--- services/registration/pay_debt.vis | 2 +- services/registration/pool_deposit.vis | 2 +- services/registration/pp.csv | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/handlers/application/balance.go b/handlers/application/balance.go index b45e369..ad9a2aa 100644 --- a/handlers/application/balance.go +++ b/handlers/application/balance.go @@ -119,7 +119,7 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i l.AddDomain("default") flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error") - flag_no_pay_debt_vouchers, _ := h.flagManager.GetFlag("flag_no_pay_debt_vouchers") + flag_no_stable_vouchers, _ := h.flagManager.GetFlag("flag_no_stable_vouchers") // default response res.FlagReset = append(res.FlagReset, flag_api_call_error) @@ -161,11 +161,11 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i // No stable vouchers → cannot pay debt if len(filteredSwappableVouchers) == 0 { - res.FlagSet = append(res.FlagSet, flag_no_pay_debt_vouchers) + res.FlagSet = append(res.FlagSet, flag_no_stable_vouchers) return res, nil } - res.FlagReset = append(res.FlagReset, flag_no_pay_debt_vouchers) + res.FlagReset = append(res.FlagReset, flag_no_stable_vouchers) // Process stable vouchers for later use data := store.ProcessVouchers(filteredSwappableVouchers) diff --git a/services/registration/pay_debt.vis b/services/registration/pay_debt.vis index 147fe06..7cd5592 100644 --- a/services/registration/pay_debt.vis +++ b/services/registration/pay_debt.vis @@ -1,5 +1,5 @@ CATCH no_voucher flag_no_active_voucher 1 -CATCH no_stable_voucher flag_no_pay_debt_vouchers 1 +CATCH no_stable_voucher flag_no_stable_vouchers 1 LOAD calculate_max_pay_debt 0 RELOAD calculate_max_pay_debt MAP calculate_max_pay_debt diff --git a/services/registration/pool_deposit.vis b/services/registration/pool_deposit.vis index d93dfec..29b0182 100644 --- a/services/registration/pool_deposit.vis +++ b/services/registration/pool_deposit.vis @@ -1,5 +1,5 @@ CATCH no_voucher flag_no_active_voucher 1 -CATCH no_stable_voucher flag_no_pay_debt_vouchers 1 +CATCH no_stable_voucher flag_no_stable_vouchers 1 LOAD get_pool_deposit_vouchers 0 MAP get_pool_deposit_vouchers MOUT back 0 diff --git a/services/registration/pp.csv b/services/registration/pp.csv index 92ba16d..3911af7 100644 --- a/services/registration/pp.csv +++ b/services/registration/pp.csv @@ -36,4 +36,4 @@ flag,flag_incorrect_pool,42,this is set when the user selects an invalid pool flag,flag_low_swap_amount,43,this is set when the swap max limit is less than 0.1 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_pay_debt_vouchers,46,this is set when the user does not have a stable voucher to pay debt +flag,flag_no_stable_vouchers,46,this is set when the user does not have a stable voucher -- 2.45.2 From 601de0126a2c2f8f5281cacce471f2010bef1ac4 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 6 Feb 2026 16:20:20 +0300 Subject: [PATCH 45/74] store the list of stable coins that the user has --- handlers/application/vouchers.go | 39 +++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/handlers/application/vouchers.go b/handlers/application/vouchers.go index 895d9c6..6d0756d 100644 --- a/handlers/application/vouchers.go +++ b/handlers/application/vouchers.go @@ -16,7 +16,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. updates the balance of the active voucher +// 3. Stores list of filtered stable 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 userStore := h.userdataStore @@ -29,6 +30,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") publicKey, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY) if err != nil { @@ -170,6 +172,41 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b } } + // Filter stable vouchers + filteredStableVouchers := make([]dataserviceapi.TokenHoldings, 0) + for _, v := range vouchersResp { + + if isStableVoucher(v.TokenAddress) { + filteredStableVouchers = append(filteredStableVouchers, v) + } + } + + // 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, + } + + // Write data entries + for key, value := range stableVoucherDataMap { + 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 + } + } + return res, nil } -- 2.45.2 From eb25aca96d319b126792eebbe0cf833cfe70edb4 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 6 Feb 2026 16:21:00 +0300 Subject: [PATCH 46/74] added pool deposit related functions to the local handler --- handlers/local.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/handlers/local.go b/handlers/local.go index 7c4b696..5fdb600 100644 --- a/handlers/local.go +++ b/handlers/local.go @@ -150,6 +150,10 @@ 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("pool_deposit_max_amount", appHandlers.PoolDepositMaxAmount) + ls.DbRs.AddLocalFunc("confirm_pool_deposit", appHandlers.ConfirmPoolDeposit) + ls.DbRs.AddLocalFunc("initiate_pool_deposit", appHandlers.InitiatePoolDeposit) ls.first = appHandlers.Init -- 2.45.2 From ab8d1535c474047004986ba47c7f79cd176449fa Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 6 Feb 2026 16:40:57 +0300 Subject: [PATCH 47/74] added GetStableVoucherData --- store/vouchers.go | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/store/vouchers.go b/store/vouchers.go index dc849c6..5c28a0f 100644 --- a/store/vouchers.go +++ b/store/vouchers.go @@ -120,6 +120,43 @@ 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) { + keys := []storedb.DataTyp{ + storedb.DATA_STABLE_VOUCHER_SYMBOLS, + storedb.DATA_STABLE_VOUCHER_BALANCES, + storedb.DATA_STABLE_VOUCHER_DECIMALS, + storedb.DATA_STABLE_VOUCHER_ADDRESSES, + } + 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) + } + + 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], + ) + + if symbol == "" { + return nil, nil + } + + return &dataserviceapi.TokenHoldings{ + TokenSymbol: string(symbol), + Balance: string(balance), + TokenDecimals: string(decimal), + TokenAddress: string(address), + }, nil +} + // 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) { symList := strings.Split(symbols, "\n") -- 2.45.2 From 857e237996093e9228bafb792a5348fa38fc0f38 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Sat, 7 Feb 2026 16:50:56 +0300 Subject: [PATCH 48/74] added translations for the pool deposit --- services/registration/locale/swa/default.po | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/services/registration/locale/swa/default.po b/services/registration/locale/swa/default.po index 2892ce8..911acd7 100644 --- a/services/registration/locale/swa/default.po +++ b/services/registration/locale/swa/default.po @@ -32,7 +32,7 @@ msgid "Symbol: %s\nBalance: %s" msgstr "Sarafu: %s\nSalio: %s" msgid "Your request has been sent. You will receive an SMS when your %s %s has been swapped for %s." -msgstr "Ombi lako limetumwa. Utapokea SMS wakati %s %s yako itakapobadilishwa kuwa %s." +msgstr "Ombi lako limetumwa. Utapokea ujumbe wakati %s %s yako itakapobadilishwa kuwa %s." msgid "%s balance: %s\n" msgstr "%s salio: %s\n" @@ -83,4 +83,10 @@ msgid "Your active voucher %s is already set" msgstr "Sarafu yako %s ishachaguliwa" msgid "Select number or symbol from your vouchers:\n%s" -msgstr "Chagua nambari au ishara kutoka kwa sarafu zako:\n%s" \ No newline at end of file +msgstr "Chagua nambari au ishara kutoka kwa sarafu zako:\n%s" + +msgid "You will deposit %s %s into %s\n" +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." \ No newline at end of file -- 2.45.2 From 35692d2bfd11334177ce3390b2b00ccee259cd1c Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Sat, 7 Feb 2026 17:29:40 +0300 Subject: [PATCH 49/74] prevent users from inputting amounts less than 0.1 --- handlers/application/send.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handlers/application/send.go b/handlers/application/send.go index f7cdbfc..0114cde 100644 --- a/handlers/application/send.go +++ b/handlers/application/send.go @@ -585,7 +585,7 @@ func (h *MenuHandlers) ValidateAmount(ctx context.Context, sym string, input []b return res, nil } - if inputAmount > balanceValue { + if inputAmount > balanceValue || inputAmount < 0.1{ res.FlagSet = append(res.FlagSet, flag_invalid_amount) res.Content = amountStr return res, nil -- 2.45.2 From dc2f9fce446d6ac93eb55239cbb7dbc4324f270e Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Sat, 7 Feb 2026 17:30:32 +0300 Subject: [PATCH 50/74] change the order of vis statements for error handling --- services/registration/pool_deposit.vis | 3 +++ services/registration/pool_deposit_amount.vis | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/services/registration/pool_deposit.vis b/services/registration/pool_deposit.vis index 29b0182..8f06be6 100644 --- a/services/registration/pool_deposit.vis +++ b/services/registration/pool_deposit.vis @@ -11,4 +11,7 @@ INCMP > 88 INCMP < 98 INCMP _ 0 INCMP quit 99 +LOAD pool_deposit_max_amount 120 +RELOAD pool_deposit_max_amount +CATCH . flag_incorrect_voucher 1 INCMP pool_deposit_amount * diff --git a/services/registration/pool_deposit_amount.vis b/services/registration/pool_deposit_amount.vis index 68e6c8e..a51e140 100644 --- a/services/registration/pool_deposit_amount.vis +++ b/services/registration/pool_deposit_amount.vis @@ -1,8 +1,10 @@ -LOAD pool_deposit_max_amount 0 -RELOAD pool_deposit_max_amount -CATCH _ flag_incorrect_voucher 1 +LOAD reset_transaction_amount 10 +RELOAD reset_transaction_amount MAP pool_deposit_max_amount MOUT back 0 HALT +LOAD confirm_pool_deposit 140 +RELOAD confirm_pool_deposit +CATCH invalid_pool_deposit_amount flag_invalid_amount 1 INCMP _ 0 INCMP pool_deposit_confirmation * -- 2.45.2 From f397d77989e6e831cb9bd0be76c7478d705df5bf Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Sat, 7 Feb 2026 17:31:53 +0300 Subject: [PATCH 51/74] added a CATCH for invalid pool deposit amounts --- services/registration/invalid_pool_deposit_amount | 1 + services/registration/invalid_pool_deposit_amount.vis | 7 +++++++ services/registration/invalid_pool_deposit_amount_swa | 1 + 3 files changed, 9 insertions(+) create mode 100644 services/registration/invalid_pool_deposit_amount create mode 100644 services/registration/invalid_pool_deposit_amount.vis create mode 100644 services/registration/invalid_pool_deposit_amount_swa diff --git a/services/registration/invalid_pool_deposit_amount b/services/registration/invalid_pool_deposit_amount new file mode 100644 index 0000000..e57b302 --- /dev/null +++ b/services/registration/invalid_pool_deposit_amount @@ -0,0 +1 @@ +Amount {{.confirm_pool_deposit}} is invalid, please try again: \ No newline at end of file diff --git a/services/registration/invalid_pool_deposit_amount.vis b/services/registration/invalid_pool_deposit_amount.vis new file mode 100644 index 0000000..08f5a23 --- /dev/null +++ b/services/registration/invalid_pool_deposit_amount.vis @@ -0,0 +1,7 @@ +MAP confirm_pool_deposit +RELOAD reset_transaction_amount +MOUT retry 1 +MOUT quit 9 +HALT +INCMP _ 1 +INCMP quit 9 diff --git a/services/registration/invalid_pool_deposit_amount_swa b/services/registration/invalid_pool_deposit_amount_swa new file mode 100644 index 0000000..19df9ce --- /dev/null +++ b/services/registration/invalid_pool_deposit_amount_swa @@ -0,0 +1 @@ +Kiwango {{.confirm_pool_deposit}} sio sahihi, tafadhali weka tena: \ No newline at end of file -- 2.45.2 From 4ce967967d45645bc9dab02b0df5bd72b6ef01ac Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Sat, 7 Feb 2026 17:32:42 +0300 Subject: [PATCH 52/74] added a node for confirming the pool deposit --- services/registration/pool_deposit_confirmation | 2 ++ services/registration/pool_deposit_confirmation.vis | 10 ++++++++++ services/registration/pool_deposit_confirmation_swa | 2 ++ 3 files changed, 14 insertions(+) create mode 100644 services/registration/pool_deposit_confirmation create mode 100644 services/registration/pool_deposit_confirmation.vis create mode 100644 services/registration/pool_deposit_confirmation_swa diff --git a/services/registration/pool_deposit_confirmation b/services/registration/pool_deposit_confirmation new file mode 100644 index 0000000..5fe504a --- /dev/null +++ b/services/registration/pool_deposit_confirmation @@ -0,0 +1,2 @@ +{{.confirm_pool_deposit}} +Please enter your PIN to confirm: \ No newline at end of file diff --git a/services/registration/pool_deposit_confirmation.vis b/services/registration/pool_deposit_confirmation.vis new file mode 100644 index 0000000..36db1f6 --- /dev/null +++ b/services/registration/pool_deposit_confirmation.vis @@ -0,0 +1,10 @@ +MAP confirm_pool_deposit +MOUT back 0 +MOUT quit 9 +HALT +LOAD authorize_account 6 +RELOAD authorize_account +CATCH incorrect_pin flag_incorrect_pin 1 +INCMP _ 0 +INCMP quit 9 +INCMP pool_deposit_initiated * diff --git a/services/registration/pool_deposit_confirmation_swa b/services/registration/pool_deposit_confirmation_swa new file mode 100644 index 0000000..00f84a6 --- /dev/null +++ b/services/registration/pool_deposit_confirmation_swa @@ -0,0 +1,2 @@ +{{.confirm_pool_deposit}} +Tafadhali weka PIN yako kudhibitisha: \ No newline at end of file -- 2.45.2 From e14387a975cdd3771fb0fb8768d5ba8c498fa1fe Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Sat, 7 Feb 2026 17:33:01 +0300 Subject: [PATCH 53/74] added a node for initializing the pool deposit --- services/registration/pool_deposit_initiated.vis | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 services/registration/pool_deposit_initiated.vis diff --git a/services/registration/pool_deposit_initiated.vis b/services/registration/pool_deposit_initiated.vis new file mode 100644 index 0000000..8524d33 --- /dev/null +++ b/services/registration/pool_deposit_initiated.vis @@ -0,0 +1,4 @@ +LOAD reset_incorrect_pin 6 +CATCH _ flag_account_authorized 0 +LOAD initiate_pool_deposit 0 +HALT -- 2.45.2 From c548ea0700b85fd2b1f0d99afd8af0fa47c768f7 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Sat, 7 Feb 2026 17:57:46 +0300 Subject: [PATCH 54/74] added pool deposit functions --- handlers/application/pool_deposit.go | 220 +++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) create mode 100644 handlers/application/pool_deposit.go diff --git a/handlers/application/pool_deposit.go b/handlers/application/pool_deposit.go new file mode 100644 index 0000000..bcc84c1 --- /dev/null +++ b/handlers/application/pool_deposit.go @@ -0,0 +1,220 @@ +package application + +import ( + "context" + "fmt" + "strconv" + "strings" + + "git.defalsify.org/vise.git/resource" + "git.grassecon.net/grassrootseconomics/sarafu-vise/store" + storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db" + "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) { + 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") + + userStore := h.userdataStore + + // Read stable vouchers from the store + voucherData, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_STABLE_VOUCHER_SYMBOLS) + if err != nil { + logg.ErrorCtxf(ctx, "failed to read stable voucherData entires with", "key", storedb.DATA_STABLE_VOUCHER_SYMBOLS, "error", err) + return res, err + } + + if len(voucherData) == 0 { + return res, nil + } + + voucherBalances, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_STABLE_VOUCHER_BALANCES) + if err != nil { + logg.ErrorCtxf(ctx, "failed to read stable voucherData entires with", "key", storedb.DATA_STABLE_VOUCHER_BALANCES, "error", err) + return res, err + } + + formattedVoucherList := store.FormatVoucherList(ctx, string(voucherData), string(voucherBalances)) + finalOutput := strings.Join(formattedVoucherList, "\n") + + res.Content = l.Get("Select number or symbol from your vouchers:\n%s", finalOutput) + + return res, nil +} + +// PoolDepositMaxAmount returns the balance of the selected voucher +func (h *MenuHandlers) PoolDepositMaxAmount(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.GetStableVoucherData(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 pool deposit voucher data + if err := store.StoreTemporaryVoucher(ctx, h.userdataStore, sessionId, metadata); err != nil { + logg.ErrorCtxf(ctx, "failed on StoreTemporaryVoucher", "error", err) + return res, err + } + + // Format the balance amount to 2 decimal places + formattedBalance, _ := store.TruncateDecimalString(string(metadata.Balance), 2) + + res.Content = l.Get("Maximum amount: %s %s\nEnter amount:", formattedBalance, metadata.TokenSymbol) + + return res, nil +} + +// ConfirmPoolDeposit displays the pool deposit preview for a PIN confirmation +func (h *MenuHandlers) ConfirmPoolDeposit(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") + } + + inputStr := string(input) + if inputStr == "0" { + return res, nil + } + + flag_invalid_amount, _ := h.flagManager.GetFlag("flag_invalid_amount") + + res.FlagReset = append(res.FlagReset, flag_invalid_amount) + + code := codeFromCtx(ctx) + l := gotext.NewLocale(translationDir, code) + l.AddDomain("default") + + userStore := h.userdataStore + + poolDepositVoucher, err := store.GetTemporaryVoucherData(ctx, h.userdataStore, sessionId) + if err != nil { + logg.ErrorCtxf(ctx, "failed on GetTemporaryVoucherData", "error", err) + return res, err + } + + maxValue, err := strconv.ParseFloat(poolDepositVoucher.Balance, 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 || inputAmount < 0.1 { + res.FlagSet = append(res.FlagSet, flag_invalid_amount) + res.Content = inputStr + return res, nil + } + + err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_AMOUNT, []byte(inputStr)) + if err != nil { + logg.ErrorCtxf(ctx, "failed to write pool deposit amount entry with", "key", storedb.DATA_AMOUNT, "value", inputStr, "error", err) + return res, err + } + + // Resolve active pool + _, activePoolName, 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, + ) + + return res, nil +} + +// InitiatePoolDeposit calls the pool deposit API +func (h *MenuHandlers) InitiatePoolDeposit(ctx context.Context, sym string, input []byte) (resource.Result, error) { + var res resource.Result + var err error + sessionId, ok := ctx.Value("SessionId").(string) + if !ok { + return res, fmt.Errorf("missing session") + } + + flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized") + + code := codeFromCtx(ctx) + l := gotext.NewLocale(translationDir, code) + l.AddDomain("default") + + // Resolve active pool + activePoolAddress, activePoolName, err := h.resolveActivePoolDetails(ctx, sessionId) + if err != nil { + return res, err + } + + poolDepositVoucher, err := store.GetTemporaryVoucherData(ctx, h.userdataStore, sessionId) + if err != nil { + logg.ErrorCtxf(ctx, "failed on GetTemporaryVoucherData", "error", err) + return res, err + } + + poolDepositdata, err := store.ReadTransactionData(ctx, h.userdataStore, sessionId) + if err != nil { + return res, err + } + + finalAmountStr, err := store.ParseAndScaleAmount(poolDepositdata.Amount, poolDepositVoucher.TokenDecimals) + if err != nil { + return res, err + } + + // Call pool deposit API + r, err := h.accountService.PoolDeposit(ctx, finalAmountStr, poolDepositdata.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) + res.Content = l.Get("Your request failed. Please try again later.") + logg.ErrorCtxf(ctx, "failed on pool deposit", "error", err) + return res, nil + } + + trackingId := r.TrackingId + logg.InfoCtxf(ctx, "Pool deposit", "trackingId", trackingId) + + res.Content = l.Get( + "Your request has been sent. You will receive an SMS when %s %s has been deposited into %s.", + poolDepositdata.Amount, + poolDepositVoucher.TokenSymbol, + activePoolName, + ) + + res.FlagReset = append(res.FlagReset, flag_account_authorized) + return res, nil +} -- 2.45.2 From 7f6be9258d004b42f018ea126abaed7e1b90d438 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Sat, 7 Feb 2026 18:00:47 +0300 Subject: [PATCH 55/74] updated the env example comment on stable voucher addresses --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 2afa594..8b06a62 100644 --- a/.env.example +++ b/.env.example @@ -38,5 +38,5 @@ DEFAULT_MPESA_ASSET=cUSD MPESA_BEARER_TOKEN=eyJeSIsInRcCI6IkpXVCJ.yJwdWJsaWNLZXkiOiIwrrrrrr MPESA_ONRAMP_BASE=https://pretium.v1.grassecon.net -# Stable vouchers allowed for Pay Debt (USDT, USDm) +# Known stable voucher addresses (USDT, USDm) STABLE_VOUCHER_ADDRESSES=0x48065fbBE25f71C9282ddf5e1cD6D6A887483D5e,0x765DE816845861e75A25fCA122bb6898B8B1282a -- 2.45.2 From c4e2ed6db2e73558ce0597b342854be833b6e366 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Sat, 7 Feb 2026 18:10:19 +0300 Subject: [PATCH 56/74] use the updated pool deposit URL --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6dbc8e3..11911e6 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.24.10 require ( git.defalsify.org/vise.git v0.3.2-0.20250528124150-03bf7bfc1b66 git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20251127132814-8ceadabbc215 - git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20251202085112-45469d4ba326 + git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20260207150752-71aa5ce7b537 git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306 git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 github.com/alecthomas/assert/v2 v2.2.2 diff --git a/go.sum b/go.sum index 3d4882f..067c990 100644 --- a/go.sum +++ b/go.sum @@ -6,6 +6,8 @@ git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20251128071248- git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20251128071248-bfdeef125576/go.mod h1:h/y/lJNJAVTcIzAxCMXXw8Dh2aoLxBFZ6F1nTB8C0nU= git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20251202085112-45469d4ba326 h1:qH4QulgncvAD7b/YeHGPxcDJTBIychPeoZJACefYryI= git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20251202085112-45469d4ba326/go.mod h1:h/y/lJNJAVTcIzAxCMXXw8Dh2aoLxBFZ6F1nTB8C0nU= +git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20260207150752-71aa5ce7b537 h1:2AoOHiRTN3SXX4qnc2wOaF2ktVXLlFAa3X/n9DLu8/s= +git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20260207150752-71aa5ce7b537/go.mod h1:h/y/lJNJAVTcIzAxCMXXw8Dh2aoLxBFZ6F1nTB8C0nU= git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306 h1:Jo+yWysWw/N5BJQtAyEMN8ePVvAyPHv+JG4lQti+1N4= git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306/go.mod h1:FdLwYtzsjOIcDiW4uDgDYnB4Wdzq12uJUe0QHSSPbSo= git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 h1:DjJlBSz0S13acft5XZDWk7ZYnzElym0xLMYEVgyNJ+E= -- 2.45.2 From 5ed7cbd40a1b90337aafb1cb73c7c9e3d1db979e Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Mon, 9 Feb 2026 14:14:44 +0300 Subject: [PATCH 57/74] update the Mpesa response once someone requests for a withdrawal --- handlers/application/mpesa.go | 3 +-- services/registration/locale/swa/default.po | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/handlers/application/mpesa.go b/handlers/application/mpesa.go index 876cd95..695c0e2 100644 --- a/handlers/application/mpesa.go +++ b/handlers/application/mpesa.go @@ -387,11 +387,10 @@ 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 - } swapAmount, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SWAP_AMOUNT) diff --git a/services/registration/locale/swa/default.po b/services/registration/locale/swa/default.po index 911acd7..21d30ce 100644 --- a/services/registration/locale/swa/default.po +++ b/services/registration/locale/swa/default.po @@ -61,8 +61,8 @@ 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" -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" -- 2.45.2 From ea71c08143a595087f77c22c05612ae964c2045d Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 12 Feb 2026 10:24:54 +0300 Subject: [PATCH 58/74] rename the data keys to store ordered voucher lists --- handlers/application/pool_deposit.go | 8 ++++---- store/db/db.go | 16 ++++++++-------- store/vouchers.go | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/handlers/application/pool_deposit.go b/handlers/application/pool_deposit.go index bcc84c1..b540941 100644 --- a/handlers/application/pool_deposit.go +++ b/handlers/application/pool_deposit.go @@ -27,9 +27,9 @@ 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) + 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 } diff --git a/store/db/db.go b/store/db/db.go index 7260243..e228971 100644 --- a/store/db/db.go +++ b/store/db/db.go @@ -104,14 +104,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 ( diff --git a/store/vouchers.go b/store/vouchers.go index 5c28a0f..c8d5e42 100644 --- a/store/vouchers.go +++ b/store/vouchers.go @@ -123,10 +123,10 @@ func GetVoucherData(ctx context.Context, store DataStore, sessionId string, inpu // GetStableVoucherData retrieves and matches stable voucher data func GetStableVoucherData(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 == "" { -- 2.45.2 From 50c2aff79ed34b77d0f7c647644099528796276d Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 12 Feb 2026 10:25:53 +0300 Subject: [PATCH 59/74] store the ordered list of vouchers with stables at the top --- handlers/application/vouchers.go | 54 ++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/handlers/application/vouchers.go b/handlers/application/vouchers.go index 6d0756d..3899de6 100644 --- a/handlers/application/vouchers.go +++ b/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" @@ -172,35 +174,55 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b } } - // Filter stable vouchers - filteredStableVouchers := make([]dataserviceapi.TokenHoldings, 0) - for _, v := range vouchersResp { + // Get stable voucher priority order (lower index = higher priority) + stablePriority := make(map[string]int) + stableAddresses := config.StableVoucherAddresses() + for i, addr := range stableAddresses { + stablePriority[strings.ToLower(addr)] = i + } + + // Split vouchers into stable and non-stable + stableVouchers := make([]dataserviceapi.TokenHoldings, 0) + nonStableVouchers := make([]dataserviceapi.TokenHoldings, 0) + + for _, v := range vouchersResp { if isStableVoucher(v.TokenAddress) { - filteredStableVouchers = append(filteredStableVouchers, v) + stableVouchers = append(stableVouchers, v) + } else { + nonStableVouchers = append(nonStableVouchers, v) } } - // No stable vouchers - if len(filteredStableVouchers) == 0 { + // No stable vouchers at all + if len(stableVouchers) == 0 { res.FlagSet = append(res.FlagSet, flag_no_stable_vouchers) - return res, nil + } else { + res.FlagReset = append(res.FlagReset, flag_no_stable_vouchers) } - res.FlagReset = append(res.FlagReset, flag_no_stable_vouchers) + // Sort stable vouchers by configured priority + sort.SliceStable(stableVouchers, func(i, j int) bool { + ai := stablePriority[strings.ToLower(stableVouchers[i].TokenAddress)] + aj := stablePriority[strings.ToLower(stableVouchers[j].TokenAddress)] + return ai < aj + }) - // Process stable vouchers for later use - stableVoucherData := store.ProcessVouchers(filteredStableVouchers) + // Final ordered list: stable first, then others + orderedVouchers := append(stableVouchers, nonStableVouchers...) - 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, + // Process ALL vouchers (stable first) + orderedVoucherData := store.ProcessVouchers(orderedVouchers) + + 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 -- 2.45.2 From 1a61ea6de3e452e6e25bf19a390b65a97531e5f8 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 12 Feb 2026 10:29:05 +0300 Subject: [PATCH 60/74] rename the function for reuse --- handlers/application/pool_deposit.go | 6 +++--- handlers/local.go | 2 +- services/registration/pool_deposit | 2 +- services/registration/pool_deposit.vis | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/handlers/application/pool_deposit.go b/handlers/application/pool_deposit.go index b540941..f87b9c4 100644 --- a/handlers/application/pool_deposit.go +++ b/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,7 +26,7 @@ func (h *MenuHandlers) GetPoolDepositVouchers(ctx context.Context, sym string, i userStore := h.userdataStore - // Read stable vouchers from the store + // 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_ORDERED_VOUCHER_SYMBOLS, "error", err) diff --git a/handlers/local.go b/handlers/local.go index 5fdb600..e19fc20 100644 --- a/handlers/local.go +++ b/handlers/local.go @@ -150,7 +150,7 @@ 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) diff --git a/services/registration/pool_deposit b/services/registration/pool_deposit index 841c240..0863a44 100644 --- a/services/registration/pool_deposit +++ b/services/registration/pool_deposit @@ -1 +1 @@ -{{.get_pool_deposit_vouchers}} +{{.get_ordered_vouchers}} diff --git a/services/registration/pool_deposit.vis b/services/registration/pool_deposit.vis index 8f06be6..55f4990 100644 --- a/services/registration/pool_deposit.vis +++ b/services/registration/pool_deposit.vis @@ -1,7 +1,7 @@ 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 -- 2.45.2 From f4c8c45ed1d73e65584ffc9206fa735ed0284f8e Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 12 Feb 2026 14:20:42 +0300 Subject: [PATCH 61/74] rename the function to match the ordered voucher data --- handlers/application/pool_deposit.go | 2 +- store/vouchers.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handlers/application/pool_deposit.go b/handlers/application/pool_deposit.go index f87b9c4..b12b5d2 100644 --- a/handlers/application/pool_deposit.go +++ b/handlers/application/pool_deposit.go @@ -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) } diff --git a/store/vouchers.go b/store/vouchers.go index c8d5e42..5e7d986 100644 --- a/store/vouchers.go +++ b/store/vouchers.go @@ -120,8 +120,8 @@ 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_ORDERED_VOUCHER_SYMBOLS, storedb.DATA_ORDERED_VOUCHER_BALANCES, -- 2.45.2 From 115cf2fbc91c4014ba10225f2bf1409b9f28e6dc Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 12 Feb 2026 15:04:42 +0300 Subject: [PATCH 62/74] added the minimum mpesa withdrawal amount config --- .env.example | 1 + config/config.go | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/.env.example b/.env.example index 8b06a62..d4871ad 100644 --- a/.env.example +++ b/.env.example @@ -34,6 +34,7 @@ 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 diff --git a/config/config.go b/config/config.go index 7ee27e0..ec3821a 100644 --- a/config/config.go +++ b/config/config.go @@ -102,6 +102,16 @@ 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) -- 2.45.2 From 0e38ef1d04554e7d199cd381d7f44a61a55b8787 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 12 Feb 2026 16:23:18 +0300 Subject: [PATCH 63/74] updated the withdraw mpesa flow to support selection of a voucher --- handlers/application/mpesa.go | 113 +++++++++++------- services/registration/get_mpesa | 2 +- services/registration/get_mpesa.vis | 19 +-- .../registration/get_mpesa_confirmation.vis | 3 - .../registration/invalid_get_mpesa_amount | 1 + .../registration/invalid_get_mpesa_amount.vis | 7 ++ .../registration/invalid_get_mpesa_amount_swa | 1 + services/registration/mpesa_max_limit | 1 + services/registration/mpesa_max_limit.vis | 13 ++ 9 files changed, 106 insertions(+), 54 deletions(-) create mode 100644 services/registration/invalid_get_mpesa_amount create mode 100644 services/registration/invalid_get_mpesa_amount.vis create mode 100644 services/registration/invalid_get_mpesa_amount_swa create mode 100644 services/registration/mpesa_max_limit create mode 100644 services/registration/mpesa_max_limit.vis diff --git a/handlers/application/mpesa.go b/handlers/application/mpesa.go index 695c0e2..467adc8 100644 --- a/handlers/application/mpesa.go +++ b/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) 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 + if err := store.StoreTemporaryVoucher(ctx, h.userdataStore, sessionId, metadata); err != nil { + logg.ErrorCtxf(ctx, "failed on StoreTemporaryVoucher", "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 } @@ -83,8 +99,12 @@ func (h *MenuHandlers) GetMpesaMaxLimit(ctx context.Context, sym string, input [ return res, err } + // Fetch min withdrawal amount from config/env + minksh := fmt.Sprintf("%f", config.MinMpesaWithdrawAmount()) + minKshFormatted, _ := store.TruncateDecimalString(minksh, 0) + // If RAT is the same as SAT, return early with KSH format - if string(activeAddress) == string(recipientActiveAddress) { + if string(metadata.TokenAddress) == string(recipientActiveAddress) { txType = "normal" // Save the transaction type if err := userStore.WriteEntry(ctx, sessionId, storedb.DATA_SEND_TRANSACTION_TYPE, []byte(txType)); err != nil { @@ -92,14 +112,15 @@ func (h *MenuHandlers) GetMpesaMaxLimit(ctx context.Context, sym string, input [ return res, err } - activeFloat, _ := strconv.ParseFloat(string(activeBal), 64) + activeFloat, _ := strconv.ParseFloat(string(metadata.Balance), 64) ksh := fmt.Sprintf("%f", activeFloat*rates.Buy) - kshFormatted, _ := store.TruncateDecimalString(ksh, 0) + maxKshFormatted, _ := store.TruncateDecimalString(ksh, 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, ) return res, nil @@ -112,7 +133,7 @@ func (h *MenuHandlers) GetMpesaMaxLimit(ctx context.Context, sym string, input [ } // Check if sender token is swappable - canSwap, err := h.accountService.CheckTokenInPool(ctx, string(activePoolAddress), string(activeAddress)) + 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) @@ -125,7 +146,7 @@ func (h *MenuHandlers) GetMpesaMaxLimit(ctx context.Context, sym string, input [ } // 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) logg.ErrorCtxf(ctx, "failed on calculateSendCreditLimits", "error", err) @@ -155,25 +176,26 @@ func (h *MenuHandlers) GetMpesaMaxLimit(ctx context.Context, sym string, input [ } // save swap related data for the swap preview - metadata := &dataserviceapi.TokenHoldings{ + 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, ) return res, nil @@ -189,7 +211,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,16 +241,18 @@ 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) if err != nil { return res, err @@ -239,19 +263,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) - 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) - return res, err - } + // get the selected voucher + mpesaWithdrawalVoucher, err := store.GetTemporaryVoucherData(ctx, h.userdataStore, sessionId) + if err != nil { + logg.ErrorCtxf(ctx, "failed on GetTemporaryVoucherData", "error", err) + return res, err + } - if inputAmount > balanceValue { + maxValue, err := strconv.ParseFloat(mpesaWithdrawalVoucher.Balance, 64) + if err != nil { + logg.ErrorCtxf(ctx, "Failed to convert the swapMaxAmount to a float", "error", err) + return res, err + } + + if string(transactionType) == "normal" { + if inputAmount > maxValue { res.FlagSet = append(res.FlagSet, flag_invalid_amount) res.Content = inputStr return res, nil @@ -270,7 +296,7 @@ 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 @@ -365,6 +391,12 @@ func (h *MenuHandlers) InitiateGetMpesa(ctx context.Context, sym string, input [ return res, err } + mpesaWithdrawalVoucher, err := store.GetTemporaryVoucherData(ctx, h.userdataStore, sessionId) + if err != nil { + logg.ErrorCtxf(ctx, "failed on GetTemporaryVoucherData", "error", err) + return res, err + } + if string(transactionType) == "normal" { // Call TokenTransfer for the normal transaction data, err := store.ReadTransactionData(ctx, h.userdataStore, sessionId) @@ -372,12 +404,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.") @@ -416,11 +448,6 @@ 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 @@ -437,7 +464,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 } diff --git a/services/registration/get_mpesa b/services/registration/get_mpesa index 3ba5d3c..90039ed 100644 --- a/services/registration/get_mpesa +++ b/services/registration/get_mpesa @@ -1 +1 @@ -{{.get_mpesa_max_limit}} \ No newline at end of file +{{.get_ordered_vouchers}} \ No newline at end of file diff --git a/services/registration/get_mpesa.vis b/services/registration/get_mpesa.vis index bf536d3..f9a9b42 100644 --- a/services/registration/get_mpesa.vis +++ b/services/registration/get_mpesa.vis @@ -1,10 +1,15 @@ CATCH no_voucher flag_no_active_voucher 1 +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 get_mpesa_max_limit 0 RELOAD get_mpesa_max_limit -MAP get_mpesa_max_limit -MOUT back 0 -MOUT quit 9 -HALT -INCMP _ 0 -INCMP quit 9 -INCMP get_mpesa_confirmation * +INCMP mpesa_max_limit * diff --git a/services/registration/get_mpesa_confirmation.vis b/services/registration/get_mpesa_confirmation.vis index eccee90..5514765 100644 --- a/services/registration/get_mpesa_confirmation.vis +++ b/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 diff --git a/services/registration/invalid_get_mpesa_amount b/services/registration/invalid_get_mpesa_amount new file mode 100644 index 0000000..7f5fd35 --- /dev/null +++ b/services/registration/invalid_get_mpesa_amount @@ -0,0 +1 @@ +Amount {{.get_mpesa_preview}} is invalid, please try again: \ No newline at end of file diff --git a/services/registration/invalid_get_mpesa_amount.vis b/services/registration/invalid_get_mpesa_amount.vis new file mode 100644 index 0000000..3cba646 --- /dev/null +++ b/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 diff --git a/services/registration/invalid_get_mpesa_amount_swa b/services/registration/invalid_get_mpesa_amount_swa new file mode 100644 index 0000000..27afab9 --- /dev/null +++ b/services/registration/invalid_get_mpesa_amount_swa @@ -0,0 +1 @@ +Kiwango {{.get_mpesa_preview}} sio sahihi, tafadhali weka tena: \ No newline at end of file diff --git a/services/registration/mpesa_max_limit b/services/registration/mpesa_max_limit new file mode 100644 index 0000000..3ba5d3c --- /dev/null +++ b/services/registration/mpesa_max_limit @@ -0,0 +1 @@ +{{.get_mpesa_max_limit}} \ No newline at end of file diff --git a/services/registration/mpesa_max_limit.vis b/services/registration/mpesa_max_limit.vis new file mode 100644 index 0000000..d3573ca --- /dev/null +++ b/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 * -- 2.45.2 From 504fcb67d3898d56c56f91bd9bfdf6b061b99114 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 12 Feb 2026 16:24:12 +0300 Subject: [PATCH 64/74] renamed the mpesa menu nodes for clarity --- services/registration/get_mpesa_menu | 2 +- services/registration/send_mpesa_menu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/registration/get_mpesa_menu b/services/registration/get_mpesa_menu index 47e090b..45a2fd0 100644 --- a/services/registration/get_mpesa_menu +++ b/services/registration/get_mpesa_menu @@ -1 +1 @@ -Get M-Pesa \ No newline at end of file +Withdraw \ No newline at end of file diff --git a/services/registration/send_mpesa_menu b/services/registration/send_mpesa_menu index d39ed20..2327a63 100644 --- a/services/registration/send_mpesa_menu +++ b/services/registration/send_mpesa_menu @@ -1 +1 @@ -Send M-Pesa \ No newline at end of file +Top-up \ No newline at end of file -- 2.45.2 From 80ea357e9c5187058b4bfeccdad65bba55bf872d Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 12 Feb 2026 19:19:52 +0300 Subject: [PATCH 65/74] added a new line for clear separation between voucher list and menu inputs --- services/registration/get_mpesa | 2 +- services/registration/select_voucher | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/registration/get_mpesa b/services/registration/get_mpesa index 90039ed..0863a44 100644 --- a/services/registration/get_mpesa +++ b/services/registration/get_mpesa @@ -1 +1 @@ -{{.get_ordered_vouchers}} \ No newline at end of file +{{.get_ordered_vouchers}} diff --git a/services/registration/select_voucher b/services/registration/select_voucher index ed8140f..3e1fc9d 100644 --- a/services/registration/select_voucher +++ b/services/registration/select_voucher @@ -1 +1 @@ -{{.get_vouchers}} \ No newline at end of file +{{.get_vouchers}} -- 2.45.2 From 8b6f8b9a43558bc4243d6256d68b996fc816a5b3 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 12 Feb 2026 19:22:38 +0300 Subject: [PATCH 66/74] process all voucher lists as ordered, with stables at the top --- handlers/application/vouchers.go | 74 +++++++++++++++++++------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/handlers/application/vouchers.go b/handlers/application/vouchers.go index 3899de6..2ff04df 100644 --- a/handlers/application/vouchers.go +++ b/handlers/application/vouchers.go @@ -148,7 +148,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[strings.ToLower(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[strings.ToLower(stable[i].TokenAddress)] + aj := stablePriority[strings.ToLower(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 { @@ -156,8 +185,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, @@ -170,47 +202,27 @@ 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 } } - // Get stable voucher priority order (lower index = higher priority) - stablePriority := make(map[string]int) - stableAddresses := config.StableVoucherAddresses() + // Order all vouchers + orderedVouchers := orderVouchers(vouchersResp) - for i, addr := range stableAddresses { - stablePriority[strings.ToLower(addr)] = i - } - - // Split vouchers into stable and non-stable - stableVouchers := make([]dataserviceapi.TokenHoldings, 0) - nonStableVouchers := make([]dataserviceapi.TokenHoldings, 0) - - for _, v := range vouchersResp { + // Stable voucher presence flag (based on full list) + hasStable := false + for _, v := range orderedVouchers { if isStableVoucher(v.TokenAddress) { - stableVouchers = append(stableVouchers, v) - } else { - nonStableVouchers = append(nonStableVouchers, v) + hasStable = true + break } } - // No stable vouchers at all - if len(stableVouchers) == 0 { + if !hasStable { res.FlagSet = append(res.FlagSet, flag_no_stable_vouchers) } else { res.FlagReset = append(res.FlagReset, flag_no_stable_vouchers) } - // Sort stable vouchers by configured priority - sort.SliceStable(stableVouchers, func(i, j int) bool { - ai := stablePriority[strings.ToLower(stableVouchers[i].TokenAddress)] - aj := stablePriority[strings.ToLower(stableVouchers[j].TokenAddress)] - return ai < aj - }) - - // Final ordered list: stable first, then others - orderedVouchers := append(stableVouchers, nonStableVouchers...) - // Process ALL vouchers (stable first) orderedVoucherData := store.ProcessVouchers(orderedVouchers) -- 2.45.2 From ba2c06c00ad390a1f4baf7675b24937201fa82c6 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 13 Feb 2026 03:54:09 +0300 Subject: [PATCH 67/74] process and store the vouchers as an ordered list --- handlers/application/balance.go | 111 +++++++++++++++++--------------- 1 file changed, 58 insertions(+), 53 deletions(-) diff --git a/handlers/application/balance.go b/handlers/application/balance.go index ad9a2aa..0803f05 100644 --- a/handlers/application/balance.go +++ b/handlers/application/balance.go @@ -3,10 +3,13 @@ package application import ( "context" "fmt" + "sort" "strconv" + "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" @@ -119,14 +122,13 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i 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, _, publicKey, _, err := h.getSessionData(ctx, sessionId) if err != nil { return res, nil } @@ -148,51 +150,69 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i return res, nil } - // Filter stable vouchers (excluding active voucher) - filteredSwappableVouchers := make([]dataserviceapi.TokenHoldings, 0) + // Build stable voucher priority (lower index = higher priority) + stablePriority := make(map[string]int) + stableAddresses := config.StableVoucherAddresses() + for i, addr := range stableAddresses { + stablePriority[strings.ToLower(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[strings.ToLower(stable[i].TokenAddress)] + aj := stablePriority[strings.ToLower(stable[j].TokenAddress)] + return ai < aj + }) + + return append(stable, nonStable...) + } + + // Remove active voucher + filteredVouchers := make([]dataserviceapi.TokenHoldings, 0, len(swappableVouchers)) for _, v := range swappableVouchers { - if v.TokenSymbol == string(activeSym) { + if v.TokenSymbol != string(activeSym) { + filteredVouchers = append(filteredVouchers, v) + } + } + + // Order remaining vouchers + orderedFilteredVouchers := orderVouchers(filteredVouchers) + + // Process & store + data := store.ProcessVouchers(orderedFilteredVouchers) + + dataMap := map[storedb.DataTyp]string{ + storedb.DATA_VOUCHER_SYMBOLS: data.Symbols, + storedb.DATA_VOUCHER_BALANCES: data.Balances, + storedb.DATA_VOUCHER_DECIMALS: data.Decimals, + storedb.DATA_VOUCHER_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 } - 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) - return res, nil - } - - res.FlagReset = append(res.FlagReset, flag_no_stable_vouchers) - - // Process stable vouchers for later use - data := store.ProcessVouchers(filteredSwappableVouchers) - - // Find active voucher data - activeSymStr := string(activeSym) - var activeData *dataserviceapi.TokenHoldings - for _, v := range swappableVouchers { - if v.TokenSymbol == activeSymStr { - activeData = &v - break - } - } - - if activeData == nil { - return res, nil } // Credit = active voucher balance - scaledCredit := store.ScaleDownBalance( - activeData.Balance, - activeData.TokenDecimals, - ) + scaledCredit := string(activeBal) // Debt = sum of stable vouchers only scaledDebt := "0" - for _, v := range filteredSwappableVouchers { + for _, v := range orderedFilteredVouchers { scaled := store.ScaleDownBalance(v.Balance, v.TokenDecimals) scaledDebt = store.AddDecimalStrings(scaledDebt, scaled) } @@ -215,21 +235,6 @@ func (h *MenuHandlers) CalculateCreditAndDebt(ctx context.Context, sym string, i 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", kshFormattedCredit, -- 2.45.2 From c02aa99ed07202bfb260a50faeb8a062cd9f46b2 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 13 Feb 2026 03:56:24 +0300 Subject: [PATCH 68/74] store the active swap from voucher data --- store/swap.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/store/swap.go b/store/swap.go index 097ad4a..3359a6f 100644 --- a/store/swap.go +++ b/store/swap.go @@ -189,3 +189,24 @@ 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 +} \ No newline at end of file -- 2.45.2 From 5255671a3da1948d57c251d88a5282d38de22dcd Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 13 Feb 2026 03:56:55 +0300 Subject: [PATCH 69/74] added the data key for the swap from balance --- store/db/db.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/store/db/db.go b/store/db/db.go index e228971..67850b9 100644 --- a/store/db/db.go +++ b/store/db/db.go @@ -93,6 +93,8 @@ 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 ) const ( -- 2.45.2 From 5c1b4ab00206e72957ce066e4ec56267cf4e8d68 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 13 Feb 2026 03:58:11 +0300 Subject: [PATCH 70/74] refactored the CalculateMaxPayDebt to improve logic and correctness --- handlers/application/paydebt.go | 68 +++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 25 deletions(-) diff --git a/handlers/application/paydebt.go b/handlers/application/paydebt.go index faf6a04..087825a 100644 --- a/handlers/application/paydebt.go +++ b/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, activePoolName, 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,26 @@ func (h *MenuHandlers) CalculateMaxPayDebt(ctx context.Context, sym string, inpu return res, nil } - logg.InfoCtxf(ctx, "Metadata from GetSwapToVoucherData:", "metadata", metadata) + logg.InfoCtxf(ctx, "Metadata from GetVoucherData:", "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) + // 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 } - 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) 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) - return res, err - } + maxLimit := r.Max // 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 +106,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:", - maxStr, - swapData.ActiveSwapToSym, + "You can remove a max of %s %s from '%s'\nEnter amount of %s:(Max: %s)", + quoteStr, + string(activeSym), string(activePoolName), - swapData.ActiveSwapToSym, + metadata.TokenSymbol, + maxStr, ) res.FlagReset = append(res.FlagReset, flag_low_swap_amount, flag_api_call_error) -- 2.45.2 From 47a14555fb28675f61b75adda4421ffaa19d735d Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 13 Feb 2026 14:50:39 +0300 Subject: [PATCH 71/74] reordered vis statements to match updated menu flow --- services/registration/calculate_max_pay_debt | 1 + .../registration/calculate_max_pay_debt.vis | 10 ++++++++++ .../registration/confirm_debt_removal.vis | 3 --- services/registration/invalid_pay_debt_amount | 1 + .../registration/invalid_pay_debt_amount.vis | 7 +++++++ .../registration/invalid_pay_debt_amount_swa | 1 + services/registration/pay_debt | 2 +- services/registration/pay_debt.vis | 20 ++++++++++++------- 8 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 services/registration/calculate_max_pay_debt create mode 100644 services/registration/calculate_max_pay_debt.vis create mode 100644 services/registration/invalid_pay_debt_amount create mode 100644 services/registration/invalid_pay_debt_amount.vis create mode 100644 services/registration/invalid_pay_debt_amount_swa diff --git a/services/registration/calculate_max_pay_debt b/services/registration/calculate_max_pay_debt new file mode 100644 index 0000000..1e2b322 --- /dev/null +++ b/services/registration/calculate_max_pay_debt @@ -0,0 +1 @@ +{{.calculate_max_pay_debt}} \ No newline at end of file diff --git a/services/registration/calculate_max_pay_debt.vis b/services/registration/calculate_max_pay_debt.vis new file mode 100644 index 0000000..c9e9774 --- /dev/null +++ b/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 * diff --git a/services/registration/confirm_debt_removal.vis b/services/registration/confirm_debt_removal.vis index e5c79c8..15d9bbe 100644 --- a/services/registration/confirm_debt_removal.vis +++ b/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 diff --git a/services/registration/invalid_pay_debt_amount b/services/registration/invalid_pay_debt_amount new file mode 100644 index 0000000..635ece1 --- /dev/null +++ b/services/registration/invalid_pay_debt_amount @@ -0,0 +1 @@ +Amount {{.confirm_debt_removal}} is invalid, please try again: \ No newline at end of file diff --git a/services/registration/invalid_pay_debt_amount.vis b/services/registration/invalid_pay_debt_amount.vis new file mode 100644 index 0000000..34713e6 --- /dev/null +++ b/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 diff --git a/services/registration/invalid_pay_debt_amount_swa b/services/registration/invalid_pay_debt_amount_swa new file mode 100644 index 0000000..c98b686 --- /dev/null +++ b/services/registration/invalid_pay_debt_amount_swa @@ -0,0 +1 @@ +Kiwango {{.confirm_debt_removal}} sio sahihi, tafadhali weka tena: \ No newline at end of file diff --git a/services/registration/pay_debt b/services/registration/pay_debt index 1e2b322..3e1fc9d 100644 --- a/services/registration/pay_debt +++ b/services/registration/pay_debt @@ -1 +1 @@ -{{.calculate_max_pay_debt}} \ No newline at end of file +{{.get_vouchers}} diff --git a/services/registration/pay_debt.vis b/services/registration/pay_debt.vis index 7cd5592..9cf8b87 100644 --- a/services/registration/pay_debt.vis +++ b/services/registration/pay_debt.vis @@ -1,10 +1,16 @@ CATCH no_voucher flag_no_active_voucher 1 -CATCH no_stable_voucher flag_no_stable_vouchers 1 +LOAD get_vouchers 0 +MAP get_vouchers +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 low_pay_debt_amount flag_low_swap_amount 1 -MOUT back 0 -HALT -INCMP _ 0 -INCMP confirm_debt_removal * +CATCH . flag_incorrect_voucher 1 +INCMP calculate_max_pay_debt * -- 2.45.2 From 8f66a46e76b761fb0e1a9a3b4f24b9c47c5da598 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 13 Feb 2026 16:04:00 +0300 Subject: [PATCH 72/74] added a function to ReadSwapFromVoucher --- store/swap.go | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/store/swap.go b/store/swap.go index 3359a6f..9b51b98 100644 --- a/store/swap.go +++ b/store/swap.go @@ -209,4 +209,30 @@ func UpdateSwapFromVoucherData(ctx context.Context, store DataStore, sessionId s } return nil -} \ No newline at end of file +} + +// 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 +} -- 2.45.2 From 2e81ae58bcfd52d16a0fc3d4ac3c997fe9264765 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 13 Feb 2026 16:07:46 +0300 Subject: [PATCH 73/74] refactored the code for proper debt removal confirmation --- handlers/application/paydebt.go | 48 ++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/handlers/application/paydebt.go b/handlers/application/paydebt.go index 087825a..c6bb7c0 100644 --- a/handlers/application/paydebt.go +++ b/handlers/application/paydebt.go @@ -60,14 +60,6 @@ func (h *MenuHandlers) CalculateMaxPayDebt(ctx context.Context, sym string, inpu return res, nil } - logg.InfoCtxf(ctx, "Metadata from GetVoucherData:", "metadata", metadata) - - // 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 - } - // 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 { @@ -77,6 +69,14 @@ func (h *MenuHandlers) CalculateMaxPayDebt(ctx context.Context, sym string, inpu } 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(maxLimit, metadata.TokenDecimals) @@ -160,6 +160,18 @@ func (h *MenuHandlers) ConfirmDebtRemoval(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 + } + + payDebtVoucher, err := store.ReadSwapFromVoucher(ctx, h.userdataStore, sessionId) + if err != nil { + logg.ErrorCtxf(ctx, "failed on ReadSwapFromVoucher", "error", err) + return res, err + } + swapData, err := store.ReadSwapPreviewData(ctx, userStore, sessionId) if err != nil { return res, err @@ -172,19 +184,17 @@ func (h *MenuHandlers) ConfirmDebtRemoval(ctx context.Context, sym string, input } 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) + 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 } @@ -195,15 +205,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, swapData.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) @@ -220,7 +224,7 @@ func (h *MenuHandlers) ConfirmDebtRemoval(ctx context.Context, sym string, input 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, + inputStr, payDebtVoucher.TokenSymbol, qouteStr, string(activeSym), ) return res, nil -- 2.45.2 From 43b963995f18baf8181d74875af52c16784cd93d Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Fri, 13 Feb 2026 16:36:20 +0300 Subject: [PATCH 74/74] refactored the code to send the correct pool deposit request --- handlers/application/paydebt.go | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/handlers/application/paydebt.go b/handlers/application/paydebt.go index c6bb7c0..a836054 100644 --- a/handlers/application/paydebt.go +++ b/handlers/application/paydebt.go @@ -69,9 +69,9 @@ func (h *MenuHandlers) CalculateMaxPayDebt(ctx context.Context, sym string, inpu } 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) @@ -205,7 +205,7 @@ 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 } - + // call the API to get the quote r, err := h.accountService.GetPoolSwapQuote(ctx, finalAmountStr, string(publicKey), payDebtVoucher.TokenAddress, swapData.ActivePoolAddress, string(activeAddress)) if err != nil { @@ -222,6 +222,13 @@ func (h *MenuHandlers) ConfirmDebtRemoval(ctx context.Context, sym string, input // 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, payDebtVoucher.TokenSymbol, qouteStr, string(activeSym), @@ -247,9 +254,21 @@ func (h *MenuHandlers) InitiatePayDebt(ctx context.Context, sym string, input [] userStore := h.userdataStore - // Resolve active pool - _, activePoolName, err := h.resolveActivePoolDetails(ctx, sessionId) + // Fetch session data + _, _, activeSym, activeAddress, publicKey, _, err := h.getSessionData(ctx, sessionId) if err != nil { + return res, nil + } + + // Resolve active pool + activePoolAddress, activePoolName, err := h.resolveActivePoolDetails(ctx, sessionId) + if err != nil { + return res, err + } + + payDebtVoucher, err := store.ReadSwapFromVoucher(ctx, h.userdataStore, sessionId) + if err != nil { + logg.ErrorCtxf(ctx, "failed on ReadSwapFromVoucher", "error", err) return res, err } @@ -267,7 +286,7 @@ func (h *MenuHandlers) InitiatePayDebt(ctx context.Context, sym string, input [] 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) @@ -282,7 +301,7 @@ 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, + string(activeSym), activePoolName, ) -- 2.45.2