handlers/application/balance.go

@@ -149,8 +149,6 @@ 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 {
@@ -167,6 +165,7 @@ 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
 	}