37 changed files with 350 additions and 824 deletions
--- a/internal/handlers/handlerservice.go
+++ b/internal/handlers/handlerservice.go
@ -61,8 +61,8 @@ func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceIn
 	ussdHandlers = ussdHandlers.WithPersister(ls.Pe)
 	ls.DbRs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
 	ls.DbRs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
-	ls.DbRs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
-	ls.DbRs.AddLocalFunc("verify_create_pin", ussdHandlers.VerifyCreatePin)
+	ls.DbRs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
+	ls.DbRs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
 	ls.DbRs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
 	ls.DbRs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
 	ls.DbRs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
@ -89,15 +89,11 @@ func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceIn
 	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
 }
--- a/internal/handlers/server/accountservice.go
+++ b/internal/handlers/server/accountservice.go
@ -7,7 +7,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"os"
 	"time"

 	"git.grassecon.net/urdt/ussd/config"
@ -25,7 +24,6 @@ type AccountServiceInterface interface {
 	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 {
@ -171,23 +169,6 @@ func (as *AccountService) CreateAccount(ctx context.Context) (*api.OKResponse, e
 	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
-}
-
 func (tas *TestAccountService) CreateAccount(ctx context.Context) (*api.OKResponse, error) {
 	return &api.OKResponse{
 		Ok:          true,
@ -244,31 +225,3 @@ func (tas *TestAccountService) CheckAccountStatus(ctx context.Context, trackingI
 	}
 	return trackResponse, nil
 }
-
-func (tas *TestAccountService) FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error) {
-	return &models.VoucherHoldingResponse{
-		Ok: true,
-		Result: struct {
-			Holdings []struct {
-				ContractAddress string `json:"contractAddress"`
-				TokenSymbol     string `json:"tokenSymbol"`
-				TokenDecimals   string `json:"tokenDecimals"`
-				Balance         string `json:"balance"`
-			} `json:"holdings"`
-		}{
-			Holdings: []struct {
-				ContractAddress string `json:"contractAddress"`
-				TokenSymbol     string `json:"tokenSymbol"`
-				TokenDecimals   string `json:"tokenDecimals"`
-				Balance         string `json:"balance"`
-			}{
-				{
-					ContractAddress: "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
-					TokenSymbol:     "SRF",
-					TokenDecimals:   "6",
-					Balance:         "2745987",
-				},
-			},
-		},
-	}, nil
-}
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@ -22,8 +22,6 @@ import (
 	"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 (
@ -189,6 +187,33 @@ 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)
@ -207,9 +232,6 @@ 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
@ -218,7 +240,6 @@ 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)
@ -228,15 +249,11 @@ 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
 }

@ -265,10 +282,10 @@ func (h *Handlers) ConfirmPinChange(ctx context.Context, sym string, input []byt
 	return res, nil
 }

-// 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
+// VerifyPin checks whether the confirmation PIN is similar to the account PIN
+// If similar, it sets the USERFLAG_PIN_SET flag allowing the user
 // to access the main menu
-func (h *Handlers) VerifyCreatePin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+func (h *Handlers) VerifyPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result

 	flag_valid_pin, _ := h.flagManager.GetFlag("flag_valid_pin")
@ -280,12 +297,12 @@ func (h *Handlers) VerifyCreatePin(ctx context.Context, sym string, input []byte
 		return res, fmt.Errorf("missing session")
 	}
 	store := h.userdataStore
-	temporaryPin, err := store.ReadEntry(ctx, sessionId, utils.DATA_TEMPORARY_PIN)
+	AccountPin, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACCOUNT_PIN)
 	if err != nil {
 		return res, err
 	}

-	if bytes.Equal(input, temporaryPin) {
+	if bytes.Equal(input, AccountPin) {
 		res.FlagSet = []uint32{flag_valid_pin}
 		res.FlagReset = []uint32{flag_pin_mismatch}
 		res.FlagSet = append(res.FlagSet, flag_pin_set)
@ -293,11 +310,6 @@ func (h *Handlers) VerifyCreatePin(ctx context.Context, sym string, input []byte
 		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
 }

@ -616,12 +628,14 @@ func (h *Handlers) ResetIncorrectYob(ctx context.Context, sym string, input []by
 	return res, nil
 }

-// CheckBalance retrieves the balance of the active voucher and sets
+// CheckBalance retrieves the balance from the API using the "PublicKey" 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
 	var err error

+	flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
+
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
@ -632,25 +646,23 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 	l.AddDomain("default")

 	store := h.userdataStore
-
-	// get the active sym and active balance
-	activeSym, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_SYM)
+	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
+	if err != nil {
+		return res, err
+	}
+
+	balanceResponse, err := h.accountService.CheckBalance(ctx, string(publicKey))
 	if err != nil {
-		if db.IsNotFound(err) {
-			balance := "0.00"
-			res.Content = l.Get("Balance: %s\n", balance)
 		return res, nil
 	}
-
-		return res, err
+	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

-	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))
+	res.Content = l.Get("Balance: %s\n", balance)

 	return res, nil
 }
@ -788,13 +800,15 @@ 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)

-	activeBal, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_BAL)
+	balanceResp, err := h.accountService.CheckBalance(ctx, string(publicKey))
 	if err != nil {
-		return res, err
+		return res, nil
 	}
+	balance := balanceResp.Result.Balance

-	res.Content = string(activeBal)
+	res.Content = balance

 	return res, nil
 }
@ -803,29 +817,54 @@ 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")
+	flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
+
 	store := h.userdataStore
+	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)

-	var balanceValue float64
+	amountStr := string(input)

-	// retrieve the active balance
-	activeBal, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_BAL)
+	balanceRes, err := h.accountService.CheckBalance(ctx, string(publicKey))
+	balanceStr := balanceRes.Result.Balance
+
+	if !balanceRes.Ok {
+		res.FlagSet = append(res.FlagSet, flag_api_error)
+		return res, nil
+	}
 	if err != nil {
 		return res, err
 	}
-	balanceValue, err = strconv.ParseFloat(string(activeBal), 64)
+	res.Content = balanceStr
+	res.FlagReset = append(res.FlagReset, flag_api_error)
+
+	// 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)
 	if err != nil {
-		return res, err
+		return res, fmt.Errorf("failed to parse balance: %v", err)
 	}

-	// Extract numeric part from the input amount
-	amountStr := strings.TrimSpace(string(input))
-	inputAmount, err := strconv.ParseFloat(amountStr, 64)
+	// 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)
 	if err != nil {
 		res.FlagSet = append(res.FlagSet, flag_invalid_amount)
 		res.Content = amountStr
@ -838,14 +877,12 @@ func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte)
 		return res, nil
 	}

-	// Format the amount with 2 decimal places before saving
-	formattedAmount := fmt.Sprintf("%.2f", inputAmount)
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_AMOUNT, []byte(formattedAmount))
+	res.Content = fmt.Sprintf("%.3f", inputAmount) // Format to 3 decimal places
+	err = store.WriteEntry(ctx, sessionId, utils.DATA_AMOUNT, []byte(amountStr))
 	if err != nil {
 		return res, err
 	}

-	res.Content = fmt.Sprintf("%s", formattedAmount)
 	return res, nil
 }

@ -888,16 +925,9 @@ func (h *Handlers) GetAmount(ctx context.Context, sym string, input []byte) (res
 		return res, fmt.Errorf("missing session")
 	}
 	store := h.userdataStore
-
-	// retrieve the active symbol
-	activeSym, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_SYM)
-	if err != nil {
-		return res, err
-	}
-
 	amount, _ := store.ReadEntry(ctx, sessionId, utils.DATA_AMOUNT)

-	res.Content = fmt.Sprintf("%s %s", string(amount), string(activeSym))
+	res.Content = string(amount)

 	return res, nil
 }
@ -923,9 +953,7 @@ func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []

 	recipient, _ := store.ReadEntry(ctx, sessionId, utils.DATA_RECIPIENT)

-	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))
+	res.Content = l.Get("Your request has been sent. %s will receive %s from %s.", string(recipient), string(amount), string(sessionId))

 	account_authorized_flag, err := h.flagManager.GetFlag("flag_account_authorized")
 	if err != nil {
@ -1009,279 +1037,3 @@ func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte)

 	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, nil
-			}
-
-			// Fetch vouchers from the API using the public key
-			vouchersResp, err := h.accountService.FetchVouchers(ctx, string(publicKey))
-			if err != nil {
-				return res, nil
-			}
-
-			// 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
-	}
-
-	// process voucher data
-	voucherSymbolList, voucherBalanceList := ProcessVouchers(vouchersResp.Result.Holdings)
-
-	prefixdb := storage.NewSubPrefixDb(store, []byte("vouchers"))
-	err = prefixdb.Put(ctx, []byte("sym"), []byte(voucherSymbolList))
-	if err != nil {
-		return res, nil
-	}
-
-	err = prefixdb.Put(ctx, []byte("bal"), []byte(voucherBalanceList))
-	if err != nil {
-		return res, nil
-	}
-
-	return res, nil
-}
-
-// ProcessVouchers formats the holdings into symbol and balance lists.
-func ProcessVouchers(holdings []struct {
-	ContractAddress string `json:"contractAddress"`
-	TokenSymbol     string `json:"tokenSymbol"`
-	TokenDecimals   string `json:"tokenDecimals"`
-	Balance         string `json:"balance"`
-}) (string, string) {
-	var numberedSymbols, numberedBalances []string
-
-	for i, voucher := range holdings {
-		numberedSymbols = append(numberedSymbols, fmt.Sprintf("%d:%s", i+1, voucher.TokenSymbol))
-		numberedBalances = append(numberedBalances, fmt.Sprintf("%d:%s", i+1, voucher.Balance))
-	}
-
-	voucherSymbolList := strings.Join(numberedSymbols, "\n")
-	voucherBalanceList := strings.Join(numberedBalances, "\n")
-
-	return voucherSymbolList, voucherBalanceList
-}
-
-// 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
-	store := h.userdataStore
-	prefixdb := storage.NewSubPrefixDb(store, []byte("vouchers"))
-
-	voucherData, err := prefixdb.Get(ctx, []byte("sym"))
-	if err != nil {
-		return res, nil
-	}
-
-	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
-	store := h.userdataStore
-
-	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
-	}
-
-	prefixdb := storage.NewSubPrefixDb(store, []byte("vouchers"))
-
-	// Retrieve the voucher symbol list
-	voucherSymbolList, err := prefixdb.Get(ctx, []byte("sym"))
-	if err != nil {
-		return res, fmt.Errorf("failed to retrieve voucher symbol list: %v", err)
-	}
-
-	// Retrieve the voucher balance list
-	voucherBalanceList, err := prefixdb.Get(ctx, []byte("bal"))
-	if err != nil {
-		return res, fmt.Errorf("failed to retrieve voucher balance list: %v", err)
-	}
-
-	// match the voucher symbol and balance with the input
-	matchedSymbol, matchedBalance := MatchVoucher(inputStr, string(voucherSymbolList), string(voucherBalanceList))
-
-	// If a match is found, write the temporary sym and balance
-	if matchedSymbol != "" && matchedBalance != "" {
-		err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_SYM, []byte(matchedSymbol))
-		if err != nil {
-			return res, err
-		}
-		err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_BAL, []byte(matchedBalance))
-		if err != nil {
-			return res, err
-		}
-
-		res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
-		res.Content = fmt.Sprintf("%s\n%s", matchedSymbol, matchedBalance)
-	} else {
-		res.FlagSet = append(res.FlagSet, flag_incorrect_voucher)
-	}
-
-	return res, nil
-}
-
-// MatchVoucher finds the matching voucher symbol and balance based on the input.
-func MatchVoucher(inputStr string, voucherSymbols, voucherBalances string) (string, string) {
-	// Split the lists into slices for processing
-	symbols := strings.Split(voucherSymbols, "\n")
-	balances := strings.Split(voucherBalances, "\n")
-
-	var matchedSymbol, matchedBalance string
-
-	for i, symbol := range symbols {
-		symbolParts := strings.SplitN(symbol, ":", 2)
-		if len(symbolParts) != 2 {
-			continue
-		}
-		voucherNum := symbolParts[0]
-		voucherSymbol := symbolParts[1]
-
-		// Check if input matches either the number or the symbol
-		if inputStr == voucherNum || strings.EqualFold(inputStr, voucherSymbol) {
-			matchedSymbol = voucherSymbol
-			// Ensure there's a corresponding balance
-			if i < len(balances) {
-				matchedBalance = strings.SplitN(balances[i], ":", 2)[1]
-			}
-			break
-		}
-	}
-
-	return matchedSymbol, matchedBalance
-}
-
-// SetVoucher retrieves the temporary sym and balance,
-// sets them as the active data and
-// clears the temporary data
-func (h *Handlers) SetVoucher(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")
-	}
-
-	// get the current temporary symbol
-	temporarySym, err := store.ReadEntry(ctx, sessionId, utils.DATA_TEMPORARY_SYM)
-	if err != nil {
-		return res, err
-	}
-	// get the current temporary balance
-	temporaryBal, err := store.ReadEntry(ctx, sessionId, utils.DATA_TEMPORARY_BAL)
-	if err != nil {
-		return res, err
-	}
-
-	// set the active symbol
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_ACTIVE_SYM, []byte(temporarySym))
-	if err != nil {
-		return res, err
-	}
-	// set the active balance
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_ACTIVE_BAL, []byte(temporaryBal))
-	if err != nil {
-		return res, err
-	}
-
-	// reset the temporary symbol
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_SYM, []byte(""))
-	if err != nil {
-		return res, err
-	}
-	// reset the temporary balance
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_BAL, []byte(""))
-	if err != nil {
-		return res, err
-	}
-
-	res.Content = string(temporarySym)
-
-	return res, nil
-}
--- a/internal/handlers/ussd/menuhandler_test.go
+++ b/internal/handlers/ussd/menuhandler_test.go
@ -218,7 +218,7 @@ func TestSaveFamilyname(t *testing.T) {
 	mockStore.AssertExpectations(t)
 }

-func TestSaveTemporaryPin(t *testing.T) {
+func TestSavePin(t *testing.T) {
 	fm, err := NewFlagManager(flagsPath)
 	mockStore := new(mocks.MockUserDataStore)
 	if err != nil {
@ -260,10 +260,10 @@ func TestSaveTemporaryPin(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {

 			// Set up the expected behavior of the mock
-			mockStore.On("WriteEntry", ctx, sessionId, utils.DATA_TEMPORARY_PIN, []byte(tt.input)).Return(nil)
+			mockStore.On("WriteEntry", ctx, sessionId, utils.DATA_ACCOUNT_PIN, []byte(tt.input)).Return(nil)

 			// Call the method
-			res, err := h.SaveTemporaryPin(ctx, "save_pin", tt.input)
+			res, err := h.SavePin(ctx, "save_pin", tt.input)

 			if err != nil {
 				t.Error(err)
@ -481,6 +481,37 @@ func TestCheckIdentifier(t *testing.T) {
 	}
 }

+func TestMaxAmount(t *testing.T) {
+	mockStore := new(mocks.MockUserDataStore)
+	mockCreateAccountService := new(mocks.MockAccountService)
+
+	// Define test data
+	sessionId := "session123"
+	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
+	publicKey := "0xcasgatweksalw1018221"
+
+	expectedBalance := &models.BalanceResponse{
+		Ok: true,
+	}
+
+	// Set up the expected behavior of the mock
+	mockStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return([]byte(publicKey), nil)
+	mockCreateAccountService.On("CheckBalance", publicKey).Return(expectedBalance, nil)
+
+	// Create the Handlers instance with the mock store
+	h := &Handlers{
+		userdataStore:  mockStore,
+		accountService: mockCreateAccountService,
+	}
+
+	// Call the method
+	res, _ := h.MaxAmount(ctx, "max_amount", []byte("check_balance"))
+
+	//Assert that the balance that was set as the result content is what was returned by  Check Balance
+	assert.Equal(t, expectedBalance.Result.Balance, res.Content)
+
+}
+
 func TestGetSender(t *testing.T) {
 	mockStore := new(mocks.MockUserDataStore)

@ -501,30 +532,26 @@ func TestGetSender(t *testing.T) {
 }

 func TestGetAmount(t *testing.T) {
-	mockDataStore := new(mocks.MockUserDataStore)
+	mockStore := new(mocks.MockUserDataStore)

 	// Define test data
 	sessionId := "session123"
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
-	amount := "0.03"
-	activeSym := "SRF"
+	Amount := "0.03CELO"

 	// Set up the expected behavior of the mock
-	mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_ACTIVE_SYM).Return([]byte(activeSym), nil)
-	mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_AMOUNT).Return([]byte(amount), nil)
+	mockStore.On("ReadEntry", ctx, sessionId, utils.DATA_AMOUNT).Return([]byte(Amount), nil)

 	// Create the Handlers instance with the mock store
 	h := &Handlers{
-		userdataStore: mockDataStore,
+		userdataStore: mockStore,
 	}

 	// Call the method
-	res, _ := h.GetAmount(ctx, "get_amount", []byte(""))
-
-	formattedAmount := fmt.Sprintf("%s %s", amount, activeSym)
+	res, _ := h.GetAmount(ctx, "get_amount", []byte("Getting amount..."))

 	//Assert that the retrieved amount is what was set as the content
-	assert.Equal(t, formattedAmount, res.Content)
+	assert.Equal(t, Amount, res.Content)

 }

@ -953,7 +980,7 @@ func TestVerifyYob(t *testing.T) {
 	}
 }

-func TestVerifyCreatePin(t *testing.T) {
+func TestVerifyPin(t *testing.T) {
 	fm, err := NewFlagManager(flagsPath)

 	if err != nil {
@ -1002,7 +1029,7 @@ func TestVerifyCreatePin(t *testing.T) {
 		},
 	}

-	typ := utils.DATA_TEMPORARY_PIN
+	typ := utils.DATA_ACCOUNT_PIN

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@ -1010,11 +1037,8 @@ func TestVerifyCreatePin(t *testing.T) {
 			// Define expected interactions with the mock
 			mockDataStore.On("ReadEntry", ctx, sessionId, typ).Return([]byte(firstSetPin), nil)

-			// Set up the expected behavior of the mock
-			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_ACCOUNT_PIN, []byte(firstSetPin)).Return(nil)
-
 			// Call the method under test
-			res, err := h.VerifyCreatePin(ctx, "verify_create_pin", []byte(tt.input))
+			res, err := h.VerifyPin(ctx, "verify_pin", []byte(tt.input))

 			// Assert that no errors occurred
 			assert.NoError(t, err)
@ -1293,18 +1317,16 @@ func TestInitiateTransaction(t *testing.T) {
 		input          []byte
 		Recipient      []byte
 		Amount         []byte
-		ActiveSym      []byte
 		status         string
 		expectedResult resource.Result
 	}{
 		{
 			name:      "Test initiate transaction",
-			Amount:    []byte("0.002"),
-			ActiveSym: []byte("SRF"),
+			Amount:    []byte("0.002 CELO"),
 			Recipient: []byte("0x12415ass27192"),
 			expectedResult: resource.Result{
 				FlagReset: []uint32{account_authorized_flag},
-				Content:   "Your request has been sent. 0x12415ass27192 will receive 0.002 SRF from 254712345678.",
+				Content:   "Your request has been sent. 0x12415ass27192 will receive 0.002 CELO from 254712345678.",
 			},
 		},
 	}
@ -1313,7 +1335,6 @@ func TestInitiateTransaction(t *testing.T) {
 			// Define expected interactions with the mock
 			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_AMOUNT).Return(tt.Amount, nil)
 			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_RECIPIENT).Return(tt.Recipient, nil)
-			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_ACTIVE_SYM).Return(tt.ActiveSym, nil)

 			// Call the method under test
 			res, _ := h.InitiateTransaction(ctx, "transaction_reset_amount", tt.input)
@ -1443,6 +1464,7 @@ func TestValidateAmount(t *testing.T) {
 		t.Logf(err.Error())
 	}
 	flag_invalid_amount, _ := fm.parser.GetFlag("flag_invalid_amount")
+	flag_api_error, _ := fm.GetFlag("flag_api_call_error")
 	mockDataStore := new(mocks.MockUserDataStore)
 	mockCreateAccountService := new(mocks.MockAccountService)

@ -1458,33 +1480,66 @@ func TestValidateAmount(t *testing.T) {
 	tests := []struct {
 		name            string
 		input           []byte
-		activeBal      []byte
-		balance        string
+		publicKey       []byte
+		balanceResponse *models.BalanceResponse
 		expectedResult  resource.Result
 	}{
 		{
 			name:  "Test with valid amount",
-			input:     []byte("4.10"),
-			activeBal: []byte("5"),
+			input: []byte("0.001"),
+			balanceResponse: &models.BalanceResponse{
+				Ok: true,
+				Result: struct {
+					Balance string      `json:"balance"`
+					Nonce   json.Number `json:"nonce"`
+				}{
+					Balance: "0.003 CELO",
+					Nonce:   json.Number("0"),
+				},
+			},
+			publicKey: []byte("0xrqeqrequuq"),
 			expectedResult: resource.Result{
-				Content: "4.10",
+				Content:   "0.001",
+				FlagReset: []uint32{flag_api_error},
 			},
 		},
 		{
-			name:      "Test with amount larger than active balance",
-			input:     []byte("5.02"),
-			activeBal: []byte("5"),
+			name:  "Test with amount larger than balance",
+			input: []byte("0.02"),
+			balanceResponse: &models.BalanceResponse{
+				Ok: true,
+				Result: struct {
+					Balance string      `json:"balance"`
+					Nonce   json.Number `json:"nonce"`
+				}{
+					Balance: "0.003 CELO",
+					Nonce:   json.Number("0"),
+				},
+			},
+			publicKey: []byte("0xrqeqrequuq"),
 			expectedResult: resource.Result{
 				FlagSet:   []uint32{flag_invalid_amount},
-				Content: "5.02",
+				FlagReset: []uint32{flag_api_error},
+				Content:   "0.02",
 			},
 		},
 		{
-			name:    "Test with invalid amount format",
+			name:  "Test with invalid amount",
 			input: []byte("0.02ms"),
-			activeBal: []byte("5"),
+			balanceResponse: &models.BalanceResponse{
+				Ok: true,
+				Result: struct {
+					Balance string      `json:"balance"`
+					Nonce   json.Number `json:"nonce"`
+				}{
+					Balance: "0.003 CELO",
+					Nonce:   json.Number("0"),
+				},
+			},
+			publicKey: []byte("0xrqeqrequuq"),
 			expectedResult: resource.Result{
 				FlagSet:   []uint32{flag_invalid_amount},
+				FlagReset: []uint32{flag_api_error},
 				Content:   "0.02ms",
 			},
 		},
@ -1492,23 +1547,23 @@ func TestValidateAmount(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			// Mock behavior for active balance retrieval
-			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_ACTIVE_BAL).Return(tt.activeBal, nil)

-			// Mock behavior for storing the amount (if valid)
+			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return(tt.publicKey, nil)
+			mockCreateAccountService.On("CheckBalance", string(tt.publicKey)).Return(tt.balanceResponse, nil)
 			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_AMOUNT, tt.input).Return(nil).Maybe()

 			// Call the method under test
 			res, _ := h.ValidateAmount(ctx, "test_validate_amount", tt.input)

-			// Assert no errors occurred
+			// Assert that no errors occurred
 			assert.NoError(t, err)

-			// Assert the result matches the expected result
-			assert.Equal(t, tt.expectedResult, res, "Expected result should match actual result")
+			//Assert that the account created flag has been set to the result
+			assert.Equal(t, res, tt.expectedResult, "Expected result should be equal to the actual result")

-			// Assert all expectations were met
+			// Assert that expectations were met
 			mockDataStore.AssertExpectations(t)
+
 		})
 	}
 }
@ -1572,52 +1627,80 @@ func TestValidateRecipient(t *testing.T) {
 }

 func TestCheckBalance(t *testing.T) {
+	sessionId := "session123"
+	publicKey := "0X13242618721"
+	fm, _ := NewFlagManager(flagsPath)
+	flag_api_error, _ := fm.GetFlag("flag_api_call_error")
+
+	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
+
 	tests := []struct {
 		name           string
-		sessionId      string
-		publicKey      string
-		activeSym      string
-		activeBal      string
+		balanceResonse *models.BalanceResponse
 		expectedResult resource.Result
-		expectError    bool
 	}{
 		{
-			name:           "User with active sym",
-			sessionId:      "session456",
-			publicKey:      "0X98765432109",
-			activeSym:      "ETH",
-			activeBal:      "1.5",
-			expectedResult: resource.Result{Content: "Balance: 1.5 ETH\n"},
-			expectError:    false,
+			name: "Test when checking a balance is not a success",
+			balanceResonse: &models.BalanceResponse{
+				Ok: false,
+				Result: struct {
+					Balance string      `json:"balance"`
+					Nonce   json.Number `json:"nonce"`
+				}{
+					Balance: "0.003 CELO",
+					Nonce:   json.Number("0"),
+				},
+			},
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_api_error},
+			},
+		},
+		{
+			name: "Test when checking a balance is a success",
+			balanceResonse: &models.BalanceResponse{
+				Ok: true,
+				Result: struct {
+					Balance string      `json:"balance"`
+					Nonce   json.Number `json:"nonce"`
+				}{
+					Balance: "0.003 CELO",
+					Nonce:   json.Number("0"),
+				},
+			},
+			expectedResult: resource.Result{
+				Content:   "Balance: 0.003 CELO\n",
+				FlagReset: []uint32{flag_api_error},
+			},
 		},
 	}

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			mockDataStore := new(mocks.MockUserDataStore)
-			mockAccountService := new(mocks.MockAccountService)
-			ctx := context.WithValue(context.Background(), "SessionId", tt.sessionId)

+			mockDataStore := new(mocks.MockUserDataStore)
+			mockCreateAccountService := new(mocks.MockAccountService)
+			mockState := state.NewState(16)
+
+			// Create the Handlers instance with the mock store
 			h := &Handlers{
 				userdataStore:  mockDataStore,
-				accountService: mockAccountService,
+				flagManager:    fm.parser,
+				st:             mockState,
+				accountService: mockCreateAccountService,
 			}

-			// Mock for user with active sym
-			mockDataStore.On("ReadEntry", ctx, tt.sessionId, utils.DATA_ACTIVE_SYM).Return([]byte(tt.activeSym), nil)
-			mockDataStore.On("ReadEntry", ctx, tt.sessionId, utils.DATA_ACTIVE_BAL).Return([]byte(tt.activeBal), nil)
+			// Set up the expected behavior of the mock
+			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return([]byte(publicKey), nil)
+			mockCreateAccountService.On("CheckBalance", string(publicKey)).Return(tt.balanceResonse, nil)

-			res, err := h.CheckBalance(ctx, "check_balance", []byte(""))
-
-			if tt.expectError {
-				assert.Error(t, err)
-			} else {
-				assert.NoError(t, err)
-				assert.Equal(t, tt.expectedResult, res, "Result should match expected output")
-			}
+			// Call the method
+			res, _ := h.CheckBalance(ctx, "check_balance", []byte(""))

+			// Assert that expectations were met
 			mockDataStore.AssertExpectations(t)
-			mockAccountService.AssertExpectations(t)
+
+			//Assert that the result set to content is what was expected
+			assert.Equal(t, res, tt.expectedResult, "Result should contain flags set according to user input")
 		})
 	}
 }
@ -1761,6 +1844,42 @@ func TestVerifyNewPin(t *testing.T) {

 }

+func TestSaveTemporaryPIn(t *testing.T) {
+
+	fm, err := NewFlagManager(flagsPath)
+
+	if err != nil {
+		t.Logf(err.Error())
+	}
+
+	// Create a new instance of UserDataStore
+	mockStore := new(mocks.MockUserDataStore)
+
+	// Define test data
+	sessionId := "session123"
+	PIN := "1234"
+	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
+
+	// Set up the expected behavior of the mock
+	mockStore.On("WriteEntry", ctx, sessionId, utils.DATA_TEMPORARY_PIN, []byte(PIN)).Return(nil)
+
+	// Create the Handlers instance with the mock store
+	h := &Handlers{
+		userdataStore: mockStore,
+		flagManager:   fm.parser,
+	}
+
+	// Call the method
+	res, err := h.SaveTemporaryPin(ctx, "save_temporary_pin", []byte(PIN))
+
+	// Assert results
+	assert.NoError(t, err)
+	assert.Equal(t, resource.Result{}, res)
+
+	// Assert all expectations were met
+	mockStore.AssertExpectations(t)
+}
+
 func TestConfirmPin(t *testing.T) {
 	sessionId := "session123"

@ -1808,40 +1927,7 @@ func TestConfirmPin(t *testing.T) {

 		})
 	}
-}

-func TestSetVoucher(t *testing.T) {
-	mockDataStore := new(mocks.MockUserDataStore)
-
-	sessionId := "session123"
-	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
-
-	temporarySym := []byte("tempSym")
-	temporaryBal := []byte("tempBal")
-
-	// Set expectations for the mock data store
-	mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_TEMPORARY_SYM).Return(temporarySym, nil)
-	mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_TEMPORARY_BAL).Return(temporaryBal, nil)
-	mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_ACTIVE_SYM, temporarySym).Return(nil)
-	mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_ACTIVE_BAL, temporaryBal).Return(nil)
-	mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_TEMPORARY_SYM, []byte("")).Return(nil)
-	mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_TEMPORARY_BAL, []byte("")).Return(nil)
-
-	h := &Handlers{
-		userdataStore: mockDataStore,
-	}
-
-	// Call the method under test
-	res, err := h.SetVoucher(ctx, "someSym", []byte{})
-
-	// Assert that no errors occurred
-	assert.NoError(t, err)
-
-	// Assert that the result content is correct
-	assert.Equal(t, string(temporarySym), res.Content)
-
-	// Assert that expectations were met
-	mockDataStore.AssertExpectations(t)
 }

 func TestFetchCustodialBalances(t *testing.T) {
--- a/internal/mocks/servicemock.go
+++ b/internal/mocks/servicemock.go
@ -32,9 +32,3 @@ func (m *MockAccountService) TrackAccountStatus(ctx context.Context,publicKey st
 	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)
-}
--- a/internal/models/tokenresponse.go
+++ b/internal/models/tokenresponse.go
@ -1,18 +0,0 @@
-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"`
-}
--- a/internal/models/vouchersresponse.go
+++ b/internal/models/vouchersresponse.go
@ -1,15 +0,0 @@
-package models
-
-// VoucherHoldingResponse represents a single voucher holding
-type VoucherHoldingResponse struct {
-	Ok          bool   `json:"ok"`
-	Description string `json:"description"`
-	Result      struct {
-		Holdings []struct {
-			ContractAddress string `json:"contractAddress"`
-			TokenSymbol     string `json:"tokenSymbol"`
-			TokenDecimals   string `json:"tokenDecimals"`
-			Balance         string `json:"balance"`
-		} `json:"holdings"`
-	} `json:"result"`
-}
--- a/internal/storage/db.go
+++ b/internal/storage/db.go
@ -22,11 +22,11 @@ func NewSubPrefixDb(store db.Db, pfx []byte) *SubPrefixDb {
 	}
 }

-func (s *SubPrefixDb) toKey(k []byte) []byte {
+func(s *SubPrefixDb) toKey(k []byte) []byte {
        return append(s.pfx, k...)
 }

-func (s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
+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)
@ -36,7 +36,7 @@ func (s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
        return v, nil
 }

-func (s *SubPrefixDb) Put(ctx context.Context, key []byte, val []byte) error {
+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)
--- a/internal/utils/db.go
+++ b/internal/utils/db.go
@ -23,11 +23,6 @@ const (
 	DATA_RECIPIENT
 	DATA_AMOUNT
 	DATA_TEMPORARY_PIN
-	DATA_VOUCHER_LIST
-	DATA_TEMPORARY_SYM
-	DATA_ACTIVE_SYM
-	DATA_TEMPORARY_BAL
-	DATA_ACTIVE_BAL
 )

 func typToBytes(typ DataTyp) []byte {
--- a/menutraversal_test/group_test.json
+++ b/menutraversal_test/group_test.json
@ -5,7 +5,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@ -33,7 +33,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@ -42,7 +42,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@ -70,7 +70,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@ -79,7 +79,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@ -116,7 +116,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@ -125,7 +125,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@ -162,7 +162,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@ -171,7 +171,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@ -203,7 +203,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@ -212,7 +212,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@ -244,7 +244,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
               
            ]
@ -254,7 +254,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@ -286,7 +286,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@ -295,7 +295,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@ -327,7 +327,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@ -336,7 +336,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@ -368,7 +368,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@ -377,7 +377,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@ -409,7 +409,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@ -418,7 +418,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@ -446,7 +446,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        }
--- a/menutraversal_test/menu_traversal_test.go
+++ b/menutraversal_test/menu_traversal_test.go
@ -43,39 +43,6 @@ func extractPublicKey(response []byte) string {
 	return ""
 }

-// Extracts the balance value from the engine response.
-func extractBalance(response []byte) string {
-	// Regex to match "Balance: <amount> <symbol>" followed by a newline
-	re := regexp.MustCompile(`(?m)^Balance:\s+(\d+(\.\d+)?)\s+([A-Z]+)`)
-	match := re.FindSubmatch(response)
-	if match != nil {
-		return string(match[1]) + " " + string(match[3]) // "<amount> <symbol>"
-	}
-	return ""
-}
-
-// Extracts the Maximum amount value from the engine response.
-func extractMaxAmount(response []byte) string {
-	// Regex to match "Maximum amount: <amount>" followed by a newline
-	re := regexp.MustCompile(`(?m)^Maximum amount:\s+(\d+(\.\d+)?)`)
-	match := re.FindSubmatch(response)
-	if match != nil {
-		return string(match[1]) // "<amount>"
-	}
-	return ""
-}
-
-// Extracts the send amount value from the engine response.
-func extractSendAmount(response []byte) string {
-	// Regex to match the pattern "will receive X.XX SYM from"
-	re := regexp.MustCompile(`will receive (\d+\.\d{2}\s+[A-Z]+) from`)
-	match := re.FindSubmatch(response)
-	if match != nil {
-		return string(match[1]) // Returns "X.XX SYM"
-	}
-	return ""
-}
-
 func TestMain(m *testing.M) {
 	sessionID = GenerateSessionId()
 	defer func() {
@ -187,12 +154,6 @@ func TestMainMenuHelp(t *testing.T) {
 				}

 				b := w.Bytes()
-				balance := extractBalance(b)
-
-				expectedContent := []byte(step.ExpectedContent)
-				expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
-
-				step.ExpectedContent = string(expectedContent)
 				match, err := step.MatchesExpectedContent(b)
 				if err != nil {
 					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
@ -228,12 +189,6 @@ func TestMainMenuQuit(t *testing.T) {
 				}

 				b := w.Bytes()
-				balance := extractBalance(b)
-
-				expectedContent := []byte(step.ExpectedContent)
-				expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
-
-				step.ExpectedContent = string(expectedContent)
 				match, err := step.MatchesExpectedContent(b)
 				if err != nil {
 					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
@ -270,13 +225,8 @@ func TestMyAccount_MyAddress(t *testing.T) {
 				}
 				b := w.Bytes()

-				balance := extractBalance(b)
 				publicKey := extractPublicKey(b)
-
-				expectedContent := []byte(step.ExpectedContent)
-				expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
-				expectedContent = bytes.Replace(expectedContent, []byte("{public_key}"), []byte(publicKey), -1)
-
+				expectedContent := bytes.Replace([]byte(step.ExpectedContent), []byte("{public_key}"), []byte(publicKey), -1)
 				step.ExpectedContent = string(expectedContent)
 				match, err := step.MatchesExpectedContent(b)
 				if err != nil {
@ -290,52 +240,6 @@ func TestMyAccount_MyAddress(t *testing.T) {
 	}
 }

-func TestMainMenuSend(t *testing.T) {
-	en, fn, _ := testutil.TestEngine(sessionID)
-	defer fn()
-	ctx := context.Background()
-	sessions := testData
-	for _, session := range sessions {
-		groups := driver.FilterGroupsByName(session.Groups, "send_with_invalid_inputs")
-		for _, group := range groups {
-			for _, step := range group.Steps {
-				cont, err := en.Exec(ctx, []byte(step.Input))
-				if err != nil {
-					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
-					return
-				}
-				if !cont {
-					break
-				}
-				w := bytes.NewBuffer(nil)
-				if _, err := en.Flush(ctx, w); err != nil {
-					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
-				}
-
-				b := w.Bytes()
-				balance := extractBalance(b)
-				max_amount := extractMaxAmount(b)
-				send_amount := extractSendAmount(b)
-
-				expectedContent := []byte(step.ExpectedContent)
-				expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
-				expectedContent = bytes.Replace(expectedContent, []byte("{max_amount}"), []byte(max_amount), -1)
-				expectedContent = bytes.Replace(expectedContent, []byte("{send_amount}"), []byte(send_amount), -1)
-				expectedContent = bytes.Replace(expectedContent, []byte("{session_id}"), []byte(sessionID), -1)
-
-				step.ExpectedContent = string(expectedContent)
-				match, err := step.MatchesExpectedContent(b)
-				if err != nil {
-					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
-				}
-				if !match {
-					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
-				}
-			}
-		}
-	}
-}
-
 func TestGroups(t *testing.T) {
 	groups, err := driver.LoadTestGroups(groupTestFile)
 	if err != nil {
@ -361,13 +265,6 @@ func TestGroups(t *testing.T) {
 				t.Errorf("Test case '%s' failed during Flush: %v", tt.Name, err)
 			}
 			b := w.Bytes()
-			balance := extractBalance(b)
-
-			expectedContent := []byte(tt.ExpectedContent)
-			expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
-
-			tt.ExpectedContent = string(expectedContent)
-
 			match, err := tt.MatchesExpectedContent(b)
 			if err != nil {
 				t.Fatalf("Error compiling regex for step '%s': %v", tt.Input, err)
@ -375,6 +272,7 @@ func TestGroups(t *testing.T) {
 			if !match {
 				t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", tt.ExpectedContent, b)
 			}
+
 		})
 	}
 }
--- a/menutraversal_test/test_setup.json
+++ b/menutraversal_test/test_setup.json
@ -57,7 +57,7 @@
                "steps": [
                    {
                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                        "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                    },
                    {
                        "input": "1",
@ -73,19 +73,19 @@
                    },
                    {
                        "input": "065656",
-                        "expectedContent": "{max_amount}\nEnter amount:\n0:Back"
+                        "expectedContent": "Maximum amount: 0.003 CELO\nEnter amount:\n0:Back"
                    },
                    {
-                        "input": "10000000",
-                        "expectedContent": "Amount 10000000 is invalid, please try again:\n1:retry\n9:Quit"
+                        "input": "0.1",
+                        "expectedContent": "Amount 0.1 is invalid, please try again:\n1:retry\n9:Quit"
                    },
                    {
                        "input": "1",
-                        "expectedContent": "{max_amount}\nEnter amount:\n0:Back"
+                        "expectedContent": "Maximum amount: 0.003 CELO\nEnter amount:\n0:Back"
                    },
                    {
-                        "input": "1.00",
-                        "expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
+                        "input": "0.001",
+                        "expectedContent": "065656 will receive 0.001 from {public_key}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
                    },
                    {
                        "input": "1222",
@ -93,11 +93,11 @@
                    },
                    {
                        "input": "1",
-                        "expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
+                        "expectedContent": "065656 will receive 0.001 from {public_key}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
                    },
                    {
                        "input": "1234",
-                        "expectedContent": "Your request has been sent. 065656 will receive {send_amount} from {session_id}."
+                        "expectedContent": "Your request has been sent. 065656 will receive 0.001 from {public_key}."
                    }
                ]
            },
@ -106,7 +106,7 @@
                "steps": [
                    {
                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                        "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                    },
                    {
                        "input": "4",
@ -119,7 +119,7 @@
                "steps": [
                    {
                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                        "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                    },
                    {
                        "input": "9",
@ -132,7 +132,7 @@
                "steps": [
                    {
                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                        "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                    },
                    {
                        "input": "3",
--- a/sample_tokens.json
+++ b/sample_tokens.json
@ -1,44 +0,0 @@
-{
-    "ok": true,
-    "description": "Token holdings with current balances",
-    "result": {
-      "holdings": [
-        {
-          "contractAddress": "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
-          "tokenSymbol": "FSPTST",
-          "tokenDecimals": "6",
-          "balance": "8869964242"
-        },
-        {
-          "contractAddress": "0x724F2910D790B54A39a7638282a45B1D83564fFA",
-          "tokenSymbol": "GEO",
-          "tokenDecimals": "6",
-          "balance": "9884"
-        },
-        {
-          "contractAddress": "0x2105a206B7bec31E2F90acF7385cc8F7F5f9D273",
-          "tokenSymbol": "MFNK",
-          "tokenDecimals": "6",
-          "balance": "19788697"
-        },
-        {
-          "contractAddress": "0x63DE2Ac8D1008351Cc69Fb8aCb94Ba47728a7E83",
-          "tokenSymbol": "MILO",
-          "tokenDecimals": "6",
-          "balance": "75"
-        },
-        {
-          "contractAddress": "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
-          "tokenSymbol": "SOHAIL",
-          "tokenDecimals": "6",
-          "balance": "27874115"
-        },
-        {
-          "contractAddress": "0x45d747172e77d55575c197CbA9451bC2CD8F4958",
-          "tokenSymbol": "SRF",
-          "tokenDecimals": "6",
-          "balance": "2745987"
-        }
-      ]
-    }
-  }
--- a/services/registration/account_creation.vis
+++ b/services/registration/account_creation.vis
@ -1,4 +1,4 @@
-RELOAD verify_create_pin
+RELOAD verify_pin
 CATCH create_pin_mismatch flag_pin_mismatch 1
 LOAD quit 0
 HALT
--- a/services/registration/amount.vis
+++ b/services/registration/amount.vis
@ -1,6 +1,5 @@
 LOAD reset_transaction_amount 0
 LOAD max_amount 10
-RELOAD max_amount
 MAP max_amount
 MOUT back 0
 HALT
@ -11,5 +10,5 @@ CATCH invalid_amount flag_invalid_amount 1
 INCMP _ 0
 LOAD get_recipient 12
 LOAD get_sender 64
-LOAD get_amount 32
+LOAD get_amount 12
 INCMP transaction_pin *
--- a/services/registration/confirm_create_pin.vis
+++ b/services/registration/confirm_create_pin.vis
@ -1,4 +1,4 @@
-LOAD save_temporary_pin 6
+LOAD save_pin 0
 HALT
-LOAD verify_create_pin 8
+LOAD verify_pin 8
 INCMP account_creation *
--- a/services/registration/create_pin.vis
+++ b/services/registration/create_pin.vis
@ -2,8 +2,8 @@ LOAD create_account 0
 CATCH account_creation_failed flag_account_creation_failed 1
 MOUT exit 0
 HALT
-LOAD save_temporary_pin 6
-RELOAD save_temporary_pin
+LOAD save_pin 0
+RELOAD save_pin
 CATCH . flag_incorrect_pin 1
 INCMP quit 0
 INCMP confirm_create_pin *
--- a/services/registration/locale/swa/default.po
+++ b/services/registration/locale/swa/default.po
@ -1,8 +1,8 @@
 msgid "Your account balance is %s"
 msgstr "Salio lako ni %s"

-msgid "Your request has been sent. %s will receive %s %s from %s."
-msgstr "Ombi lako limetumwa. %s atapokea %s %s kutoka kwa %s."
+msgid "Your request has been sent. %s will receive %s from %s."
+msgstr "Ombi lako limetumwa. %s atapokea %s kutoka kwa %s."

 msgid "Thank you for using Sarafu. Goodbye!"
 msgstr "Asante kwa kutumia huduma ya Sarafu. Kwaheri!"
--- a/services/registration/main.vis
+++ b/services/registration/main.vis
@ -1,9 +1,5 @@
-LOAD set_default_voucher 8
-RELOAD set_default_voucher
 LOAD check_balance 64
 RELOAD check_balance
-LOAD check_vouchers 10
-RELOAD check_vouchers
 CATCH api_failure  flag_api_call_error  1
 MAP check_balance
 MOUT send 1
@ -13,7 +9,7 @@ MOUT help 4
 MOUT quit 9
 HALT
 INCMP send 1
-INCMP my_vouchers 2
+INCMP quit 2
 INCMP my_account 3
 INCMP help 4
 INCMP quit 9
--- a/services/registration/my_vouchers
+++ b/services/registration/my_vouchers
@ -1 +0,0 @@
-My vouchers
--- a/services/registration/my_vouchers.vis
+++ b/services/registration/my_vouchers.vis
@ -1,8 +0,0 @@
-LOAD reset_account_authorized 16
-RELOAD reset_account_authorized
-MOUT select_voucher 1
-MOUT voucher_details 2
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP select_voucher 1
--- a/services/registration/no_voucher
+++ b/services/registration/no_voucher
@ -1 +0,0 @@
-You need a voucher to send
--- a/services/registration/no_voucher.vis
+++ b/services/registration/no_voucher.vis
@ -1,5 +0,0 @@
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP ^ 0
-INCMP quit 9
--- a/services/registration/no_voucher_swa
+++ b/services/registration/no_voucher_swa
@ -1 +0,0 @@
-Unahitaji sarafu kutuma
--- a/services/registration/pp.csv
+++ b/services/registration/pp.csv
@ -14,6 +14,4 @@ flag,flag_valid_pin,20,this is set when the given PIN is valid
 flag,flag_allow_update,21,this is set to allow a user to update their profile data
 flag,flag_single_edit,22,this is set to allow a user to edit a single profile item such as year of birth
 flag,flag_incorrect_date_format,23,this is set when the given year of birth is invalid
-flag,flag_incorrect_voucher,24,this is set when the selected voucher is invalid
 flag,flag_api_call_error,25,this is set when communication  to an external service fails
-flag,flag_no_active_voucher,26,this is set when a user does not have an active voucher
--- a/services/registration/select_voucher
+++ b/services/registration/select_voucher
@ -1,2 +0,0 @@
-Select number or symbol from your vouchers:
-{{.get_vouchers}}
--- a/services/registration/select_voucher.vis
+++ b/services/registration/select_voucher.vis
@ -1,15 +0,0 @@
-LOAD get_vouchers 0
-MAP get_vouchers
-MOUT back 0
-MOUT quit 99
-MNEXT next 11
-MPREV prev 22
-HALT
-LOAD view_voucher 80
-RELOAD view_voucher
-CATCH . flag_incorrect_voucher 1
-INCMP _ 0
-INCMP quit 99
-INCMP > 11
-INCMP < 22
-INCMP view_voucher *
--- a/services/registration/select_voucher_menu
+++ b/services/registration/select_voucher_menu
@ -1 +0,0 @@
-Select voucher
--- a/services/registration/select_voucher_swa
+++ b/services/registration/select_voucher_swa
@ -1,2 +0,0 @@
-Chagua nambari au ishara kutoka kwa salio zako:
-{{.get_vouchers}}
--- a/services/registration/send.vis
+++ b/services/registration/send.vis
@ -1,5 +1,4 @@
 LOAD transaction_reset 0
-CATCH no_voucher flag_no_active_voucher 1
 MOUT back 0
 HALT
 LOAD validate_recipient 20
--- a/services/registration/view_voucher
+++ b/services/registration/view_voucher
@ -1,2 +0,0 @@
-Enter PIN to confirm selection:
-{{.view_voucher}}
--- a/services/registration/view_voucher.vis
+++ b/services/registration/view_voucher.vis
@ -1,10 +0,0 @@
-MAP view_voucher
-MOUT back 0
-MOUT quit 9
-LOAD authorize_account 6
-HALT
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-INCMP _ 0
-INCMP quit 9
-INCMP voucher_set *
--- a/services/registration/view_voucher_swa
+++ b/services/registration/view_voucher_swa
@ -1,2 +0,0 @@
-Weka PIN ili kuthibitisha chaguo:
-{{.view_voucher}}
--- a/services/registration/voucher_details_menu
+++ b/services/registration/voucher_details_menu
@ -1 +0,0 @@
-Voucher details
--- a/services/registration/voucher_set
+++ b/services/registration/voucher_set
@ -1 +0,0 @@
-Success! {{.set_voucher}} is now your active voucher.
--- a/services/registration/voucher_set.vis
+++ b/services/registration/voucher_set.vis
@ -1,10 +0,0 @@
-LOAD reset_incorrect 6
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH _ flag_account_authorized 0
-LOAD set_voucher 12
-MAP set_voucher
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP ^ 0
-INCMP quit 9
--- a/services/registration/voucher_set_swa
+++ b/services/registration/voucher_set_swa
@ -1 +0,0 @@
-Hongera! {{.set_voucher}} ni Sarafu inayotumika sasa.
				`@ -1 +0,0 @@`
				`Success! {{.set_voucher}} is now your active voucher.`
				`@ -1 +0,0 @@`
				`Hongera! {{.set_voucher}} ni Sarafu inayotumika sasa.`