From 04c7e204576ebf643c556e78270997a15af59236 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Wed, 26 Mar 2025 14:38:47 +0300 Subject: [PATCH 01/20] set api call error flag to failing api calls --- handlers/application/menuhandler.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/handlers/application/menuhandler.go b/handlers/application/menuhandler.go index 5cbea34..229452d 100644 --- a/handlers/application/menuhandler.go +++ b/handlers/application/menuhandler.go @@ -1403,7 +1403,7 @@ func (h *MenuHandlers) CheckAccountStatus(ctx context.Context, sym string, input if err != nil { res.FlagSet = append(res.FlagSet, flag_api_error) logg.ErrorCtxf(ctx, "failed on TrackAccountStatus", "error", err) - return res, err + return res, nil } res.FlagReset = append(res.FlagReset, flag_api_error) @@ -1569,6 +1569,7 @@ func (h *MenuHandlers) ValidateRecipient(ctx context.Context, sym string, input } flag_invalid_recipient, _ := h.flagManager.GetFlag("flag_invalid_recipient") flag_invalid_recipient_with_invite, _ := h.flagManager.GetFlag("flag_invalid_recipient_with_invite") + flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error") recipient := string(input) @@ -1642,10 +1643,13 @@ func (h *MenuHandlers) ValidateRecipient(ctx context.Context, sym string, input logg.InfoCtxf(ctx, "Resolving with fqdn alias", "alias", fqdn) AliasAddress, err = h.accountService.CheckAliasAddress(ctx, fqdn) if err == nil { + res.FlagReset = append(res.FlagReset, flag_api_error) AliasAddressResult = AliasAddress.Address continue } else { + res.FlagSet = append(res.FlagSet, flag_api_error) logg.ErrorCtxf(ctx, "failed to resolve alias", "alias", recipient, "error_alias_check", err) + return res, nil } } } @@ -2038,6 +2042,7 @@ func (h *MenuHandlers) CheckVouchers(ctx context.Context, sym string, input []by if !ok { return res, fmt.Errorf("missing session") } + flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error") userStore := h.userdataStore publicKey, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY) @@ -2049,8 +2054,10 @@ func (h *MenuHandlers) CheckVouchers(ctx context.Context, sym string, input []by // Fetch vouchers from the API using the public key vouchersResp, err := h.accountService.FetchVouchers(ctx, string(publicKey)) if err != nil { + res.FlagSet = append(res.FlagSet, flag_api_error) return res, nil } + res.FlagReset = append(res.FlagReset, flag_api_error) logg.InfoCtxf(ctx, "fetched user vouchers", "public_key", string(publicKey), "vouchers", vouchersResp) -- 2.45.2 From 3532f72fbde702a8185d8f937950b0b126d0568d Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Wed, 26 Mar 2025 14:39:37 +0300 Subject: [PATCH 02/20] remove unneccessary catch --- services/registration/amount.vis | 1 - 1 file changed, 1 deletion(-) diff --git a/services/registration/amount.vis b/services/registration/amount.vis index 10d4430..ac3abd1 100644 --- a/services/registration/amount.vis +++ b/services/registration/amount.vis @@ -6,7 +6,6 @@ MOUT back 0 HALT LOAD validate_amount 64 RELOAD validate_amount -CATCH api_failure flag_api_call_error 1 CATCH invalid_amount flag_invalid_amount 1 INCMP _ 0 LOAD get_recipient 0 -- 2.45.2 From 039117f40ed2bc7ff0270b91474181e523822066 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Wed, 26 Mar 2025 14:40:32 +0300 Subject: [PATCH 03/20] add api call failure catch --- services/registration/main.vis | 1 + services/registration/send.vis | 1 + 2 files changed, 2 insertions(+) diff --git a/services/registration/main.vis b/services/registration/main.vis index 5996c97..1e2566d 100644 --- a/services/registration/main.vis +++ b/services/registration/main.vis @@ -4,6 +4,7 @@ LOAD set_default_voucher 8 RELOAD set_default_voucher LOAD check_vouchers 10 RELOAD check_vouchers +CATCH api_failure flag_api_call_error 1 LOAD check_balance 128 RELOAD check_balance CATCH api_failure flag_api_call_error 1 diff --git a/services/registration/send.vis b/services/registration/send.vis index 369bb67..dfdcd70 100644 --- a/services/registration/send.vis +++ b/services/registration/send.vis @@ -5,6 +5,7 @@ MOUT back 0 HALT LOAD validate_recipient 50 RELOAD validate_recipient +CATCH api_failure flag_api_call_error 1 CATCH invalid_recipient flag_invalid_recipient 1 CATCH invite_recipient flag_invalid_recipient_with_invite 1 INCMP _ 0 -- 2.45.2 From e832f46d2215bca129eda300c57540628a14236e Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Wed, 26 Mar 2025 14:40:54 +0300 Subject: [PATCH 04/20] return to top on retry --- services/registration/api_failure.vis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/registration/api_failure.vis b/services/registration/api_failure.vis index 37b3deb..c625bfe 100644 --- a/services/registration/api_failure.vis +++ b/services/registration/api_failure.vis @@ -1,5 +1,5 @@ MOUT retry 1 MOUT quit 9 HALT -INCMP _ 1 +INCMP ^ 1 INCMP quit 9 -- 2.45.2 From bbecec0310998fb21237995f31efd72a97e7874a Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Fri, 28 Mar 2025 15:46:21 +0300 Subject: [PATCH 05/20] catch api call error when requesting an alias --- services/registration/my_account_alias.vis | 1 + 1 file changed, 1 insertion(+) diff --git a/services/registration/my_account_alias.vis b/services/registration/my_account_alias.vis index 506f432..1a6894f 100644 --- a/services/registration/my_account_alias.vis +++ b/services/registration/my_account_alias.vis @@ -5,4 +5,5 @@ HALT INCMP _ 0 LOAD request_custom_alias 0 RELOAD request_custom_alias +CATCH api_failure flag_api_call_error 1 INCMP confirm_new_alias * -- 2.45.2 From c814c4ae5c275b59bcd1a128e8333c48549141cf Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Fri, 28 Mar 2025 15:46:57 +0300 Subject: [PATCH 06/20] register handler to reset api call failure flag --- handlers/local.go | 1 + 1 file changed, 1 insertion(+) diff --git a/handlers/local.go b/handlers/local.go index 43b0bb5..459754b 100644 --- a/handlers/local.go +++ b/handlers/local.go @@ -129,6 +129,7 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService) ls.DbRs.AddLocalFunc("get_suggested_alias", appHandlers.GetSuggestedAlias) ls.DbRs.AddLocalFunc("confirm_new_alias", appHandlers.ConfirmNewAlias) ls.DbRs.AddLocalFunc("check_account_created", appHandlers.CheckAccountCreated) + ls.DbRs.AddLocalFunc("reset_api_call_failure", appHandlers.ResetApiCallFailure) ls.first = appHandlers.Init -- 2.45.2 From 6c46c097fb0d93d3baaac8abe5d8f1c5ce4e1ba9 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Fri, 28 Mar 2025 15:47:34 +0300 Subject: [PATCH 07/20] add explicit api call failure flag reset --- services/registration/api_failure.vis | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/registration/api_failure.vis b/services/registration/api_failure.vis index c625bfe..469b5db 100644 --- a/services/registration/api_failure.vis +++ b/services/registration/api_failure.vis @@ -1,3 +1,5 @@ +LOAD reset_api_call_failure 6 +RELOAD reset_api_call_failure MOUT retry 1 MOUT quit 9 HALT -- 2.45.2 From 9674a04cbc7e1519e8f250515394c3ea2f7b4b69 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Fri, 28 Mar 2025 15:51:56 +0300 Subject: [PATCH 08/20] add handler to reset api call failure flag,set flag when requesting an alias fails --- handlers/application/menuhandler.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/handlers/application/menuhandler.go b/handlers/application/menuhandler.go index 61125f8..cc86a9b 100644 --- a/handlers/application/menuhandler.go +++ b/handlers/application/menuhandler.go @@ -487,6 +487,14 @@ func (h *MenuHandlers) ResetInvalidPIN(ctx context.Context, sym string, input [] return res, nil } +// ResetApiCallFailure resets the api call failure flag +func (h *MenuHandlers) ResetApiCallFailure(ctx context.Context, sym string, input []byte) (resource.Result, error) { + var res resource.Result + flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error") + res.FlagReset = append(res.FlagReset, flag_api_error) + return res, nil +} + // ConfirmPinChange validates user's new PIN. If input matches the temporary PIN, saves it as the new account PIN. func (h *MenuHandlers) ConfirmPinChange(ctx context.Context, sym string, input []byte) (resource.Result, error) { var res resource.Result @@ -2508,6 +2516,8 @@ func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input return res, nil } + flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error") + store := h.userdataStore aliasHint, err := store.ReadEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE) if err != nil { @@ -2531,9 +2541,12 @@ func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input sanitizedInput := sanitizeAliasHint(string(input)) aliasResult, err := h.accountService.RequestAlias(ctx, string(pubKey), sanitizedInput) if err != nil { + res.FlagSet = append(res.FlagSet, flag_api_error) logg.ErrorCtxf(ctx, "failed to retrieve alias", "alias", string(aliasHint), "error_alias_request", err) - return res, fmt.Errorf("Failed to retrieve alias: %s", err.Error()) + return res, nil } + res.FlagReset = append(res.FlagReset, flag_api_error) + alias := aliasResult.Alias logg.InfoCtxf(ctx, "Suggested alias ", "alias", alias) -- 2.45.2 From 95b9a6e48632941da862bf4a58964299231c7680 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Fri, 28 Mar 2025 16:09:53 +0300 Subject: [PATCH 09/20] catch api call failure when fetching voucher details --- services/registration/voucher_details.vis | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/registration/voucher_details.vis b/services/registration/voucher_details.vis index 1b009f1..628e034 100644 --- a/services/registration/voucher_details.vis +++ b/services/registration/voucher_details.vis @@ -1,5 +1,7 @@ CATCH no_voucher flag_no_active_voucher 1 LOAD get_voucher_details 0 +RELOAD get_voucher_details +CATCH api_failure flag_api_call_error 1 MAP get_voucher_details MOUT back 0 HALT -- 2.45.2 From cd2f4328a8d91cd319c0fb533016b8e8c60a919f Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Mon, 31 Mar 2025 15:41:19 +0300 Subject: [PATCH 10/20] check for api call failure when checking transactions --- services/registration/check_statement.vis | 1 + 1 file changed, 1 insertion(+) diff --git a/services/registration/check_statement.vis b/services/registration/check_statement.vis index d79b5ca..c393a0a 100644 --- a/services/registration/check_statement.vis +++ b/services/registration/check_statement.vis @@ -1,5 +1,6 @@ LOAD check_transactions 0 RELOAD check_transactions +CATCH api_failure flag_api_call_error 1 CATCH no_transfers flag_no_transfers 1 LOAD authorize_account 6 MOUT back 0 -- 2.45.2 From f562ce8adf51318e59b8e99111670585950b4525 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Mon, 31 Mar 2025 15:41:49 +0300 Subject: [PATCH 11/20] check for api call failure when setting the dafault voucher --- services/registration/main.vis | 1 + 1 file changed, 1 insertion(+) diff --git a/services/registration/main.vis b/services/registration/main.vis index 1e2566d..30cadcd 100644 --- a/services/registration/main.vis +++ b/services/registration/main.vis @@ -2,6 +2,7 @@ LOAD clear_temporary_value 2 RELOAD clear_temporary_value LOAD set_default_voucher 8 RELOAD set_default_voucher +CATCH api_failure flag_api_call_error 1 LOAD check_vouchers 10 RELOAD check_vouchers CATCH api_failure flag_api_call_error 1 -- 2.45.2 From 7883063e5365baf89d59a80baee2f6bb9993bbca Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Mon, 31 Mar 2025 15:42:27 +0300 Subject: [PATCH 12/20] feat: set and reset api call failure flags --- handlers/application/menuhandler.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/handlers/application/menuhandler.go b/handlers/application/menuhandler.go index cc86a9b..42e4857 100644 --- a/handlers/application/menuhandler.go +++ b/handlers/application/menuhandler.go @@ -1970,6 +1970,7 @@ func (h *MenuHandlers) SetDefaultVoucher(ctx context.Context, sym string, input } flag_no_active_voucher, _ := h.flagManager.GetFlag("flag_no_active_voucher") + flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error") // check if the user has an active sym _, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM) @@ -1984,9 +1985,10 @@ func (h *MenuHandlers) SetDefaultVoucher(ctx context.Context, sym string, input // Fetch vouchers from the API using the public key vouchersResp, err := h.accountService.FetchVouchers(ctx, string(publicKey)) if err != nil { - res.FlagSet = append(res.FlagSet, flag_no_active_voucher) + res.FlagSet = append(res.FlagSet, flag_api_error) return res, nil } + res.FlagReset = append(res.FlagReset, flag_api_error) // Return if there is no voucher if len(vouchersResp) == 0 { @@ -2246,6 +2248,7 @@ func (h *MenuHandlers) GetVoucherDetails(ctx context.Context, sym string, input res.FlagSet = append(res.FlagSet, flag_api_error) return res, nil } + res.FlagReset = append(res.FlagReset, flag_api_error) res.Content = fmt.Sprintf( "Name: %s\nSymbol: %s\nCommodity: %s\nLocation: %s", voucherData.TokenName, voucherData.TokenSymbol, voucherData.TokenCommodity, voucherData.TokenLocation, @@ -2279,6 +2282,7 @@ func (h *MenuHandlers) CheckTransactions(ctx context.Context, sym string, input logg.ErrorCtxf(ctx, "failed on FetchTransactions", "error", err) return res, err } + res.FlagReset = append(res.FlagReset, flag_api_error) // Return if there are no transactions if len(transactionsResp) == 0 { -- 2.45.2 From d0be79d817fed60f01027b8db101e5ba38134f9b Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Tue, 1 Apr 2025 11:30:00 +0300 Subject: [PATCH 13/20] set account creation failed flag --- handlers/application/menuhandler.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/handlers/application/menuhandler.go b/handlers/application/menuhandler.go index 42e4857..b623a32 100644 --- a/handlers/application/menuhandler.go +++ b/handlers/application/menuhandler.go @@ -186,10 +186,16 @@ func (h *MenuHandlers) SetLanguage(ctx context.Context, sym string, input []byte // handles the account creation when no existing account is present for the session and stores associated data in the user data store. func (h *MenuHandlers) createAccountNoExist(ctx context.Context, sessionId string, res *resource.Result) error { flag_account_created, _ := h.flagManager.GetFlag("flag_account_created") + flag_account_creation_failed, _ := h.flagManager.GetFlag("flag_account_creation_failed") + r, err := h.accountService.CreateAccount(ctx) if err != nil { - return err + res.FlagSet = append(res.FlagSet, flag_account_creation_failed) + logg.ErrorCtxf(ctx, "failed to create an account", "error", err) + return nil } + res.FlagReset = append(res.FlagReset, flag_account_creation_failed) + trackingId := r.TrackingId publicKey := r.PublicKey -- 2.45.2 From 3615348efdff2e45b8aefc770b86c34beb343a3a Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Tue, 1 Apr 2025 11:57:59 +0300 Subject: [PATCH 14/20] add swahili template --- services/registration/api_failure_swa | 1 + 1 file changed, 1 insertion(+) create mode 100644 services/registration/api_failure_swa diff --git a/services/registration/api_failure_swa b/services/registration/api_failure_swa new file mode 100644 index 0000000..fb24f2c --- /dev/null +++ b/services/registration/api_failure_swa @@ -0,0 +1 @@ +Imeshindwa kuunganisha kwenye huduma ya uangalizi. Tafadhali jaribu tena. \ No newline at end of file -- 2.45.2 From a7e8c184f5c5f18f947de96498807cf703929992 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Tue, 1 Apr 2025 11:59:31 +0300 Subject: [PATCH 15/20] add some spacing --- services/registration/api_failure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/registration/api_failure b/services/registration/api_failure index 06d2d9e..915b7fc 100644 --- a/services/registration/api_failure +++ b/services/registration/api_failure @@ -1 +1 @@ -Failed to connect to the custodial service.Please try again. \ No newline at end of file +Failed to connect to the custodial service .Please try again. \ No newline at end of file -- 2.45.2 From 0458ac949819677304a763801ec60ad9536e3325 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Tue, 1 Apr 2025 12:38:57 +0300 Subject: [PATCH 16/20] fix failing test --- handlers/application/menuhandler_test.go | 29 ++++++++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/handlers/application/menuhandler_test.go b/handlers/application/menuhandler_test.go index 6c5f5a2..101ce8f 100644 --- a/handlers/application/menuhandler_test.go +++ b/handlers/application/menuhandler_test.go @@ -201,6 +201,8 @@ func TestCreateAccount(t *testing.T) { } flag_account_created, err := fm.GetFlag("flag_account_created") + flag_account_creation_failed, _ := fm.GetFlag("flag_account_creation_failed") + if err != nil { t.Logf(err.Error()) } @@ -217,7 +219,8 @@ func TestCreateAccount(t *testing.T) { PublicKey: "0xD3adB33f", }, expectedResult: resource.Result{ - FlagSet: []uint32{flag_account_created}, + FlagSet: []uint32{flag_account_created}, + FlagReset: []uint32{flag_account_creation_failed}, }, }, } @@ -2000,6 +2003,11 @@ func TestSetDefaultVoucher(t *testing.T) { t.Logf(err.Error()) } flag_no_active_voucher, err := fm.GetFlag("flag_no_active_voucher") + if err != nil { + t.Logf(err.Error()) + } + flag_api_error, err := fm.GetFlag("flag_api_call_error") + if err != nil { t.Logf(err.Error()) } @@ -2015,7 +2023,8 @@ func TestSetDefaultVoucher(t *testing.T) { name: "Test no vouchers available", vouchersResp: []dataserviceapi.TokenHoldings{}, expectedResult: resource.Result{ - FlagSet: []uint32{flag_no_active_voucher}, + FlagSet: []uint32{flag_no_active_voucher}, + FlagReset: []uint32{flag_api_error}, }, }, { @@ -2028,7 +2037,9 @@ func TestSetDefaultVoucher(t *testing.T) { Balance: "100", }, }, - expectedResult: resource.Result{}, + expectedResult: resource.Result{ + FlagReset: []uint32{flag_api_error}, + }, }, } @@ -2068,12 +2079,18 @@ func TestCheckVouchers(t *testing.T) { ctx, store := InitializeTestStore(t) ctx = context.WithValue(ctx, "SessionId", sessionId) + fm, err := NewFlagManager(flagsPath) + if err != nil { + t.Logf(err.Error()) + } + h := &MenuHandlers{ userdataStore: store, accountService: mockAccountService, + flagManager: fm, } - err := store.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(publicKey)) + err = store.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(publicKey)) if err != nil { t.Fatal(err) } @@ -2222,6 +2239,8 @@ func TestGetVoucherDetails(t *testing.T) { if err != nil { t.Logf(err.Error()) } + + flag_api_error, _ := fm.GetFlag("flag_api_call_error") mockAccountService := new(mocks.MockAccountService) sessionId := "session123" @@ -2249,8 +2268,8 @@ func TestGetVoucherDetails(t *testing.T) { "Name: %s\nSymbol: %s\nCommodity: %s\nLocation: %s", tokenDetails.TokenName, tokenDetails.TokenSymbol, tokenDetails.TokenCommodity, tokenDetails.TokenLocation, ) mockAccountService.On("VoucherData", string(tokA_AAddress)).Return(tokenDetails, nil) - res, err := h.GetVoucherDetails(ctx, "SessionId", []byte("")) + expectedResult.FlagReset = append(expectedResult.FlagReset, flag_api_error) assert.NoError(t, err) assert.Equal(t, expectedResult, res) } -- 2.45.2 From 04880b58a8ac0f158c98509dded45b07cbd469cc Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Tue, 1 Apr 2025 12:49:10 +0300 Subject: [PATCH 17/20] fix failing test --- menutraversal_test/group_test.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menutraversal_test/group_test.json b/menutraversal_test/group_test.json index b3177a9..99958dd 100644 --- a/menutraversal_test/group_test.json +++ b/menutraversal_test/group_test.json @@ -612,7 +612,7 @@ }, { "input": "1234", - "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 80\nLocation: Kilifi\nYou provide: Bananas\nYour alias: \n\n0:Back\n9:Quit" + "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 80\nLocation: Kilifi\nYou provide: Bananas\nYour alias: Not Provided\n\n0:Back\n9:Quit" }, { "input": "0", -- 2.45.2 From 73c348640091dca1c83171aa5c570bc477ce8653 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Wed, 2 Apr 2025 10:47:33 +0300 Subject: [PATCH 18/20] catch api call failure when manage vouchers is called --- services/registration/main.vis | 1 + 1 file changed, 1 insertion(+) diff --git a/services/registration/main.vis b/services/registration/main.vis index cda6844..efa8b2a 100644 --- a/services/registration/main.vis +++ b/services/registration/main.vis @@ -2,6 +2,7 @@ LOAD clear_temporary_value 2 RELOAD clear_temporary_value LOAD manage_vouchers 160 RELOAD manage_vouchers +CATCH api_failure flag_api_call_error 1 LOAD check_balance 128 RELOAD check_balance CATCH api_failure flag_api_call_error 1 -- 2.45.2 From cab90ed89a273999031f8a070b6f47e41ff9c785 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Wed, 2 Apr 2025 10:48:04 +0300 Subject: [PATCH 19/20] set and reset flag_api_error flag --- handlers/application/menuhandler.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/handlers/application/menuhandler.go b/handlers/application/menuhandler.go index 722eb20..26cf13a 100644 --- a/handlers/application/menuhandler.go +++ b/handlers/application/menuhandler.go @@ -1989,9 +1989,10 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b // Fetch vouchers from API vouchersResp, err := h.accountService.FetchVouchers(ctx, string(publicKey)) if err != nil { - res.FlagSet = append(res.FlagSet, flag_no_active_voucher) + res.FlagSet = append(res.FlagSet, flag_api_error) return res, nil } + res.FlagReset = append(res.FlagReset, flag_api_error) if len(vouchersResp) == 0 { res.FlagSet = append(res.FlagSet, flag_no_active_voucher) -- 2.45.2 From 58242c8d55f4cd6a62681d19de4243d910871c88 Mon Sep 17 00:00:00 2001 From: Carlosokumu Date: Wed, 2 Apr 2025 10:53:36 +0300 Subject: [PATCH 20/20] fix failing test: TestManageVouchers --- handlers/application/menuhandler_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handlers/application/menuhandler_test.go b/handlers/application/menuhandler_test.go index c3aa5ac..e3fd124 100644 --- a/handlers/application/menuhandler_test.go +++ b/handlers/application/menuhandler_test.go @@ -2050,7 +2050,7 @@ func TestManageVouchers(t *testing.T) { expectedVoucherSymbols: []byte("1:TOKEN1"), expectedUpdatedAddress: []byte("0x123"), expectedResult: resource.Result{ - FlagReset: []uint32{flag_no_active_voucher}, + FlagReset: []uint32{flag_api_error, flag_no_active_voucher}, }, }, { @@ -2063,7 +2063,7 @@ func TestManageVouchers(t *testing.T) { expectedVoucherSymbols: []byte("1:SRF\n2:MILO"), expectedUpdatedAddress: []byte("0xd4c288865Ce"), expectedResult: resource.Result{ - FlagReset: []uint32{flag_no_active_voucher}, + FlagReset: []uint32{flag_api_error, flag_no_active_voucher}, }, }, } -- 2.45.2