grassrootseconomics/sarafu-vise
8
0
Fork 0
Code Issues 14 Pull Requests 2 Actions 1 Packages Projects Releases Wiki Activity

exclude active data from lists #99

Merged
Alfred-mk merged 10 commits from exclude-active-data-from-lists into master 2025-07-22 11:53:03 +02:00
Conversation 0 Commits 10 Files Changed 5 +19 -6
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e47415cc22 - Show all commits

25
handlers/application/vouchers.go
View File

@ -51,6 +51,9 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
res.FlagReset = append(res.FlagReset, flag_no_active_voucher) res.FlagReset = append(res.FlagReset, flag_no_active_voucher)
// add a variable to filter out the active voucher
activeSymStr := ""
// Check if user has an active voucher with proper error handling // Check if user has an active voucher with proper error handling
activeSym, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM) activeSym, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
if err != nil { if err != nil {
@ -62,6 +65,8 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
defaultDec := firstVoucher.TokenDecimals defaultDec := firstVoucher.TokenDecimals
defaultAddr := firstVoucher.TokenAddress defaultAddr := firstVoucher.TokenAddress
activeSymStr = defaultSym
// Scale down the balance // Scale down the balance
scaledBalance := store.ScaleDownBalance(defaultBal, defaultDec) scaledBalance := store.ScaleDownBalance(defaultBal, defaultDec)
@ -89,10 +94,8 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
return res, err return res, err
} }
} else { } else {
// Update active voucher balance
activeSymStr := string(activeSym)
// Find the matching voucher data // Find the matching voucher data
activeSymStr = string(activeSym)
var activeData *dataserviceapi.TokenHoldings var activeData *dataserviceapi.TokenHoldings
for _, voucher := range vouchersResp { for _, voucher := range vouchersResp {
if voucher.TokenSymbol == activeSymStr { if voucher.TokenSymbol == activeSymStr {
@ -102,9 +105,10 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
} }
if activeData == nil { if activeData == nil {
logg.ErrorCtxf(ctx, "activeSym not found in vouchers, setting the first voucher as the default", "activeSym", activeSymStr) logg.InfoCtxf(ctx, "activeSym not found in vouchers, setting the first voucher as the default", "activeSym", activeSymStr)
firstVoucher := vouchersResp[0] firstVoucher := vouchersResp[0]
activeData = &firstVoucher activeData = &firstVoucher
activeSymStr = string(activeData.TokenSymbol)
} }
// Scale down the balance // Scale down the balance
@ -120,8 +124,17 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
} }
} }
// Store all voucher data // Filter out the active voucher from vouchersResp
data := store.ProcessVouchers(vouchersResp) filteredVouchers := make([]dataserviceapi.TokenHoldings, 0, len(vouchersResp))
for _, v := range vouchersResp {
if v.TokenSymbol != activeSymStr {
filteredVouchers = append(filteredVouchers, v)
}
}
// Store all voucher data (excluding the current active voucher)
data := store.ProcessVouchers(filteredVouchers)
dataMap := map[storedb.DataTyp]string{ dataMap := map[storedb.DataTyp]string{
storedb.DATA_VOUCHER_SYMBOLS: data.Symbols, storedb.DATA_VOUCHER_SYMBOLS: data.Symbols,
storedb.DATA_VOUCHER_BALANCES: data.Balances, storedb.DATA_VOUCHER_BALANCES: data.Balances,