Updated the alias and balance functionality to match master

handlers/application/account_status.go

@@ -83,7 +83,6 @@ func (h *MenuHandlers) CheckAccountCreated(ctx context.Context, sym string, inpu
 // CheckBlockedStatus:
 // 1. Checks whether the DATA_SELF_PIN_RESET is 1 and sets the flag_account_pin_reset
 // 2. resets the account blocked flag if the PIN attempts have been reset by an admin.
-// 3. Sets key flags (language and PIN) if the data exists
 func (h *MenuHandlers) CheckBlockedStatus(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	store := h.userdataStore
@@ -91,30 +90,11 @@ func (h *MenuHandlers) CheckBlockedStatus(ctx context.Context, sym string, input
 	flag_account_blocked, _ := h.flagManager.GetFlag("flag_account_blocked")
 	flag_account_pin_reset, _ := h.flagManager.GetFlag("flag_account_pin_reset")
 
-	flag_pin_set, _ := h.flagManager.GetFlag("flag_pin_set")
-	flag_language_set, _ := h.flagManager.GetFlag("flag_language_set")
-	pinFlagSet := h.st.MatchFlag(flag_pin_set, true)
-	languageFlagSet := h.st.MatchFlag(flag_language_set, true)
-
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
 
-	// only check the data if the flag isn't set
-	if !pinFlagSet {
-		accountPin, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_PIN)
-		if len(accountPin) > 0 {
-			res.FlagSet = append(res.FlagSet, flag_pin_set)
-		}
-	}
-	if !languageFlagSet {
-		languageCode, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_SELECTED_LANGUAGE_CODE)
-		if len(languageCode) > 0 {
-			res.FlagSet = append(res.FlagSet, flag_language_set)
-		}
-	}
-
 	res.FlagReset = append(res.FlagReset, flag_account_pin_reset)
 
 	selfPinReset, err := store.ReadEntry(ctx, sessionId, storedb.DATA_SELF_PIN_RESET)

handlers/application/account_status_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"git.defalsify.org/vise.git/resource"
-	"git.defalsify.org/vise.git/state"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/models"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/testutil/mocks"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
@@ -94,24 +93,16 @@ func TestCheckBlockedStatus(t *testing.T) {
 	}
 	flag_account_blocked, _ := fm.GetFlag("flag_account_blocked")
 	flag_account_pin_reset, _ := fm.GetFlag("flag_account_pin_reset")
-	flag_pin_set, _ := fm.GetFlag("flag_pin_set")
-	flag_language_set, _ := fm.GetFlag("flag_language_set")
-
-	// Set the flag in the State
-	mockState := state.NewState(128)
 
 	h := &MenuHandlers{
 		userdataStore: store,
 		flagManager:   fm,
-		st:            mockState,
 	}
 
 	tests := []struct {
 		name                    string
 		currentWrongPinAttempts string
 		expectedResult          resource.Result
-		languageSet             bool
-		PinSet                  bool
 	}{
 		{
 			name:                    "Currently blocked account",
@@ -127,16 +118,6 @@ func TestCheckBlockedStatus(t *testing.T) {
 				FlagReset: []uint32{flag_account_pin_reset, flag_account_blocked},
 			},
 		},
-		{
-			name:                    "Valid account with reset language and PIN flags",
-			currentWrongPinAttempts: "0",
-			languageSet:             true,
-			PinSet:                  true,
-			expectedResult: resource.Result{
-				FlagReset: []uint32{flag_account_pin_reset, flag_account_blocked},
-				FlagSet:   []uint32{flag_pin_set, flag_language_set},
-			},
-		},
 	}
 
 	for _, tt := range tests {
@@ -145,18 +126,6 @@ func TestCheckBlockedStatus(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			if tt.languageSet {
-				if err := store.WriteEntry(ctx, sessionId, storedb.DATA_SELECTED_LANGUAGE_CODE, []byte("eng")); err != nil {
-					t.Fatal(err)
-				}
-			}
-
-			if tt.PinSet {
-				if err := store.WriteEntry(ctx, sessionId, storedb.DATA_ACCOUNT_PIN, []byte("hasedPinValue")); err != nil {
-					t.Fatal(err)
-				}
-			}
-
 			res, err := h.CheckBlockedStatus(ctx, "", []byte(""))
 
 			assert.NoError(t, err)

handlers/application/pools.go

@@ -9,7 +9,6 @@ import (
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
-	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 	"gopkg.in/leonelquinteros/gotext.v1"
 )
 
@@ -37,26 +36,9 @@ func (h *MenuHandlers) GetPools(ctx context.Context, sym string, input []byte) (
 		return res, nil
 	}
 
-	activePoolSymStr := ""
+	data := store.ProcessPools(topPools)
 
-	activePoolSym, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_POOL_SYM)
-	if err != nil {
-		activePoolSymStr = config.DefaultPoolSymbol()
-	} else {
-		activePoolSymStr = string(activePoolSym)
-	}
-
-	// Filter out the active pool from topPools
-	filteredPools := make([]dataserviceapi.PoolDetails, 0, len(topPools))
-	for _, p := range topPools {
-		if p.PoolSymbol != activePoolSymStr {
-			filteredPools = append(filteredPools, p)
-		}
-	}
-
-	data := store.ProcessPools(filteredPools)
-
-	// Store the filtered Pool data
+	// Store all Pool data
 	dataMap := map[storedb.DataTyp]string{
 		storedb.DATA_POOL_NAMES:     data.PoolNames,
 		storedb.DATA_POOL_SYMBOLS:   data.PoolSymbols,
@@ -118,10 +100,6 @@ func (h *MenuHandlers) ViewPool(ctx context.Context, sym string, input []byte) (
 	flag_incorrect_pool, _ := h.flagManager.GetFlag("flag_incorrect_pool")
 
 	inputStr := string(input)
-	if inputStr == "0" || inputStr == "99" || inputStr == "88" || inputStr == "98" {
-		res.FlagReset = append(res.FlagReset, flag_incorrect_pool)
-		return res, nil
-	}
 
 	poolData, err := store.GetPoolData(ctx, h.userdataStore, sessionId, inputStr)
 	if err != nil {

handlers/application/poolswap.go

@@ -10,7 +10,6 @@ import (
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
-	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 	"gopkg.in/leonelquinteros/gotext.v1"
 )
 
@@ -122,16 +121,7 @@ func (h *MenuHandlers) LoadSwapToList(ctx context.Context, sym string, input []b
 		return res, nil
 	}
 
-	// Filter out the active voucher from swapToList
-	filteredSwapToList := make([]dataserviceapi.TokenHoldings, 0, len(swapToList))
-	for _, s := range swapToList {
-		if s.TokenSymbol != string(activeSym) {
-			filteredSwapToList = append(filteredSwapToList, s)
-		}
-	}
-
-	// Store filtered swap to list data (excluding the current active voucher)
-	data := store.ProcessVouchers(filteredSwapToList)
+	data := store.ProcessVouchers(swapToList)
 
 	logg.InfoCtxf(ctx, "ProcessVouchers", "data", data)
 
@@ -171,7 +161,7 @@ func (h *MenuHandlers) SwapMaxLimit(ctx context.Context, sym string, input []byt
 	res.FlagReset = append(res.FlagReset, flag_incorrect_voucher, flag_low_swap_amount)
 
 	inputStr := string(input)
-	if inputStr == "0" || inputStr == "99" || inputStr == "88" || inputStr == "98" {
+	if inputStr == "0" {
 		return res, nil
 	}
 

handlers/application/vouchers.go

@@ -51,9 +51,6 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
 
 	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
 	activeSym, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
 	if err != nil {
@@ -65,8 +62,6 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
 			defaultDec := firstVoucher.TokenDecimals
 			defaultAddr := firstVoucher.TokenAddress
 
-			activeSymStr = defaultSym
-
 			// Scale down the balance
 			scaledBalance := store.ScaleDownBalance(defaultBal, defaultDec)
 
@@ -94,8 +89,10 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
 			return res, err
 		}
 	} else {
+		// Update active voucher balance
+		activeSymStr := string(activeSym)
+
 		// Find the matching voucher data
-		activeSymStr = string(activeSym)
 		var activeData *dataserviceapi.TokenHoldings
 		for _, voucher := range vouchersResp {
 			if voucher.TokenSymbol == activeSymStr {
@@ -105,10 +102,9 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
 		}
 
 		if activeData == nil {
-			logg.InfoCtxf(ctx, "activeSym not found in vouchers, setting the first voucher as the default", "activeSym", activeSymStr)
+			logg.ErrorCtxf(ctx, "activeSym not found in vouchers, setting the first voucher as the default", "activeSym", activeSymStr)
 			firstVoucher := vouchersResp[0]
 			activeData = &firstVoucher
-			activeSymStr = string(activeData.TokenSymbol)
 		}
 
 		// Scale down the balance
@@ -124,17 +120,8 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
 		}
 	}
 
-	// Filter out the active voucher from 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)
-
+	// Store all voucher data
+	data := store.ProcessVouchers(vouchersResp)
 	dataMap := map[storedb.DataTyp]string{
 		storedb.DATA_VOUCHER_SYMBOLS:   data.Symbols,
 		storedb.DATA_VOUCHER_BALANCES:  data.Balances,
@@ -153,7 +140,7 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
 	return res, nil
 }
 
-// GetVoucherList fetches the list of vouchers from the store and formats them.
+// GetVoucherList fetches the list of vouchers and formats them.
 func (h *MenuHandlers) GetVoucherList(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	sessionId, ok := ctx.Value("SessionId").(string)
@@ -204,10 +191,6 @@ func (h *MenuHandlers) ViewVoucher(ctx context.Context, sym string, input []byte
 	flag_incorrect_voucher, _ := h.flagManager.GetFlag("flag_incorrect_voucher")
 
 	inputStr := string(input)
-	if inputStr == "0" || inputStr == "99" || inputStr == "88" || inputStr == "98" {
-		res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
-		return res, nil
-	}
 
 	metadata, err := store.GetVoucherData(ctx, h.userdataStore, sessionId, inputStr)
 	if err != nil {
@@ -224,16 +207,8 @@ func (h *MenuHandlers) ViewVoucher(ctx context.Context, sym string, input []byte
 		return res, err
 	}
 
-	// Format the balance to 2 decimal places
-	formattedAmount, err := store.TruncateDecimalString(metadata.Balance, 2)
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to TruncateDecimalString on ViewVoucher", "error", err)
-		res.FlagSet = append(res.FlagSet, flag_incorrect_voucher)
-		return res, nil
-	}
-
 	res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
-	res.Content = l.Get("Symbol: %s\nBalance: %s", metadata.TokenSymbol, formattedAmount)
+	res.Content = l.Get("Symbol: %s\nBalance: %s", metadata.TokenSymbol, metadata.Balance)
 
 	return res, nil
 }

handlers/application/vouchers_test.go

@@ -73,8 +73,8 @@ func TestManageVouchers(t *testing.T) {
 					Balance:       "100",
 				},
 			},
-			expectedVoucherSymbols: []byte(""),
-			expectedUpdatedAddress: []byte(""),
+			expectedVoucherSymbols: []byte("1:TOKEN1"),
+			expectedUpdatedAddress: []byte("0x123"),
 			expectedResult: resource.Result{
 				FlagReset: []uint32{flag_api_error, flag_no_active_voucher},
 			},
@@ -86,7 +86,7 @@ func TestManageVouchers(t *testing.T) {
 				{TokenAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200"},
 			},
 			storedActiveVoucher:    "SRF",
-			expectedVoucherSymbols: []byte("1:MILO"),
+			expectedVoucherSymbols: []byte("1:SRF\n2:MILO"),
 			expectedUpdatedAddress: []byte("0xd4c288865Ce"),
 			expectedResult: resource.Result{
 				FlagReset: []uint32{flag_api_error, flag_no_active_voucher},

services/registration/main.vis

@@ -9,16 +9,14 @@ MAP check_balance
 MOUT send 1
 MOUT swap 2
 MOUT vouchers 3
-MOUT select_pool 4
-MOUT account 5
-MOUT help 6
+MOUT account 4
+MOUT help 5
 MOUT quit 9
 HALT
 INCMP send 1
 INCMP swap_to_list 2
 INCMP my_vouchers 3
-INCMP select_pool 4
-INCMP my_account 5
-INCMP help 6
+INCMP my_account 4
+INCMP help 5
 INCMP quit 9
 INCMP . *

services/registration/my_vouchers.vis

@@ -2,9 +2,11 @@ LOAD reset_account_authorized 16
 RELOAD reset_account_authorized
 MOUT select_voucher 1
 MOUT voucher_details 2
+MOUT select_pool 3
 MOUT back 0
 HALT
 INCMP _ 0
 INCMP select_voucher 1
 INCMP voucher_details 2
+INCMP select_pool 3
 INCMP . *

services/registration/swap_to_list.vis

@@ -4,17 +4,11 @@ RELOAD swap_to_list
 MAP swap_to_list
 CATCH missing_voucher flag_incorrect_voucher 1
 MOUT back 0
-MOUT quit 99
-MNEXT next 88
-MPREV prev 98
 HALT
-INCMP > 88
-INCMP < 98
-INCMP _ 0
-INCMP quit 99
 LOAD swap_max_limit 64
 RELOAD swap_max_limit
 CATCH api_failure flag_api_call_error 1
 CATCH . flag_incorrect_voucher 1
 CATCH low_swap_amount flag_low_swap_amount 1
+INCMP _ 0
 INCMP swap_limit *