From 208eac5a3cb44611672db87f27f9d67dd7c9bd6f Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 13 Nov 2025 01:44:50 +0300 Subject: [PATCH 1/5] use the correct 'flag_api_call_error' --- handlers/application/pools.go | 8 +++---- handlers/application/poolswap.go | 18 ++++++++-------- handlers/application/send.go | 32 +++++++++++++++------------- handlers/application/transactions.go | 6 +++--- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/handlers/application/pools.go b/handlers/application/pools.go index d4d7242..23a9964 100644 --- a/handlers/application/pools.go +++ b/handlers/application/pools.go @@ -22,12 +22,12 @@ func (h *MenuHandlers) GetPools(ctx context.Context, sym string, input []byte) ( } userStore := h.userdataStore - flag_api_error, _ := h.flagManager.GetFlag("flag_api_error") + flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error") // call the api to get a list of top 5 pools sorted by swaps topPools, err := h.accountService.FetchTopPools(ctx) if err != nil { - res.FlagSet = append(res.FlagSet, flag_api_error) + res.FlagSet = append(res.FlagSet, flag_api_call_error) logg.ErrorCtxf(ctx, "failed on FetchTransactions", "error", err) return res, err } @@ -129,12 +129,12 @@ func (h *MenuHandlers) ViewPool(ctx context.Context, sym string, input []byte) ( } if poolData == nil { - flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error") + flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error") // no match found. Call the API using the inputStr as the symbol poolResp, err := h.accountService.RetrievePoolDetails(ctx, inputStr) if err != nil { - res.FlagSet = append(res.FlagSet, flag_api_error) + res.FlagSet = append(res.FlagSet, flag_api_call_error) return res, nil } diff --git a/handlers/application/poolswap.go b/handlers/application/poolswap.go index 6f08978..2dd2f2c 100644 --- a/handlers/application/poolswap.go +++ b/handlers/application/poolswap.go @@ -41,7 +41,7 @@ func (h *MenuHandlers) LoadSwapToList(ctx context.Context, sym string, input []b l.AddDomain("default") flag_incorrect_voucher, _ := h.flagManager.GetFlag("flag_incorrect_voucher") - flag_api_error, _ := h.flagManager.GetFlag("flag_api_error") + flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error") inputStr := string(input) if inputStr == "0" { @@ -88,7 +88,7 @@ func (h *MenuHandlers) LoadSwapToList(ctx context.Context, sym string, input []b // call the api using the ActivePoolAddress and ActiveVoucherAddress to check if it is part of the pool r, err := h.accountService.CheckTokenInPool(ctx, string(activePoolAddress), string(activeAddress)) if err != nil { - res.FlagSet = append(res.FlagSet, flag_api_error) + res.FlagSet = append(res.FlagSet, flag_api_call_error) logg.ErrorCtxf(ctx, "failed on CheckTokenInPool", "error", err) return res, err } @@ -110,7 +110,7 @@ func (h *MenuHandlers) LoadSwapToList(ctx context.Context, sym string, input []b // call the api using the activePoolAddress to get a list of SwapToSymbolsData swapToList, err := h.accountService.GetPoolSwappableVouchers(ctx, string(activePoolAddress)) if err != nil { - res.FlagSet = append(res.FlagSet, flag_api_error) + res.FlagSet = append(res.FlagSet, flag_api_call_error) logg.ErrorCtxf(ctx, "failed on FetchTransactions", "error", err) return res, err } @@ -165,7 +165,7 @@ func (h *MenuHandlers) SwapMaxLimit(ctx context.Context, sym string, input []byt } flag_incorrect_voucher, _ := h.flagManager.GetFlag("flag_incorrect_voucher") - flag_api_error, _ := h.flagManager.GetFlag("flag_api_error") + flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error") flag_low_swap_amount, _ := h.flagManager.GetFlag("flag_low_swap_amount") res.FlagReset = append(res.FlagReset, flag_incorrect_voucher, flag_low_swap_amount) @@ -202,7 +202,7 @@ func (h *MenuHandlers) SwapMaxLimit(ctx context.Context, sym string, input []byt logg.InfoCtxf(ctx, "Call GetSwapFromTokenMaxLimit with:", "ActivePoolAddress", swapData.ActivePoolAddress, "ActiveSwapFromAddress", swapData.ActiveSwapFromAddress, "ActiveSwapToAddress", swapData.ActiveSwapToAddress, "publicKey", swapData.PublicKey) r, err := h.accountService.GetSwapFromTokenMaxLimit(ctx, swapData.ActivePoolAddress, swapData.ActiveSwapFromAddress, swapData.ActiveSwapToAddress, swapData.PublicKey) if err != nil { - res.FlagSet = append(res.FlagSet, flag_api_error) + res.FlagSet = append(res.FlagSet, flag_api_call_error) logg.ErrorCtxf(ctx, "failed on GetSwapFromTokenMaxLimit", "error", err) return res, err } @@ -310,8 +310,8 @@ func (h *MenuHandlers) SwapPreview(ctx context.Context, sym string, input []byte // call the API to get the quote r, err := h.accountService.GetPoolSwapQuote(ctx, finalAmountStr, swapData.PublicKey, swapData.ActiveSwapFromAddress, swapData.ActivePoolAddress, swapData.ActiveSwapToAddress) if err != nil { - flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error") - res.FlagSet = append(res.FlagSet, flag_api_error) + 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 @@ -364,8 +364,8 @@ func (h *MenuHandlers) InitiateSwap(ctx context.Context, sym string, input []byt // Call the poolSwap API r, err := h.accountService.PoolSwap(ctx, swapAmountStr, swapData.PublicKey, swapData.ActiveSwapFromAddress, swapData.ActivePoolAddress, swapData.ActiveSwapToAddress) if err != nil { - flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error") - res.FlagSet = append(res.FlagSet, flag_api_error) + 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 diff --git a/handlers/application/send.go b/handlers/application/send.go index 70c126d..2c7fb9a 100644 --- a/handlers/application/send.go +++ b/handlers/application/send.go @@ -133,7 +133,7 @@ func (h *MenuHandlers) handleAddress(ctx context.Context, sessionId, recipient s func (h *MenuHandlers) handleAlias(ctx context.Context, sessionId, recipient string, res *resource.Result) (resource.Result, error) { store := h.userdataStore flag_invalid_recipient, _ := h.flagManager.GetFlag("flag_invalid_recipient") - flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error") + flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error") var aliasAddressResult string @@ -151,11 +151,11 @@ func (h *MenuHandlers) handleAlias(ctx context.Context, sessionId, recipient str alias, err := h.accountService.CheckAliasAddress(ctx, fqdn) if err == nil { - res.FlagReset = append(res.FlagReset, flag_api_error) + res.FlagReset = append(res.FlagReset, flag_api_call_error) aliasAddressResult = alias.Address break } else { - res.FlagSet = append(res.FlagSet, flag_api_error) + res.FlagSet = append(res.FlagSet, flag_api_call_error) logg.ErrorCtxf(ctx, "Alias resolution failed", "alias", fqdn, "error", err) return *res, nil } @@ -318,7 +318,7 @@ func (h *MenuHandlers) MaxAmount(ctx context.Context, sym string, input []byte) return res, fmt.Errorf("missing session") } - flag_api_error, _ := h.flagManager.GetFlag("flag_api_error") + flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error") flag_swap_transaction, _ := h.flagManager.GetFlag("flag_swap_transaction") userStore := h.userdataStore @@ -366,8 +366,9 @@ func (h *MenuHandlers) MaxAmount(ctx context.Context, sym string, input []byte) canSwap, err := h.accountService.CheckTokenInPool(ctx, string(activePoolAddress), string(activeAddress)) if err != nil || !canSwap.CanSwapFrom { if err != nil { - res.FlagSet = append(res.FlagSet, flag_api_error) + res.FlagSet = append(res.FlagSet, flag_api_call_error) logg.ErrorCtxf(ctx, "failed on CheckTokenInPool", "error", err) + return res, nil } res.FlagReset = append(res.FlagReset, flag_swap_transaction) res.Content = l.Get("Maximum amount: %s %s\nEnter amount:", formattedBalance, string(activeSym)) @@ -377,8 +378,9 @@ func (h *MenuHandlers) MaxAmount(ctx context.Context, sym string, input []byte) // retrieve the max credit send amounts maxSAT, maxRAT, err := h.calculateSendCreditLimits(ctx, activePoolAddress, activeAddress, recipientActiveAddress, publicKey, activeDecimal, recipientActiveDecimal) if err != nil { - res.FlagSet = append(res.FlagSet, flag_api_error) - return res, err + res.FlagSet = append(res.FlagSet, flag_api_call_error) + logg.ErrorCtxf(ctx, "failed on calculateSendCreditLimits", "error", err) + return res, nil } // Fallback if below minimum @@ -668,8 +670,8 @@ func (h *MenuHandlers) InitiateTransaction(ctx context.Context, sym string, inpu res.Content = l.Get("An unexpected error occurred. Please try again later.") } - flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error") - res.FlagSet = append(res.FlagSet, flag_api_error) + flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error") + res.FlagSet = append(res.FlagSet, flag_api_call_error) logg.ErrorCtxf(ctx, "failed on TokenTransfer", "error", err) return res, nil } @@ -752,8 +754,8 @@ func (h *MenuHandlers) TransactionSwapPreview(ctx context.Context, sym string, i // call the credit send API to get the reverse quote r, err := h.accountService.GetCreditSendReverseQuote(ctx, swapData.ActivePoolAddress, swapData.ActiveSwapFromAddress, swapData.ActiveSwapToAddress, finalAmountStr) if err != nil { - flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error") - res.FlagSet = append(res.FlagSet, flag_api_error) + 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 GetCreditSendReverseQuote poolSwap", "error", err) return res, nil @@ -831,8 +833,8 @@ func (h *MenuHandlers) TransactionInitiateSwap(ctx context.Context, sym string, // Call the poolSwap API poolSwap, err := h.accountService.PoolSwap(ctx, swapAmountStr, swapData.PublicKey, swapData.ActiveSwapFromAddress, swapData.ActivePoolAddress, swapData.ActiveSwapToAddress) if err != nil { - flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error") - res.FlagSet = append(res.FlagSet, flag_api_error) + 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 @@ -863,8 +865,8 @@ func (h *MenuHandlers) TransactionInitiateSwap(ctx context.Context, sym string, // Call TokenTransfer with the expected swap amount tokenTransfer, err := h.accountService.TokenTransfer(ctx, string(amount), swapData.PublicKey, string(recipientPublicKey), swapData.ActiveSwapToAddress) if err != nil { - flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error") - res.FlagSet = append(res.FlagSet, flag_api_error) + 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 TokenTransfer", "error", err) return res, nil diff --git a/handlers/application/transactions.go b/handlers/application/transactions.go index 62d2a45..b81ebad 100644 --- a/handlers/application/transactions.go +++ b/handlers/application/transactions.go @@ -20,7 +20,7 @@ func (h *MenuHandlers) CheckTransactions(ctx context.Context, sym string, input } flag_no_transfers, _ := h.flagManager.GetFlag("flag_no_transfers") - flag_api_error, _ := h.flagManager.GetFlag("flag_api_error") + flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error") userStore := h.userdataStore logdb := h.logDb @@ -33,11 +33,11 @@ func (h *MenuHandlers) CheckTransactions(ctx context.Context, sym string, input // Fetch transactions from the API using the public key transactionsResp, err := h.accountService.FetchTransactions(ctx, string(publicKey)) if err != nil { - res.FlagSet = append(res.FlagSet, flag_api_error) + res.FlagSet = append(res.FlagSet, flag_api_call_error) logg.ErrorCtxf(ctx, "failed on FetchTransactions", "error", err) return res, err } - res.FlagReset = append(res.FlagReset, flag_api_error) + res.FlagReset = append(res.FlagReset, flag_api_call_error) // Return if there are no transactions if len(transactionsResp) == 0 { -- 2.45.2 From d52d6c478fe1069726832aaa7472d281fa0e3340 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 13 Nov 2025 01:46:36 +0300 Subject: [PATCH 2/5] added a CATCH for the api_call_error flag --- services/registration/credit_amount.vis | 1 + 1 file changed, 1 insertion(+) diff --git a/services/registration/credit_amount.vis b/services/registration/credit_amount.vis index f6b3055..f0f716f 100644 --- a/services/registration/credit_amount.vis +++ b/services/registration/credit_amount.vis @@ -1,6 +1,7 @@ LOAD reset_transaction_amount 10 LOAD credit_max_amount 160 RELOAD credit_max_amount +CATCH api_failure flag_api_call_error 1 MAP credit_max_amount MOUT back 0 HALT -- 2.45.2 From 8d29c364c3bdd98aa6d3368c02cafa7e7b6d57ad Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 13 Nov 2025 17:07:57 +0300 Subject: [PATCH 3/5] updated the swahili message for output length error --- services/registration/swap_to_list_swa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/registration/swap_to_list_swa b/services/registration/swap_to_list_swa index 42da7d3..2dd923b 100644 --- a/services/registration/swap_to_list_swa +++ b/services/registration/swap_to_list_swa @@ -1,2 +1,2 @@ -Chagua nambari au ishara ya sarafu kubadilisha KWENDA: +Chagua nambari au ishara ya sarafu unayotaka kupokea. {{.swap_to_list}} \ No newline at end of file -- 2.45.2 From 308dc93a91365cf71e4b631d8a7d3327d49f87b0 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 13 Nov 2025 17:09:30 +0300 Subject: [PATCH 4/5] return nil to CATCH the flag_api_call_error --- 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 2dd2f2c..7426cd9 100644 --- a/handlers/application/poolswap.go +++ b/handlers/application/poolswap.go @@ -204,7 +204,7 @@ func (h *MenuHandlers) SwapMaxLimit(ctx context.Context, sym string, input []byt if err != nil { res.FlagSet = append(res.FlagSet, flag_api_call_error) logg.ErrorCtxf(ctx, "failed on GetSwapFromTokenMaxLimit", "error", err) - return res, err + return res, nil } // Scale down the amount -- 2.45.2 From bafe3cc04e3e3c16286d6a7cdc2df70e1cb6ba01 Mon Sep 17 00:00:00 2001 From: Alfred Kamanda Date: Thu, 13 Nov 2025 17:13:34 +0300 Subject: [PATCH 5/5] added the swap menu swahili version --- services/registration/swap_menu_swa | 1 + 1 file changed, 1 insertion(+) create mode 100644 services/registration/swap_menu_swa diff --git a/services/registration/swap_menu_swa b/services/registration/swap_menu_swa new file mode 100644 index 0000000..b990e25 --- /dev/null +++ b/services/registration/swap_menu_swa @@ -0,0 +1 @@ +Badilisha \ No newline at end of file -- 2.45.2