Merge remote-tracking branch 'origin/master' into lash/stalecache

internal/handlers/handlerservice.go

@@ -6,6 +6,7 @@ import (
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
+	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
 )
 
@@ -52,16 +53,16 @@ func (ls *LocalHandlerService) SetDataStore(db *db.Db) {
 	ls.UserdataStore = db
 }
 
-func (ls *LocalHandlerService) GetHandler() (*ussd.Handlers, error) {
-	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore)
+func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceInterface) (*ussd.Handlers, error) {
+	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore,accountService)
 	if err != nil {
 		return nil, err
 	}
 	ussdHandlers = ussdHandlers.WithPersister(ls.Pe)
 	ls.DbRs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
 	ls.DbRs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
-	ls.DbRs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
-	ls.DbRs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
+	ls.DbRs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
+	ls.DbRs.AddLocalFunc("verify_create_pin", ussdHandlers.VerifyCreatePin)
 	ls.DbRs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
 	ls.DbRs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
 	ls.DbRs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
@@ -82,17 +83,21 @@ func (ls *LocalHandlerService) GetHandler() (*ussd.Handlers, error) {
 	ls.DbRs.AddLocalFunc("save_location", ussdHandlers.SaveLocation)
 	ls.DbRs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
 	ls.DbRs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
-	ls.DbRs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
 	ls.DbRs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
 	ls.DbRs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
 	ls.DbRs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
 	ls.DbRs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
 	ls.DbRs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
 	ls.DbRs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
-	ls.DbRs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
 	ls.DbRs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
 	ls.DbRs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
 	ls.DbRs.AddLocalFunc("quit_with_help", ussdHandlers.QuitWithHelp)
+	ls.DbRs.AddLocalFunc("fetch_custodial_balances", ussdHandlers.FetchCustodialBalances)
+	ls.DbRs.AddLocalFunc("set_default_voucher", ussdHandlers.SetDefaultVoucher)
+	ls.DbRs.AddLocalFunc("check_vouchers", ussdHandlers.CheckVouchers)
+	ls.DbRs.AddLocalFunc("get_vouchers", ussdHandlers.GetVoucherList)
+	ls.DbRs.AddLocalFunc("view_voucher", ussdHandlers.ViewVoucher)
+	ls.DbRs.AddLocalFunc("set_voucher", ussdHandlers.SetVoucher)
 
 	return ussdHandlers, nil
 }

internal/handlers/server/accountservice.go

@@ -1,112 +1,185 @@
 package server
 
 import (
+	"context"
 	"encoding/json"
+	"errors"
+	"fmt"
 	"io"
 	"net/http"
+	"os"
 
 	"git.grassecon.net/urdt/ussd/config"
 	"git.grassecon.net/urdt/ussd/internal/models"
+	"github.com/grassrootseconomics/eth-custodial/pkg/api"
+)
+
+var (
+	okResponse  api.OKResponse
+	errResponse api.ErrResponse
 )
 
 type AccountServiceInterface interface {
-	CheckBalance(publicKey string) (string, error)
-	CreateAccount() (*models.AccountResponse, error)
-	CheckAccountStatus(trackingId string) (string, error)
+	CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error)
+	CreateAccount(ctx context.Context) (*api.OKResponse, error)
+	CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error)
+	TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error)
+	FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error)
 }
 
 type AccountService struct {
 }
 
-
-
-// CheckAccountStatus retrieves the status of an account transaction based on the provided tracking ID.
-//
 // Parameters:
 //   - trackingId: A unique identifier for the account.This should be obtained from a previous call to
 //     CreateAccount or a similar function that returns an AccountResponse. The `trackingId` field in the
 //     AccountResponse struct can be used here to check the account status during a transaction.
 //
-//
 // Returns:
 //   - string: The status of the transaction as a string. If there is an error during the request or processing, this will be an empty string.
 //   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
-//     If no error occurs, this will be nil.
-//
-func (as *AccountService) CheckAccountStatus(trackingId string) (string, error) {
-	resp, err := http.Get(config.TrackStatusURL + trackingId)
+//     If no error occurs, this will be nil
+func (as *AccountService) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error) {
+	resp, err := http.Get(config.BalanceURL + trackingId)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 	defer resp.Body.Close()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 
 	var trackResp models.TrackStatusResponse
 	err = json.Unmarshal(body, &trackResp)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
+	return &trackResp, nil
 
-	status := trackResp.Result.Transaction.Status
-
-	return status, nil
 }
 
-
-// CheckBalance retrieves the balance for a given public key from the custodial balance API endpoint.
-// Parameters:
-//   - publicKey: The public key associated with the account whose balance needs to be checked.
-func (as *AccountService) CheckBalance(publicKey string) (string, error) {
-
-	resp, err := http.Get(config.BalanceURL + publicKey)
+func (as *AccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error) {
+	var err error
+	// Construct the URL with the path parameter
+	url := fmt.Sprintf("%s/%s", config.TrackURL, publicKey)
+	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
-		return "0.0", err
+		return nil, err
+	}
+
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("X-GE-KEY", "xd")
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, err
 	}
 	defer resp.Body.Close()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return "0.0", err
+		errResponse.Description = err.Error()
+		return nil, err
 	}
+	if resp.StatusCode >= http.StatusBadRequest {
+		err := json.Unmarshal([]byte(body), &errResponse)
+		if err != nil {
+			return nil, err
+		}
+		return nil, errors.New(errResponse.Description)
+	}
+	err = json.Unmarshal([]byte(body), &okResponse)
+	if err != nil {
+		return nil, err
+	}
+	if len(okResponse.Result) == 0 {
+		return nil, errors.New("Empty api result")
+	}
+	return &okResponse, nil
 
+}
+
+// CheckBalance retrieves the balance for a given public key from the custodial balance API endpoint.
+// Parameters:
+//   - publicKey: The public key associated with the account whose balance needs to be checked.
+func (as *AccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error) {
+	resp, err := http.Get(config.BalanceURL + publicKey)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
 	var balanceResp models.BalanceResponse
 	err = json.Unmarshal(body, &balanceResp)
 	if err != nil {
-		return "0.0", err
+		return nil, err
 	}
-
-	balance := balanceResp.Result.Balance
-	return balance, nil
+	return &balanceResp, nil
 }
 
-
-//CreateAccount creates a new account in the custodial system.
+// CreateAccount creates a new account in the custodial system.
 // Returns:
 //   - *models.AccountResponse: A pointer to an AccountResponse struct containing the details of the created account.
 //     If there is an error during the request or processing, this will be nil.
 //   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
 //     If no error occurs, this will be nil.
-func (as *AccountService) CreateAccount() (*models.AccountResponse, error) {
-	resp, err := http.Post(config.CreateAccountURL, "application/json", nil)
+func (as *AccountService) CreateAccount(ctx context.Context) (*api.OKResponse, error) {
+	var err error
+
+	// Create a new request
+	req, err := http.NewRequest("POST", config.CreateAccountURL, nil)
 	if err != nil {
 		return nil, err
 	}
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("X-GE-KEY", "xd")
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		errResponse.Description = err.Error()
+		return nil, err
+	}
 	defer resp.Body.Close()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
-
-	var accountResp models.AccountResponse
-	err = json.Unmarshal(body, &accountResp)
+	if resp.StatusCode >= http.StatusBadRequest {
+		err := json.Unmarshal([]byte(body), &errResponse)
+		if err != nil {
+			return nil, err
+		}
+		return nil, errors.New(errResponse.Description)
+	}
+	err = json.Unmarshal([]byte(body), &okResponse)
 	if err != nil {
 		return nil, err
 	}
-
-	return &accountResp, nil
+	if len(okResponse.Result) == 0 {
+		return nil, errors.New("Empty api result")
+	}
+	return &okResponse, nil
+}
+
+// FetchVouchers retrieves the token holdings for a given public key from the custodial holdings API endpoint
+// Parameters:
+//   - publicKey: The public key associated with the account.
+func (as *AccountService) FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error) {
+	file, err := os.Open("sample_tokens.json")
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+	var holdings models.VoucherHoldingResponse
+
+	if err := json.NewDecoder(file).Decode(&holdings); err != nil {
+		return nil, err
+	}
+	return &holdings, nil
 }

internal/handlers/ussd/menuhandler.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"git.defalsify.org/vise.git/asm"
+	"github.com/grassrootseconomics/eth-custodial/pkg/api"
 
 	"git.defalsify.org/vise.git/cache"
 	"git.defalsify.org/vise.git/db"
@@ -18,15 +19,20 @@ import (
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
 	"git.defalsify.org/vise.git/state"
+	"git.grassecon.net/urdt/ussd/common"
 	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/utils"
 	"gopkg.in/leonelquinteros/gotext.v1"
+
+	"git.grassecon.net/urdt/ussd/internal/storage"
 )
 
 var (
 	logg           = logging.NewVanilla().WithDomain("ussdmenuhandler")
 	scriptDir      = path.Join("services", "registration")
 	translationDir = path.Join(scriptDir, "locale")
+	okResponse     *api.OKResponse
+	errResponse    *api.ErrResponse
 )
 
 // FlagManager handles centralized flag management
@@ -59,19 +65,24 @@ type Handlers struct {
 	userdataStore  utils.DataStore
 	flagManager    *asm.FlagParser
 	accountService server.AccountServiceInterface
+	prefixDb       storage.PrefixDb
 }
 
-func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db) (*Handlers, error) {
+func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db, accountService server.AccountServiceInterface) (*Handlers, error) {
 	if userdataStore == nil {
 		return nil, fmt.Errorf("cannot create handler with nil userdata store")
 	}
 	userDb := &utils.UserDataStore{
 		Db: userdataStore,
 	}
+	// Instantiate the SubPrefixDb with "vouchers" prefix
+	prefixDb := storage.NewSubPrefixDb(userdataStore, []byte("vouchers"))
+
 	h := &Handlers{
 		userdataStore:  userDb,
 		flagManager:    appFlags,
-		accountService: &server.AccountService{},
+		accountService: accountService,
+		prefixDb:       prefixDb,
 	}
 	return h, nil
 }
@@ -136,23 +147,35 @@ func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (r
 }
 
 func (h *Handlers) createAccountNoExist(ctx context.Context, sessionId string, res *resource.Result) error {
-	accountResp, err := h.accountService.CreateAccount()
-	data := map[utils.DataTyp]string{
-		utils.DATA_TRACKING_ID:  accountResp.Result.TrackingId,
-		utils.DATA_PUBLIC_KEY:   accountResp.Result.PublicKey,
-		utils.DATA_CUSTODIAL_ID: accountResp.Result.CustodialId.String(),
+	flag_account_created, _ := h.flagManager.GetFlag("flag_account_created")
+	okResponse, err := h.accountService.CreateAccount(ctx)
+	if err != nil {
+		return err
 	}
+	trackingId := okResponse.Result["trackingId"].(string)
+	publicKey := okResponse.Result["publicKey"].(string)
 
+	data := map[utils.DataTyp]string{
+		utils.DATA_TRACKING_ID: trackingId,
+		utils.DATA_PUBLIC_KEY:  publicKey,
+	}
+	store := h.userdataStore
 	for key, value := range data {
-		store := h.userdataStore
-		err := store.WriteEntry(ctx, sessionId, key, []byte(value))
+		err = store.WriteEntry(ctx, sessionId, key, []byte(value))
 		if err != nil {
 			return err
 		}
 	}
-	flag_account_created, _ := h.flagManager.GetFlag("flag_account_created")
+	publicKeyNormalized, err := common.NormalizeHex(publicKey)
+	if err != nil {
+		return err
+	}
+	err = store.WriteEntry(ctx, publicKeyNormalized, utils.DATA_PUBLIC_KEY_REVERSE, []byte(sessionId))
+	if err != nil {
+		return err
+	}
 	res.FlagSet = append(res.FlagSet, flag_account_created)
-	return err
+	return nil
 
 }
 
@@ -180,34 +203,6 @@ func (h *Handlers) CreateAccount(ctx context.Context, sym string, input []byte)
 	return res, nil
 }
 
-// SavePin persists the user's PIN choice into the filesystem
-func (h *Handlers) SavePin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	var err error
-
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	flag_incorrect_pin, _ := h.flagManager.GetFlag("flag_incorrect_pin")
-
-	accountPIN := string(input)
-	// Validate that the PIN is a 4-digit number
-	if !isValidPIN(accountPIN) {
-		res.FlagSet = append(res.FlagSet, flag_incorrect_pin)
-		return res, nil
-	}
-
-	res.FlagReset = append(res.FlagReset, flag_incorrect_pin)
-	store := h.userdataStore
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_ACCOUNT_PIN, []byte(accountPIN))
-	if err != nil {
-		return res, err
-	}
-	return res, nil
-}
-
 func (h *Handlers) VerifyNewPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	res := resource.Result{}
 	_, ok := ctx.Value("SessionId").(string)
@@ -226,6 +221,9 @@ func (h *Handlers) VerifyNewPin(ctx context.Context, sym string, input []byte) (
 	return res, nil
 }
 
+// SaveTemporaryPin saves the valid PIN input to the DATA_TEMPORARY_PIN
+// during the account creation process
+// and during the change PIN process
 func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	var err error
@@ -234,6 +232,7 @@ func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byt
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+
 	flag_incorrect_pin, _ := h.flagManager.GetFlag("flag_incorrect_pin")
 
 	accountPIN := string(input)
@@ -243,11 +242,15 @@ func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byt
 		res.FlagSet = append(res.FlagSet, flag_incorrect_pin)
 		return res, nil
 	}
+
+	res.FlagReset = append(res.FlagReset, flag_incorrect_pin)
+
 	store := h.userdataStore
 	err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_PIN, []byte(accountPIN))
 	if err != nil {
 		return res, err
 	}
+
 	return res, nil
 }
 
@@ -276,10 +279,10 @@ func (h *Handlers) ConfirmPinChange(ctx context.Context, sym string, input []byt
 	return res, nil
 }
 
-// VerifyPin checks whether the confirmation PIN is similar to the account PIN
-// If similar, it sets the USERFLAG_PIN_SET flag allowing the user
+// VerifyCreatePin checks whether the confirmation PIN is similar to the temporary PIN
+// If similar, it sets the USERFLAG_PIN_SET flag and writes the account PIN allowing the user
 // to access the main menu
-func (h *Handlers) VerifyPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+func (h *Handlers) VerifyCreatePin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 
 	flag_valid_pin, _ := h.flagManager.GetFlag("flag_valid_pin")
@@ -290,15 +293,13 @@ func (h *Handlers) VerifyPin(ctx context.Context, sym string, input []byte) (res
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
-	//AccountPin, _ := utils.ReadEntry(ctx, h.userdataStore, sessionId, utils.DATA_ACCOUNT_PIN)
 	store := h.userdataStore
-	AccountPin, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACCOUNT_PIN)
+	temporaryPin, err := store.ReadEntry(ctx, sessionId, utils.DATA_TEMPORARY_PIN)
 	if err != nil {
 		return res, err
 	}
 
-	if bytes.Equal(input, AccountPin) {
+	if bytes.Equal(input, temporaryPin) {
 		res.FlagSet = []uint32{flag_valid_pin}
 		res.FlagReset = []uint32{flag_pin_mismatch}
 		res.FlagSet = append(res.FlagSet, flag_pin_set)
@@ -306,6 +307,11 @@ func (h *Handlers) VerifyPin(ctx context.Context, sym string, input []byte) (res
 		res.FlagSet = []uint32{flag_pin_mismatch}
 	}
 
+	err = store.WriteEntry(ctx, sessionId, utils.DATA_ACCOUNT_PIN, []byte(temporaryPin))
+	if err != nil {
+		return res, err
+	}
+
 	return res, nil
 }
 
@@ -327,10 +333,18 @@ func (h *Handlers) SaveFirstname(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-	if len(input) > 0 {
-		firstName := string(input)
-		store := h.userdataStore
-		err = store.WriteEntry(ctx, sessionId, utils.DATA_FIRST_NAME, []byte(firstName))
+	firstName := string(input)
+	store := h.userdataStore
+	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
+	allowUpdate := h.st.MatchFlag(flag_allow_update, true)
+	if allowUpdate {
+		temporaryFirstName, _ := store.ReadEntry(ctx, sessionId, utils.DATA_TEMPORARY_FIRST_NAME)
+		err = store.WriteEntry(ctx, sessionId, utils.DATA_FIRST_NAME, []byte(temporaryFirstName))
+		if err != nil {
+			return res, err
+		}
+	} else {
+		err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_FIRST_NAME, []byte(firstName))
 		if err != nil {
 			return res, err
 		}
@@ -347,18 +361,24 @@ func (h *Handlers) SaveFamilyname(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+	store := h.userdataStore
+	familyName := string(input)
 
-	if len(input) > 0 {
-		familyName := string(input)
-		store := h.userdataStore
-		err = store.WriteEntry(ctx, sessionId, utils.DATA_FAMILY_NAME, []byte(familyName))
+	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
+	allowUpdate := h.st.MatchFlag(flag_allow_update, true)
+
+	if allowUpdate {
+		temporaryFamilyName, _ := store.ReadEntry(ctx, sessionId, utils.DATA_TEMPORARY_FAMILY_NAME)
+		err = store.WriteEntry(ctx, sessionId, utils.DATA_FAMILY_NAME, []byte(temporaryFamilyName))
 		if err != nil {
 			return res, err
 		}
 	} else {
-		return res, fmt.Errorf("a family name cannot be less than one character")
+		err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_FAMILY_NAME, []byte(familyName))
+		if err != nil {
+			return res, err
+		}
 	}
-
 	return res, nil
 }
 
@@ -370,11 +390,19 @@ func (h *Handlers) SaveYob(ctx context.Context, sym string, input []byte) (resou
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+	yob := string(input)
+	store := h.userdataStore
+	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
+	allowUpdate := h.st.MatchFlag(flag_allow_update, true)
 
-	if len(input) == 4 {
-		yob := string(input)
-		store := h.userdataStore
-		err = store.WriteEntry(ctx, sessionId, utils.DATA_YOB, []byte(yob))
+	if allowUpdate {
+		temporaryYob, _ := store.ReadEntry(ctx, sessionId, utils.DATA_TEMPORARY_YOB)
+		err = store.WriteEntry(ctx, sessionId, utils.DATA_YOB, []byte(temporaryYob))
+		if err != nil {
+			return res, err
+		}
+	} else {
+		err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_YOB, []byte(yob))
 		if err != nil {
 			return res, err
 		}
@@ -391,11 +419,20 @@ func (h *Handlers) SaveLocation(ctx context.Context, sym string, input []byte) (
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+	location := string(input)
+	store := h.userdataStore
 
-	if len(input) > 0 {
-		location := string(input)
-		store := h.userdataStore
-		err = store.WriteEntry(ctx, sessionId, utils.DATA_LOCATION, []byte(location))
+	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
+	allowUpdate := h.st.MatchFlag(flag_allow_update, true)
+
+	if allowUpdate {
+		temporaryLocation, _ := store.ReadEntry(ctx, sessionId, utils.DATA_TEMPORARY_LOCATION)
+		err = store.WriteEntry(ctx, sessionId, utils.DATA_LOCATION, []byte(temporaryLocation))
+		if err != nil {
+			return res, err
+		}
+	} else {
+		err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_LOCATION, []byte(location))
 		if err != nil {
 			return res, err
 		}
@@ -413,12 +450,22 @@ func (h *Handlers) SaveGender(ctx context.Context, sym string, input []byte) (re
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
 	gender := strings.Split(symbol, "_")[1]
 	store := h.userdataStore
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_GENDER, []byte(gender))
-	if err != nil {
-		return res, nil
+	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
+	allowUpdate := h.st.MatchFlag(flag_allow_update, true)
+
+	if allowUpdate {
+		temporaryGender, _ := store.ReadEntry(ctx, sessionId, utils.DATA_TEMPORARY_GENDER)
+		err = store.WriteEntry(ctx, sessionId, utils.DATA_GENDER, []byte(temporaryGender))
+		if err != nil {
+			return res, err
+		}
+	} else {
+		err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_GENDER, []byte(gender))
+		if err != nil {
+			return res, err
+		}
 	}
 
 	return res, nil
@@ -432,13 +479,22 @@ func (h *Handlers) SaveOfferings(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+	offerings := string(input)
+	store := h.userdataStore
 
-	if len(input) > 0 {
-		offerings := string(input)
-		store := h.userdataStore
-		err = store.WriteEntry(ctx, sessionId, utils.DATA_OFFERINGS, []byte(offerings))
+	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
+	allowUpdate := h.st.MatchFlag(flag_allow_update, true)
+
+	if allowUpdate {
+		temporaryOfferings, _ := store.ReadEntry(ctx, sessionId, utils.DATA_TEMPORARY_OFFERINGS)
+		err = store.WriteEntry(ctx, sessionId, utils.DATA_OFFERINGS, []byte(temporaryOfferings))
 		if err != nil {
-			return res, nil
+			return res, err
+		}
+	} else {
+		err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_OFFERINGS, []byte(offerings))
+		if err != nil {
+			return res, err
 		}
 	}
 
@@ -458,7 +514,6 @@ func (h *Handlers) ResetAllowUpdate(ctx context.Context, sym string, input []byt
 // ResetAccountAuthorized resets the account authorization flag after a successful PIN entry.
 func (h *Handlers) ResetAccountAuthorized(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
-
 	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
 
 	res.FlagReset = append(res.FlagReset, flag_account_authorized)
@@ -468,12 +523,10 @@ func (h *Handlers) ResetAccountAuthorized(ctx context.Context, sym string, input
 // CheckIdentifier retrieves the PublicKey from the JSON data file.
 func (h *Handlers) CheckIdentifier(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
-
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
 	store := h.userdataStore
 	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
 
@@ -487,12 +540,10 @@ func (h *Handlers) CheckIdentifier(ctx context.Context, sym string, input []byte
 func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	var err error
-
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
 	flag_incorrect_pin, _ := h.flagManager.GetFlag("flag_incorrect_pin")
 	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
 	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
@@ -525,9 +576,7 @@ func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (res
 // ResetIncorrectPin resets the incorrect pin flag  after a new PIN attempt.
 func (h *Handlers) ResetIncorrectPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
-
 	flag_incorrect_pin, _ := h.flagManager.GetFlag("flag_incorrect_pin")
-
 	res.FlagReset = append(res.FlagReset, flag_incorrect_pin)
 	return res, nil
 }
@@ -539,29 +588,28 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
 
 	flag_account_success, _ := h.flagManager.GetFlag("flag_account_success")
 	flag_account_pending, _ := h.flagManager.GetFlag("flag_account_pending")
+	flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
 
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
 	store := h.userdataStore
-	trackingId, err := store.ReadEntry(ctx, sessionId, utils.DATA_TRACKING_ID)
+	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
 	if err != nil {
 		return res, err
 	}
-
-	status, err := h.accountService.CheckAccountStatus(string(trackingId))
+	okResponse, err = h.accountService.TrackAccountStatus(ctx, string(publicKey))
 	if err != nil {
-		fmt.Println("Error checking account status:", err)
+		res.FlagSet = append(res.FlagSet, flag_api_error)
 		return res, err
 	}
-
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_ACCOUNT_STATUS, []byte(status))
-	if err != nil {
-		return res, nil
+	res.FlagReset = append(res.FlagReset, flag_api_error)
+	isActive := okResponse.Result["active"].(bool)
+	if !ok {
+		return res, err
 	}
-
-	if status == "SUCCESS" {
+	if isActive {
 		res.FlagSet = append(res.FlagSet, flag_account_success)
 		res.FlagReset = append(res.FlagReset, flag_account_pending)
 	} else {
@@ -635,7 +683,7 @@ func (h *Handlers) ResetIncorrectYob(ctx context.Context, sym string, input []by
 	return res, nil
 }
 
-// CheckBalance retrieves the balance from the API using the "PublicKey" and sets
+// CheckBalance retrieves the balance of the active voucher and sets
 // the balance as the result content
 func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
@@ -646,18 +694,70 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 		return res, fmt.Errorf("missing session")
 	}
 
+	code := codeFromCtx(ctx)
+	l := gotext.NewLocale(translationDir, code)
+	l.AddDomain("default")
+
+	store := h.userdataStore
+
+	// get the active sym and active balance
+	activeSym, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_SYM)
+	if err != nil {
+		if db.IsNotFound(err) {
+			balance := "0.00"
+			res.Content = l.Get("Balance: %s\n", balance)
+			return res, nil
+		}
+
+		return res, err
+	}
+
+	activeBal, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_BAL)
+	if err != nil {
+		return res, err
+	}
+
+	res.Content = l.Get("Balance: %s\n", fmt.Sprintf("%s %s", activeBal, activeSym))
+
+	return res, nil
+}
+
+func (h *Handlers) FetchCustodialBalances(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
+
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+	symbol, _ := h.st.Where()
+	balanceType := strings.Split(symbol, "_")[0]
+
 	store := h.userdataStore
 	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
 	if err != nil {
 		return res, err
 	}
 
-	balance, err := h.accountService.CheckBalance(string(publicKey))
+	balanceResponse, err := h.accountService.CheckBalance(ctx, string(publicKey))
 	if err != nil {
 		return res, nil
 	}
-	res.Content = balance
+	if !balanceResponse.Ok {
+		res.FlagSet = append(res.FlagSet, flag_api_error)
+		return res, nil
+	}
+	res.FlagReset = append(res.FlagReset, flag_api_error)
+	balance := balanceResponse.Result.Balance
 
+	switch balanceType {
+	case "my":
+		res.Content = fmt.Sprintf("Your balance is %s", balance)
+	case "community":
+		res.Content = fmt.Sprintf("Your community balance is %s", balance)
+	default:
+		break
+	}
 	return res, nil
 }
 
@@ -755,14 +855,13 @@ func (h *Handlers) MaxAmount(ctx context.Context, sym string, input []byte) (res
 		return res, fmt.Errorf("missing session")
 	}
 	store := h.userdataStore
-	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
 
-	balance, err := h.accountService.CheckBalance(string(publicKey))
+	activeBal, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_BAL)
 	if err != nil {
-		return res, nil
+		return res, err
 	}
 
-	res.Content = balance
+	res.Content = string(activeBal)
 
 	return res, nil
 }
@@ -771,47 +870,29 @@ func (h *Handlers) MaxAmount(ctx context.Context, sym string, input []byte) (res
 // it is not more than the current balance.
 func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
-	var err error
 
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
 	flag_invalid_amount, _ := h.flagManager.GetFlag("flag_invalid_amount")
-
 	store := h.userdataStore
-	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
 
-	amountStr := string(input)
-
-	balanceStr, err := h.accountService.CheckBalance(string(publicKey))
+	var balanceValue float64
 
+	// retrieve the active balance
+	activeBal, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_BAL)
 	if err != nil {
 		return res, err
 	}
-	res.Content = balanceStr
-
-	// Parse the balance
-	balanceParts := strings.Split(balanceStr, " ")
-	if len(balanceParts) != 2 {
-		return res, fmt.Errorf("unexpected balance format: %s", balanceStr)
-	}
-	balanceValue, err := strconv.ParseFloat(balanceParts[0], 64)
+	balanceValue, err = strconv.ParseFloat(string(activeBal), 64)
 	if err != nil {
-		return res, fmt.Errorf("failed to parse balance: %v", err)
+		return res, err
 	}
 
-	// Extract numeric part from input
-	re := regexp.MustCompile(`^(\d+(\.\d+)?)\s*(?:CELO)?$`)
-	matches := re.FindStringSubmatch(strings.TrimSpace(amountStr))
-	if len(matches) < 2 {
-		res.FlagSet = append(res.FlagSet, flag_invalid_amount)
-		res.Content = amountStr
-		return res, nil
-	}
-
-	inputAmount, err := strconv.ParseFloat(matches[1], 64)
+	// Extract numeric part from the input amount
+	amountStr := strings.TrimSpace(string(input))
+	inputAmount, err := strconv.ParseFloat(amountStr, 64)
 	if err != nil {
 		res.FlagSet = append(res.FlagSet, flag_invalid_amount)
 		res.Content = amountStr
@@ -824,12 +905,14 @@ func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte)
 		return res, nil
 	}
 
-	res.Content = fmt.Sprintf("%.3f", inputAmount) // Format to 3 decimal places
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_AMOUNT, []byte(amountStr))
+	// Format the amount with 2 decimal places before saving
+	formattedAmount := fmt.Sprintf("%.2f", inputAmount)
+	err = store.WriteEntry(ctx, sessionId, utils.DATA_AMOUNT, []byte(formattedAmount))
 	if err != nil {
 		return res, err
 	}
 
+	res.Content = fmt.Sprintf("%s", formattedAmount)
 	return res, nil
 }
 
@@ -849,7 +932,7 @@ func (h *Handlers) GetRecipient(ctx context.Context, sym string, input []byte) (
 	return res, nil
 }
 
-// GetSender retrieves the public key from the Gdbm Db
+// GetSender returns the sessionId (phoneNumber)
 func (h *Handlers) GetSender(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 
@@ -858,10 +941,7 @@ func (h *Handlers) GetSender(ctx context.Context, sym string, input []byte) (res
 		return res, fmt.Errorf("missing session")
 	}
 
-	store := h.userdataStore
-	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
-
-	res.Content = string(publicKey)
+	res.Content = string(sessionId)
 
 	return res, nil
 }
@@ -875,40 +955,17 @@ func (h *Handlers) GetAmount(ctx context.Context, sym string, input []byte) (res
 		return res, fmt.Errorf("missing session")
 	}
 	store := h.userdataStore
-	amount, _ := store.ReadEntry(ctx, sessionId, utils.DATA_AMOUNT)
 
-	res.Content = string(amount)
-
-	return res, nil
-}
-
-// QuickWithBalance retrieves the balance for a given public key from the custodial balance API endpoint before
-// gracefully exiting the session.
-func (h *Handlers) QuitWithBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	var err error
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
-
-	code := codeFromCtx(ctx)
-	l := gotext.NewLocale(translationDir, code)
-	l.AddDomain("default")
-
-	store := h.userdataStore
-	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
+	// retrieve the active symbol
+	activeSym, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_SYM)
 	if err != nil {
 		return res, err
 	}
-	balance, err := h.accountService.CheckBalance(string(publicKey))
-	if err != nil {
-		return res, nil
-	}
-	res.Content = l.Get("Your account balance is %s", balance)
-	res.FlagReset = append(res.FlagReset, flag_account_authorized)
+
+	amount, _ := store.ReadEntry(ctx, sessionId, utils.DATA_AMOUNT)
+
+	res.Content = fmt.Sprintf("%s %s", string(amount), string(activeSym))
+
 	return res, nil
 }
 
@@ -928,13 +985,14 @@ func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []
 	// TODO
 	// Use the amount, recipient and sender to call the API and initialize the transaction
 	store := h.userdataStore
-	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
 
 	amount, _ := store.ReadEntry(ctx, sessionId, utils.DATA_AMOUNT)
 
 	recipient, _ := store.ReadEntry(ctx, sessionId, utils.DATA_RECIPIENT)
 
-	res.Content = l.Get("Your request has been sent. %s will receive %s from %s.", string(recipient), string(amount), string(publicKey))
+	activeSym, _ := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_SYM)
+
+	res.Content = l.Get("Your request has been sent. %s will receive %s %s from %s.", string(recipient), string(amount), string(activeSym), string(sessionId))
 
 	account_authorized_flag, err := h.flagManager.GetFlag("flag_account_authorized")
 	if err != nil {
@@ -945,16 +1003,23 @@ func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []
 	return res, nil
 }
 
-// GetProfileInfo retrieves and formats the profile information of a user from a Gdbm backed storage.
 func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
+	var defaultValue string
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
-	// Default value when an entry is not found
-	defaultValue := "Not Provided"
+	language, ok := ctx.Value("Language").(lang.Language)
+	if !ok {
+		return res, fmt.Errorf("value for 'Language' is not of type lang.Language")
+	}
+	code := language.Code
+	if code == "swa" {
+		defaultValue = "Haipo"
+	} else {
+		defaultValue = "Not Provided"
+	}
 
 	// Helper function to handle nil byte slices and convert them to string
 	getEntryOrDefault := func(entry []byte, err error) string {
@@ -991,12 +1056,201 @@ func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte)
 			return res, fmt.Errorf("invalid year of birth: %v", err)
 		}
 	}
-
-	// Format the result
-	res.Content = fmt.Sprintf(
-		"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
-		name, gender, age, location, offerings,
-	)
+	switch language.Code {
+	case "eng":
+		res.Content = fmt.Sprintf(
+			"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
+			name, gender, age, location, offerings,
+		)
+	case "swa":
+		res.Content = fmt.Sprintf(
+			"Jina: %s\nJinsia: %s\nUmri: %s\nEneo: %s\nUnauza: %s\n",
+			name, gender, age, location, offerings,
+		)
+	default:
+		res.Content = fmt.Sprintf(
+			"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
+			name, gender, age, location, offerings,
+		)
+	}
 
 	return res, nil
 }
+
+// SetDefaultVoucher retrieves the current vouchers
+// and sets the first as the default voucher, if no active voucher is set
+func (h *Handlers) SetDefaultVoucher(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	var err error
+	store := h.userdataStore
+
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	flag_no_active_voucher, _ := h.flagManager.GetFlag("flag_no_active_voucher")
+
+	// check if the user has an active sym
+	_, err = store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_SYM)
+
+	if err != nil {
+		if db.IsNotFound(err) {
+			publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
+			if err != nil {
+				return res, err
+			}
+
+			// Fetch vouchers from the API using the public key
+			vouchersResp, err := h.accountService.FetchVouchers(ctx, string(publicKey))
+			if err != nil {
+				return res, err
+			}
+
+			// Return if there is no voucher
+			if len(vouchersResp.Result.Holdings) == 0 {
+				res.FlagSet = append(res.FlagSet, flag_no_active_voucher)
+				return res, nil
+			}
+
+			// Use only the first voucher
+			firstVoucher := vouchersResp.Result.Holdings[0]
+			defaultSym := firstVoucher.TokenSymbol
+			defaultBal := firstVoucher.Balance
+
+			// set the active symbol
+			err = store.WriteEntry(ctx, sessionId, utils.DATA_ACTIVE_SYM, []byte(defaultSym))
+			if err != nil {
+				return res, err
+			}
+			// set the active balance
+			err = store.WriteEntry(ctx, sessionId, utils.DATA_ACTIVE_BAL, []byte(defaultBal))
+			if err != nil {
+				return res, err
+			}
+
+			return res, nil
+		}
+
+		return res, err
+	}
+
+	res.FlagReset = append(res.FlagReset, flag_no_active_voucher)
+
+	return res, nil
+}
+
+// CheckVouchers retrieves the token holdings from the API using the "PublicKey" and stores
+// them to gdbm
+func (h *Handlers) CheckVouchers(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	store := h.userdataStore
+	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
+	if err != nil {
+		return res, nil
+	}
+
+	// Fetch vouchers from the API using the public key
+	vouchersResp, err := h.accountService.FetchVouchers(ctx, string(publicKey))
+	if err != nil {
+		return res, nil
+	}
+
+	data := utils.ProcessVouchers(vouchersResp.Result.Holdings)
+
+	// Store all voucher data
+	dataMap := map[string]string{
+		"sym":  data.Symbols,
+		"bal":  data.Balances,
+		"deci": data.Decimals,
+		"addr": data.Addresses,
+	}
+
+	for key, value := range dataMap {
+		if err := h.prefixDb.Put(ctx, []byte(key), []byte(value)); err != nil {
+			return res, nil
+		}
+	}
+
+	return res, nil
+}
+
+// GetVoucherList fetches the list of vouchers and formats them
+func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+
+	// Read vouchers from the store
+	voucherData, err := h.prefixDb.Get(ctx, []byte("sym"))
+	if err != nil {
+		return res, err
+	}
+
+	res.Content = string(voucherData)
+
+	return res, nil
+}
+
+// ViewVoucher retrieves the token holding and balance from the subprefixDB
+func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	flag_incorrect_voucher, _ := h.flagManager.GetFlag("flag_incorrect_voucher")
+
+	inputStr := string(input)
+	if inputStr == "0" || inputStr == "99" {
+		res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
+		return res, nil
+	}
+
+	metadata, err := utils.GetVoucherData(ctx, h.prefixDb, inputStr)
+	if err != nil {
+		return res, fmt.Errorf("failed to retrieve voucher data: %v", err)
+	}
+
+	if metadata == nil {
+		res.FlagSet = append(res.FlagSet, flag_incorrect_voucher)
+		return res, nil
+	}
+
+	if err := utils.StoreTemporaryVoucher(ctx, h.userdataStore, sessionId, metadata); err != nil {
+		return res, err
+	}
+
+	res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
+	res.Content = fmt.Sprintf("%s\n%s", metadata.TokenSymbol, metadata.Balance)
+
+	return res, nil
+}
+
+// SetVoucher retrieves the temp voucher data and sets it as the active data
+func (h *Handlers) SetVoucher(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	// Get temporary data
+	tempData, err := utils.GetTemporaryVoucherData(ctx, h.userdataStore, sessionId)
+	if err != nil {
+		return res, err
+	}
+
+	// Set as active and clear temporary data
+	if err := utils.UpdateVoucherData(ctx, h.userdataStore, sessionId, tempData); err != nil {
+		return res, err
+	}
+
+	res.Content = tempData.TokenSymbol
+	return res, nil
+}

internal/http/http_test.go

@@ -13,7 +13,7 @@ import (
 
 	"git.defalsify.org/vise.git/engine"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/mocks/httpmocks"
+	"git.grassecon.net/urdt/ussd/internal/testutil/mocks/httpmocks"
 )
 
 // invalidRequestType is a custom type to test invalid request scenarios

internal/mocks/servicemock.go

@@ -1,26 +0,0 @@
-package mocks
-
-import (
-	"git.grassecon.net/urdt/ussd/internal/models"
-	"github.com/stretchr/testify/mock"
-)
-
-// MockAccountService implements AccountServiceInterface for testing
-type MockAccountService struct {
-	mock.Mock
-}
-
-func (m *MockAccountService) CreateAccount() (*models.AccountResponse, error) {
-	args := m.Called()
-	return args.Get(0).(*models.AccountResponse), args.Error(1)
-}
-
-func (m *MockAccountService) CheckBalance(publicKey string) (string, error) {
-	args := m.Called(publicKey)
-	return args.String(0), args.Error(1)
-}
-
-func (m *MockAccountService) CheckAccountStatus(trackingId string) (string, error) {
-	args := m.Called(trackingId)
-	return args.String(0), args.Error(1)
-}

internal/models/accountresponse.go

@@ -1,15 +1,10 @@
 package models
 
-import (
-	"encoding/json"
-
-)
-
 type AccountResponse struct {
-	Ok     bool `json:"ok"`
-	Result struct {
-		CustodialId json.Number `json:"custodialId"`
-		PublicKey   string      `json:"publicKey"`
-		TrackingId  string      `json:"trackingId"`
+	Ok          bool   `json:"ok"`
+	Description string `json:"description"` // Include the description field
+	Result      struct {
+		PublicKey  string `json:"publicKey"`
+		TrackingId string `json:"trackingId"`
 	} `json:"result"`
-}
+}

internal/models/tokenresponse.go

@@ -0,0 +1,18 @@
+package models
+
+type ApiResponse struct {
+	OK          bool   `json:"ok"`
+	Description string `json:"description"`
+	Result      Result `json:"result"`
+}
+
+type Result struct {
+	Holdings []Holding `json:"holdings"`
+}
+
+type Holding struct {
+	ContractAddress string `json:"contractAddress"`
+	TokenSymbol     string `json:"tokenSymbol"`
+	TokenDecimals   string `json:"tokenDecimals"`
+	Balance         string `json:"balance"`
+}

internal/models/trackstatusresponse.go

@@ -4,7 +4,13 @@ import (
 	"encoding/json"
 	"time"
 )
-
+type Transaction struct {
+	CreatedAt     time.Time   `json:"createdAt"`
+	Status        string      `json:"status"`
+	TransferValue json.Number `json:"transferValue"`
+	TxHash        string      `json:"txHash"`
+	TxType        string      `json:"txType"`
+}
 
 type TrackStatusResponse struct {
 	Ok     bool `json:"ok"`
@@ -17,4 +23,4 @@ type TrackStatusResponse struct {
 			TxType        string      `json:"txType"`
 		}
 	} `json:"result"`
-}
+}

internal/models/vouchersresponse.go

@@ -0,0 +1,14 @@
+package models
+
+import dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+
+type VoucherHoldingResponse struct {
+	Ok          bool          `json:"ok"`
+	Description string        `json:"description"`
+	Result      VoucherResult `json:"result"`
+}
+
+// VoucherResult holds the list of token holdings
+type VoucherResult struct {
+	Holdings []dataserviceapi.TokenHoldings `json:"holdings"`
+}

internal/storage/db.go

@@ -14,15 +14,23 @@ const (
 	SUBPREFIX_TIME = uint16(1)
 )
 
+// PrefixDb interface abstracts the database operations.
+type PrefixDb interface {
+	Get(ctx context.Context, key []byte) ([]byte, error)
+	Put(ctx context.Context, key []byte, val []byte) error
+}
+
+var _ PrefixDb = (*SubPrefixDb)(nil)
+
 type SubPrefixDb struct {
 	store db.Db
-	pfx []byte
+	pfx   []byte
 }
 
 func NewSubPrefixDb(store db.Db, pfx []byte) *SubPrefixDb {
 	return &SubPrefixDb{
 		store: store,
-		pfx: pfx,
+		pfx:   pfx,
 	}
 }
 
@@ -34,18 +42,14 @@ func(s *SubPrefixDb) toKey(k []byte) []byte {
         return append(s.pfx, k...)
 }
 
-func(s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
-        s.store.SetPrefix(DATATYPE_USERSUB)
+func (s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
+	s.store.SetPrefix(DATATYPE_USERSUB)
 	key = s.toKey(key)
-        v, err := s.store.Get(ctx, key)
-        if err != nil {
-                return nil, err
-        }
-        return v, nil
+	return s.store.Get(ctx, key)
 }
 
-func(s *SubPrefixDb) Put(ctx context.Context, key []byte, val []byte) error {
-        s.store.SetPrefix(DATATYPE_USERSUB)
+func (s *SubPrefixDb) Put(ctx context.Context, key []byte, val []byte) error {
+	s.store.SetPrefix(DATATYPE_USERSUB)
 	key = s.toKey(key)
-        return s.store.Put(ctx, key, val)
+	return s.store.Put(ctx, key, val)
 }

internal/storage/gdbm.go

@@ -110,6 +110,7 @@ func(tdb *ThreadGdbmDb) Get(ctx context.Context, key []byte) ([]byte, error) {
 func(tdb *ThreadGdbmDb) Close() error {
 	tdb.reserve()
 	close(dbC[tdb.connStr])
+	delete(dbC, tdb.connStr)
 	err := tdb.db.Close()
 	tdb.db = nil
 	return err

internal/storage/storageservice.go

@@ -8,14 +8,16 @@ import (
 
 	"git.defalsify.org/vise.git/db"
 	fsdb "git.defalsify.org/vise.git/db/fs"
+	"git.defalsify.org/vise.git/db/postgres"
+	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
-	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/urdt/ussd/initializers"
 )
 
 var (
 	logg = logging.NewVanilla().WithDomain("storage")
-)	
+)
 
 type StorageService interface {
 	GetPersister(ctx context.Context) (*persist.Persister, error)
@@ -24,40 +26,86 @@ type StorageService interface {
 	EnsureDbDir() error
 }
 
-type MenuStorageService struct{
-	dbDir string
-	resourceDir string
+type MenuStorageService struct {
+	dbDir         string
+	resourceDir   string
 	resourceStore db.Db
-	stateStore db.Db
+	stateStore    db.Db
 	userDataStore db.Db
 }
 
+func buildConnStr() string {
+	host := initializers.GetEnv("DB_HOST", "localhost")
+	user := initializers.GetEnv("DB_USER", "postgres")
+	password := initializers.GetEnv("DB_PASSWORD", "")
+	dbName := initializers.GetEnv("DB_NAME", "")
+	port := initializers.GetEnv("DB_PORT", "5432")
+
+	return fmt.Sprintf(
+		"postgres://%s:%s@%s:%s/%s",
+		user, password, host, port, dbName,
+	)
+}
+
 func NewMenuStorageService(dbDir string, resourceDir string) *MenuStorageService {
 	return &MenuStorageService{
-		dbDir: dbDir,
+		dbDir:       dbDir,
 		resourceDir: resourceDir,
 	}
 }
 
-func (ms *MenuStorageService) GetPersister(ctx context.Context) (*persist.Persister, error) {
-	ms.stateStore = NewThreadGdbmDb()
-	storeFile := path.Join(ms.dbDir, "state.gdbm")
-	err := ms.stateStore.Connect(ctx, storeFile)
+func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, existingDb db.Db, fileName string) (db.Db, error) {
+	database, ok := ctx.Value("Database").(string)
+	if !ok {
+		return nil, fmt.Errorf("failed to select the database")
+	}
+
+	if existingDb != nil {
+		return existingDb, nil
+	}
+
+	var newDb db.Db
+	var err error
+
+	if database == "postgres" {
+		newDb = postgres.NewPgDb()
+		connStr := buildConnStr()
+		err = newDb.Connect(ctx, connStr)
+	} else {
+		newDb = NewThreadGdbmDb()
+		storeFile := path.Join(ms.dbDir, fileName)
+		err = newDb.Connect(ctx, storeFile)
+	}
+
 	if err != nil {
 		return nil, err
 	}
-	pr := persist.NewPersister(ms.stateStore)
-	logg.TraceCtxf(ctx, "menu storage service", "persist", pr, "store", ms.stateStore)
+
+	return newDb, nil
+}
+
+func (ms *MenuStorageService) GetPersister(ctx context.Context) (*persist.Persister, error) {
+	stateStore, err := ms.GetStateStore(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	pr := persist.NewPersister(stateStore)
+	logg.TraceCtxf(ctx, "menu storage service", "persist", pr, "store", stateStore)
 	return pr, nil
 }
 
 func (ms *MenuStorageService) GetUserdataDb(ctx context.Context) (db.Db, error) {
-	ms.userDataStore = NewThreadGdbmDb()
-	storeFile := path.Join(ms.dbDir, "userdata.gdbm")
-	err := ms.userDataStore.Connect(ctx, storeFile)
+	if ms.userDataStore != nil {
+		return ms.userDataStore, nil
+	}
+
+	userDataStore, err := ms.getOrCreateDb(ctx, ms.userDataStore, "userdata.gdbm")
 	if err != nil {
 		return nil, err
 	}
+
+	ms.userDataStore = userDataStore
 	return ms.userDataStore, nil
 }
 
@@ -73,14 +121,15 @@ func (ms *MenuStorageService) GetResource(ctx context.Context) (resource.Resourc
 
 func (ms *MenuStorageService) GetStateStore(ctx context.Context) (db.Db, error) {
 	if ms.stateStore != nil {
-		panic("set up store when already exists")
+		return ms.stateStore, nil
 	}
-	ms.stateStore = NewThreadGdbmDb()
-	storeFile := path.Join(ms.dbDir, "state.gdbm")
-	err := ms.stateStore.Connect(ctx, storeFile)
+
+	stateStore, err := ms.getOrCreateDb(ctx, ms.stateStore, "state.gdbm")
 	if err != nil {
 		return nil, err
 	}
+
+	ms.stateStore = stateStore
 	return ms.stateStore, nil
 }
 

internal/testutil/TestEngine.go

@@ -0,0 +1,124 @@
+package testutil
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"path"
+	"time"
+
+	"git.defalsify.org/vise.git/engine"
+	"git.defalsify.org/vise.git/logging"
+	"git.defalsify.org/vise.git/resource"
+	"git.grassecon.net/urdt/ussd/internal/handlers"
+	"git.grassecon.net/urdt/ussd/internal/handlers/server"
+	"git.grassecon.net/urdt/ussd/internal/storage"
+	"git.grassecon.net/urdt/ussd/internal/testutil/testservice"
+	"git.grassecon.net/urdt/ussd/internal/testutil/testtag"
+	testdataloader "github.com/peteole/testdata-loader"
+)
+
+var (
+	baseDir   = testdataloader.GetBasePath()
+	logg      = logging.NewVanilla()
+	scriptDir = path.Join(baseDir, "services", "registration")
+)
+
+func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
+	ctx := context.Background()
+	ctx = context.WithValue(ctx, "SessionId", sessionId)
+	ctx = context.WithValue(ctx, "Database", "gdbm")
+	pfp := path.Join(scriptDir, "pp.csv")
+
+	var eventChannel = make(chan bool)
+
+	cfg := engine.Config{
+		Root:       "root",
+		SessionId:  sessionId,
+		OutputSize: uint32(160),
+		FlagCount:  uint32(128),
+	}
+
+	dbDir := ".test_state"
+	resourceDir := scriptDir
+	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
+
+	err := menuStorageService.EnsureDbDir()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	rs, err := menuStorageService.GetResource(ctx)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	pe, err := menuStorageService.GetPersister(ctx)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	userDataStore, err := menuStorageService.GetUserdataDb(ctx)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	dbResource, ok := rs.(*resource.DbResource)
+	if !ok {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs.SetDataStore(&userDataStore)
+	lhs.SetPersister(pe)
+
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	if testtag.AccountService == nil {
+		testtag.AccountService = &server.AccountService{}
+	}
+
+	switch testtag.AccountService.(type) {
+	case *testservice.TestAccountService:
+		go func() {
+			eventChannel <- false
+		}()
+	case *server.AccountService:
+		go func() {
+			time.Sleep(5 * time.Second) // Wait for 5 seconds
+			eventChannel <- true
+		}()
+	default:
+		panic("Unknown account service type")
+	}
+
+	hl, err := lhs.GetHandler(testtag.AccountService)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	en := lhs.GetEngine()
+	en = en.WithFirst(hl.Init)
+	cleanFn := func() {
+		err := en.Finish()
+		if err != nil {
+			logg.Errorf(err.Error())
+		}
+
+		err = menuStorageService.Close()
+		if err != nil {
+			logg.Errorf(err.Error())
+		}
+		logg.Infof("testengine storage closed")
+	}
+	return en, cleanFn, eventChannel
+}

internal/testutil/driver/groupdriver.go

@@ -0,0 +1,111 @@
+package driver
+
+import (
+	"encoding/json"
+	"log"
+	"os"
+	"regexp"
+)
+
+type Step struct {
+	Input           string `json:"input"`
+	ExpectedContent string `json:"expectedContent"`
+}
+
+func (s *Step) MatchesExpectedContent(content []byte) (bool, error) {
+	pattern := regexp.QuoteMeta(s.ExpectedContent)
+	re, err := regexp.Compile(pattern)
+	if err != nil {
+		return false, err
+	}
+	if re.Match([]byte(content)) {
+		return true, nil
+	}
+	return false, nil
+}
+
+// Group represents a group of steps
+type Group struct {
+	Name  string `json:"name"`
+	Steps []Step `json:"steps"`
+}
+
+type TestCase struct {
+	Name            string
+	Input           string
+	ExpectedContent string
+}
+
+func (s *TestCase) MatchesExpectedContent(content []byte) (bool, error) {
+	pattern := regexp.QuoteMeta(s.ExpectedContent)
+	re, err := regexp.Compile(pattern)
+	if err != nil {
+		return false, err
+	}
+	// Check if the content matches the regex pattern
+	if re.Match(content) {
+		return true, nil
+	}
+	return false, nil
+}
+
+// DataGroup represents the overall structure of the JSON.
+type DataGroup struct {
+	Groups []Group `json:"groups"`
+}
+
+type Session struct {
+	Name   string  `json:"name"`
+	Groups []Group `json:"groups"`
+}
+
+func ReadData() []Session {
+	data, err := os.ReadFile("test_setup.json")
+	if err != nil {
+		log.Fatalf("Failed to read file: %v", err)
+	}
+	// Unmarshal JSON data
+	var sessions []Session
+	err = json.Unmarshal(data, &sessions)
+	if err != nil {
+		log.Fatalf("Failed to unmarshal JSON: %v", err)
+	}
+
+	return sessions
+}
+
+func FilterGroupsByName(groups []Group, name string) []Group {
+	var filteredGroups []Group
+	for _, group := range groups {
+		if group.Name == name {
+			filteredGroups = append(filteredGroups, group)
+		}
+	}
+	return filteredGroups
+}
+
+func LoadTestGroups(filePath string) (DataGroup, error) {
+	var sessionsData DataGroup
+	data, err := os.ReadFile(filePath)
+	if err != nil {
+		return sessionsData, err
+	}
+	err = json.Unmarshal(data, &sessionsData)
+	return sessionsData, err
+}
+
+func CreateTestCases(group DataGroup) []TestCase {
+	var tests []TestCase
+	for _, group := range group.Groups {
+		for _, step := range group.Steps {
+			// Create a test case for each group
+			tests = append(tests, TestCase{
+				Name:            group.Name,
+				Input:           step.Input,
+				ExpectedContent: step.ExpectedContent,
+			})
+		}
+	}
+
+	return tests
+}

internal/testutil/mocks/servicemock.go

@@ -0,0 +1,40 @@
+package mocks
+
+import (
+	"context"
+
+	"git.grassecon.net/urdt/ussd/internal/models"
+	"github.com/grassrootseconomics/eth-custodial/pkg/api"
+	"github.com/stretchr/testify/mock"
+)
+
+// MockAccountService implements AccountServiceInterface for testing
+type MockAccountService struct {
+	mock.Mock
+}
+
+func (m *MockAccountService) CreateAccount(ctx context.Context) (*api.OKResponse, error) {
+	args := m.Called()
+	return args.Get(0).(*api.OKResponse), args.Error(1)
+}
+
+func (m *MockAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error) {
+	args := m.Called(publicKey)
+	return args.Get(0).(*models.BalanceResponse), args.Error(1)
+}
+
+func (m *MockAccountService) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error) {
+	args := m.Called(trackingId)
+	return args.Get(0).(*models.TrackStatusResponse), args.Error(1)
+}
+
+func (m *MockAccountService) TrackAccountStatus(ctx context.Context,publicKey string) (*api.OKResponse, error) {
+	args := m.Called(publicKey)
+	return args.Get(0).(*api.OKResponse), args.Error(1)
+}
+
+
+func (m *MockAccountService) FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error) {
+	args := m.Called(publicKey)
+	return args.Get(0).(*models.VoucherHoldingResponse), args.Error(1)
+}

internal/testutil/mocks/subprefixdbmock.go

@@ -0,0 +1,21 @@
+package mocks
+
+import (
+	"context"
+
+	"github.com/stretchr/testify/mock"
+)
+
+type MockSubPrefixDb struct {
+	mock.Mock
+}
+
+func (m *MockSubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
+	args := m.Called(ctx, key)
+	return args.Get(0).([]byte), args.Error(1)
+}
+
+func (m *MockSubPrefixDb) Put(ctx context.Context, key, val []byte) error {
+	args := m.Called(ctx, key, val)
+	return args.Error(0)
+}

internal/testutil/testservice/TestAccountService.go

@@ -0,0 +1,90 @@
+package testservice
+
+import (
+	"context"
+	"encoding/json"
+	"time"
+
+	"git.grassecon.net/urdt/ussd/internal/models"
+	"github.com/grassrootseconomics/eth-custodial/pkg/api"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+)
+
+type TestAccountService struct {
+}
+
+func (tas *TestAccountService) CreateAccount(ctx context.Context) (*api.OKResponse, error) {
+	return &api.OKResponse{
+		Ok:          true,
+		Description: "Account creation succeeded",
+		Result: map[string]any{
+			"trackingId": "075ccc86-f6ef-4d33-97d5-e91cfb37aa0d",
+			"publicKey":  "0x623EFAFa8868df4B934dd12a8B26CB3Dd75A7AdD",
+		},
+	}, nil
+}
+
+func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error) {
+	balanceResponse := &models.BalanceResponse{
+		Ok: true,
+		Result: struct {
+			Balance string      `json:"balance"`
+			Nonce   json.Number `json:"nonce"`
+		}{
+			Balance: "0.003 CELO",
+			Nonce:   json.Number("0"),
+		},
+	}
+
+	return balanceResponse, nil
+}
+
+func (tas *TestAccountService) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error) {
+	trackResponse := &models.TrackStatusResponse{
+		Ok: true,
+		Result: struct {
+			Transaction struct {
+				CreatedAt     time.Time   "json:\"createdAt\""
+				Status        string      "json:\"status\""
+				TransferValue json.Number "json:\"transferValue\""
+				TxHash        string      "json:\"txHash\""
+				TxType        string      "json:\"txType\""
+			}
+		}{
+			Transaction: models.Transaction{
+				CreatedAt:     time.Now(),
+				Status:        "SUCCESS",
+				TransferValue: json.Number("0.5"),
+				TxHash:        "0x123abc456def",
+				TxType:        "transfer",
+			},
+		},
+	}
+	return trackResponse, nil
+}
+
+func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error) {
+	return &api.OKResponse{
+		Ok:          true,
+		Description: "Account creation succeeded",
+		Result: map[string]any{
+			"active": true,
+		},
+	}, nil
+}
+
+func (tas *TestAccountService) FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error) {
+	return &models.VoucherHoldingResponse{
+		Ok: true,
+		Result: models.VoucherResult{
+			Holdings: []dataserviceapi.TokenHoldings{
+				{
+					ContractAddress: "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
+					TokenSymbol:     "SRF",
+					TokenDecimals:   "6",
+					Balance:         "2745987",
+				},
+			},
+		},
+	}, nil
+}

internal/testutil/testtag/offlinetest.go

@@ -0,0 +1,12 @@
+// +build !online
+
+package testtag
+
+import (
+	"git.grassecon.net/urdt/ussd/internal/handlers/server"
+	accountservice "git.grassecon.net/urdt/ussd/internal/testutil/testservice"
+)
+
+var (
+	AccountService server.AccountServiceInterface = &accountservice.TestAccountService{}
+)

internal/testutil/testtag/onlinetest.go

@@ -0,0 +1,9 @@
+// +build online
+
+package testtag
+
+import "git.grassecon.net/urdt/ussd/internal/handlers/server"
+
+var (
+	AccountService server.AccountServiceInterface
+)

internal/utils/db.go

@@ -14,15 +14,32 @@ const (
 	DATA_CUSTODIAL_ID
 	DATA_ACCOUNT_PIN
 	DATA_ACCOUNT_STATUS
+	DATA_TEMPORARY_FIRST_NAME
 	DATA_FIRST_NAME
+	DATA_TEMPORARY_FAMILY_NAME
 	DATA_FAMILY_NAME
+	DATA_TEMPORARY_YOB
 	DATA_YOB
+	DATA_TEMPORARY_LOCATION
 	DATA_LOCATION
+	DATA_TEMPORARY_GENDER
 	DATA_GENDER
+	DATA_TEMPORARY_OFFERINGS
 	DATA_OFFERINGS
 	DATA_RECIPIENT
 	DATA_AMOUNT
 	DATA_TEMPORARY_PIN
+	DATA_VOUCHER_LIST
+	DATA_TEMPORARY_SYM
+	DATA_ACTIVE_SYM
+	DATA_TEMPORARY_BAL
+	DATA_ACTIVE_BAL
+	DATA_PUBLIC_KEY_REVERSE
+	DATA_TEMPORARY_DECIMAL
+	DATA_ACTIVE_DECIMAL
+	DATA_TEMPORARY_ADDRESS
+	DATA_ACTIVE_ADDRESS
+
 )
 
 func typToBytes(typ DataTyp) []byte {

internal/utils/vouchers.go

@@ -0,0 +1,161 @@
+package utils
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"git.grassecon.net/urdt/ussd/internal/storage"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+)
+
+// VoucherMetadata helps organize data fields
+type VoucherMetadata struct {
+	Symbols   string
+	Balances  string
+	Decimals  string
+	Addresses string
+}
+
+// ProcessVouchers converts holdings into formatted strings
+func ProcessVouchers(holdings []dataserviceapi.TokenHoldings) VoucherMetadata {
+	var data VoucherMetadata
+	var symbols, balances, decimals, addresses []string
+
+	for i, h := range holdings {
+		symbols = append(symbols, fmt.Sprintf("%d:%s", i+1, h.TokenSymbol))
+		balances = append(balances, fmt.Sprintf("%d:%s", i+1, h.Balance))
+		decimals = append(decimals, fmt.Sprintf("%d:%s", i+1, h.TokenDecimals))
+		addresses = append(addresses, fmt.Sprintf("%d:%s", i+1, h.ContractAddress))
+	}
+
+	data.Symbols = strings.Join(symbols, "\n")
+	data.Balances = strings.Join(balances, "\n")
+	data.Decimals = strings.Join(decimals, "\n")
+	data.Addresses = strings.Join(addresses, "\n")
+
+	return data
+}
+
+// GetVoucherData retrieves and matches voucher data
+func GetVoucherData(ctx context.Context, db storage.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) {
+	keys := []string{"sym", "bal", "deci", "addr"}
+	data := make(map[string]string)
+
+	for _, key := range keys {
+		value, err := db.Get(ctx, []byte(key))
+		if err != nil {
+			return nil, fmt.Errorf("failed to get %s: %v", key, err)
+		}
+		data[key] = string(value)
+	}
+
+	symbol, balance, decimal, address := MatchVoucher(input,
+		data["sym"],
+		data["bal"],
+		data["deci"],
+		data["addr"])
+
+	if symbol == "" {
+		return nil, nil
+	}
+
+	return &dataserviceapi.TokenHoldings{
+		TokenSymbol:     string(symbol),
+		Balance:         string(balance),
+		TokenDecimals:   string(decimal),
+		ContractAddress: string(address),
+	}, nil
+}
+
+// MatchVoucher finds the matching voucher symbol, balance, decimals and contract address based on the input.
+func MatchVoucher(input, symbols, balances, decimals, addresses string) (symbol, balance, decimal, address string) {
+	symList := strings.Split(symbols, "\n")
+	balList := strings.Split(balances, "\n")
+	decList := strings.Split(decimals, "\n")
+	addrList := strings.Split(addresses, "\n")
+
+	for i, sym := range symList {
+		parts := strings.SplitN(sym, ":", 2)
+	
+		if input == parts[0] || strings.EqualFold(input, parts[1]) {
+			symbol = parts[1]
+			if i < len(balList) {
+				balance = strings.SplitN(balList[i], ":", 2)[1]
+			}
+			if i < len(decList) {
+				decimal = strings.SplitN(decList[i], ":", 2)[1]
+			}
+			if i < len(addrList) {
+				address = strings.SplitN(addrList[i], ":", 2)[1]
+			}
+			break
+		}
+	}
+	return
+}
+
+// StoreTemporaryVoucher saves voucher metadata as temporary entries in the DataStore.
+func StoreTemporaryVoucher(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
+	entries := map[DataTyp][]byte{
+		DATA_TEMPORARY_SYM:     []byte(data.TokenSymbol),
+		DATA_TEMPORARY_BAL:     []byte(data.Balance),
+		DATA_TEMPORARY_DECIMAL: []byte(data.TokenDecimals),
+		DATA_TEMPORARY_ADDRESS: []byte(data.ContractAddress),
+	}
+
+	for key, value := range entries {
+		if err := store.WriteEntry(ctx, sessionId, key, value); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// GetTemporaryVoucherData retrieves temporary voucher metadata from the DataStore.
+func GetTemporaryVoucherData(ctx context.Context, store DataStore, sessionId string) (*dataserviceapi.TokenHoldings, error) {
+	keys := []DataTyp{
+		DATA_TEMPORARY_SYM,
+		DATA_TEMPORARY_BAL,
+		DATA_TEMPORARY_DECIMAL,
+		DATA_TEMPORARY_ADDRESS,
+	}
+
+	data := &dataserviceapi.TokenHoldings{}
+	values := make([][]byte, len(keys))
+
+	for i, key := range keys {
+		value, err := store.ReadEntry(ctx, sessionId, key)
+		if err != nil {
+			return nil, err
+		}
+		values[i] = value
+	}
+
+	data.TokenSymbol = string(values[0])
+	data.Balance = string(values[1])
+	data.TokenDecimals = string(values[2])
+	data.ContractAddress = string(values[3])
+
+	return data, nil
+}
+
+// UpdateVoucherData sets the active voucher data in the DataStore.
+func UpdateVoucherData(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
+	// Active voucher data entries
+	activeEntries := map[DataTyp][]byte{
+		DATA_ACTIVE_SYM:     []byte(data.TokenSymbol),
+		DATA_ACTIVE_BAL:     []byte(data.Balance),
+		DATA_ACTIVE_DECIMAL: []byte(data.TokenDecimals),
+		DATA_ACTIVE_ADDRESS: []byte(data.ContractAddress),
+	}
+
+	// Write active data
+	for key, value := range activeEntries {
+		if err := store.WriteEntry(ctx, sessionId, key, value); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

internal/utils/vouchers_test.go

@@ -0,0 +1,203 @@
+package utils
+
+import (
+	"context"
+	"testing"
+
+	"git.grassecon.net/urdt/ussd/internal/storage"
+	"github.com/alecthomas/assert/v2"
+	"github.com/stretchr/testify/require"
+
+	memdb "git.defalsify.org/vise.git/db/mem"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+)
+
+// InitializeTestDb sets up and returns an in-memory database and store.
+func InitializeTestDb(t *testing.T) (context.Context, *UserDataStore) {
+	ctx := context.Background()
+
+	// Initialize memDb
+	db := memdb.NewMemDb()
+	err := db.Connect(ctx, "")
+	require.NoError(t, err, "Failed to connect to memDb")
+
+	// Create UserDataStore with memDb
+	store := &UserDataStore{Db: db}
+
+	t.Cleanup(func() {
+		db.Close() // Ensure the DB is closed after each test
+	})
+
+	return ctx, store
+}
+
+func TestMatchVoucher(t *testing.T) {
+	symbols := "1:SRF\n2:MILO"
+	balances := "1:100\n2:200"
+	decimals := "1:6\n2:4"
+	addresses := "1:0xd4c288865Ce\n2:0x41c188d63Qa"
+
+	// Test for valid voucher
+	symbol, balance, decimal, address := MatchVoucher("2", symbols, balances, decimals, addresses)
+
+	// Assertions for valid voucher
+	assert.Equal(t, "MILO", symbol)
+	assert.Equal(t, "200", balance)
+	assert.Equal(t, "4", decimal)
+	assert.Equal(t, "0x41c188d63Qa", address)
+
+	// Test for non-existent voucher
+	symbol, balance, decimal, address = MatchVoucher("3", symbols, balances, decimals, addresses)
+
+	// Assertions for non-match
+	assert.Equal(t, "", symbol)
+	assert.Equal(t, "", balance)
+	assert.Equal(t, "", decimal)
+	assert.Equal(t, "", address)
+}
+
+func TestProcessVouchers(t *testing.T) {
+	holdings := []dataserviceapi.TokenHoldings{
+		{ContractAddress: "0xd4c288865Ce", TokenSymbol: "SRF", TokenDecimals: "6", Balance: "100"},
+		{ContractAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200"},
+	}
+
+	expectedResult := VoucherMetadata{
+		Symbols:   "1:SRF\n2:MILO",
+		Balances:  "1:100\n2:200",
+		Decimals:  "1:6\n2:4",
+		Addresses: "1:0xd4c288865Ce\n2:0x41c188d63Qa",
+	}
+
+	result := ProcessVouchers(holdings)
+
+	assert.Equal(t, expectedResult, result)
+}
+
+func TestGetVoucherData(t *testing.T) {
+	ctx := context.Background()
+
+	db := memdb.NewMemDb()
+	err := db.Connect(ctx, "")
+	if err != nil {
+		t.Fatal(err)
+	}
+	spdb := storage.NewSubPrefixDb(db, []byte("vouchers"))
+
+	// Test voucher data
+	mockData := map[string][]byte{
+		"sym":  []byte("1:SRF\n2:MILO"),
+		"bal":  []byte("1:100\n2:200"),
+		"deci": []byte("1:6\n2:4"),
+		"addr": []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"),
+	}
+
+	// Put the data
+	for key, value := range mockData {
+		err = spdb.Put(ctx, []byte(key), []byte(value))
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	result, err := GetVoucherData(ctx, spdb, "1")
+
+	assert.NoError(t, err)
+	assert.Equal(t, "SRF", result.TokenSymbol)
+	assert.Equal(t, "100", result.Balance)
+	assert.Equal(t, "6", result.TokenDecimals)
+	assert.Equal(t, "0xd4c288865Ce", result.ContractAddress)
+}
+
+func TestStoreTemporaryVoucher(t *testing.T) {
+	ctx, store := InitializeTestDb(t)
+	sessionId := "session123"
+
+	// Test data
+	voucherData := &dataserviceapi.TokenHoldings{
+		TokenSymbol:     "SRF",
+		Balance:         "200",
+		TokenDecimals:   "6",
+		ContractAddress: "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
+	}
+
+	// Execute the function being tested
+	err := StoreTemporaryVoucher(ctx, store, sessionId, voucherData)
+	require.NoError(t, err)
+
+	// Verify stored data
+	expectedEntries := map[DataTyp][]byte{
+		DATA_TEMPORARY_SYM:     []byte("SRF"),
+		DATA_TEMPORARY_BAL:     []byte("200"),
+		DATA_TEMPORARY_DECIMAL: []byte("6"),
+		DATA_TEMPORARY_ADDRESS: []byte("0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9"),
+	}
+
+	for key, expectedValue := range expectedEntries {
+		storedValue, err := store.ReadEntry(ctx, sessionId, key)
+		require.NoError(t, err)
+		require.Equal(t, expectedValue, storedValue, "Mismatch for key %v", key)
+	}
+}
+
+func TestGetTemporaryVoucherData(t *testing.T) {
+	ctx, store := InitializeTestDb(t)
+	sessionId := "session123"
+
+	// Test voucher data
+	tempData := &dataserviceapi.TokenHoldings{
+		TokenSymbol:     "SRF",
+		Balance:         "200",
+		TokenDecimals:   "6",
+		ContractAddress: "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
+	}
+
+	// Store the data
+	err := StoreTemporaryVoucher(ctx, store, sessionId, tempData)
+	require.NoError(t, err)
+
+	// Execute the function being tested
+	data, err := GetTemporaryVoucherData(ctx, store, sessionId)
+	require.NoError(t, err)
+	require.Equal(t, tempData, data)
+}
+
+func TestUpdateVoucherData(t *testing.T) {
+	ctx, store := InitializeTestDb(t)
+	sessionId := "session123"
+
+	// New voucher data
+	newData := &dataserviceapi.TokenHoldings{
+		TokenSymbol:     "SRF",
+		Balance:         "200",
+		TokenDecimals:   "6",
+		ContractAddress: "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
+	}
+
+	// Old temporary data
+	tempData := &dataserviceapi.TokenHoldings{
+		TokenSymbol:     "OLD",
+		Balance:         "100",
+		TokenDecimals:   "8",
+		ContractAddress: "0xold",
+	}
+	require.NoError(t, StoreTemporaryVoucher(ctx, store, sessionId, tempData))
+
+	// Execute update
+	err := UpdateVoucherData(ctx, store, sessionId, newData)
+	require.NoError(t, err)
+
+	// Verify active data was stored correctly
+	activeEntries := map[DataTyp][]byte{
+		DATA_ACTIVE_SYM:     []byte(newData.TokenSymbol),
+		DATA_ACTIVE_BAL:     []byte(newData.Balance),
+		DATA_ACTIVE_DECIMAL: []byte(newData.TokenDecimals),
+		DATA_ACTIVE_ADDRESS: []byte(newData.ContractAddress),
+	}
+
+	for key, expectedValue := range activeEntries {
+		storedValue, err := store.ReadEntry(ctx, sessionId, key)
+		require.NoError(t, err)
+		require.Equal(t, expectedValue, storedValue, "Active data mismatch for key %v", key)
+	}
+}