Merge branch 'master' into lash/store-dumper

internal/handlers/ussd/menuhandler.go

@@ -1254,7 +1254,8 @@ func (h *Handlers) SetDefaultVoucher(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 {
-				return res, err
+				res.FlagSet = append(res.FlagSet, flag_no_active_voucher)
+				return res, nil
 			}
 
 			// Return if there is no voucher

remote/accountservice.go

@@ -202,7 +202,6 @@ func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKRespons
 	if len(okResponse.Result) == 0 {
 		return nil, errors.New("Empty api result")
 	}
-	return &okResponse, nil
 
 	v, err := json.Marshal(okResponse.Result)
 	if err != nil {

services/registration/no_voucher

@@ -1 +1 @@
-You need a voucher to send
+You need a voucher to proceed

services/registration/no_voucher_swa

@@ -1 +1 @@
-Unahitaji sarafu kutuma
+Unahitaji sarafu kuendelea

services/registration/select_voucher.vis

@@ -1,3 +1,4 @@
+CATCH no_voucher flag_no_active_voucher 1
 LOAD get_vouchers 0
 MAP get_vouchers
 MOUT back 0