use latest commit from sarafu-api

Merge pull request 'self pin reset' (#49 ) from self-pin-reset-node into master
Reviewed-on: #49
2025-04-11 11:10:48 +03:00 · 2025-04-11 09:26:11 +02:00 · 2025-04-11 10:25:35 +03:00 · 2025-04-11 09:24:35 +02:00 · 2025-04-10 13:55:00 +03:00 · 2025-04-09 23:43:10 +03:00
89 changed files with 2142 additions and 656 deletions
--- a/5
+++ b/5
@ -21,8 +21,7 @@ RUN make VISE_PATH=/build/go-vise -B
 WORKDIR /build/sarafu-vise
 RUN echo "Building on $BUILDPLATFORM, building for $TARGETPLATFORM"
 RUN go mod download
-RUN go build -tags logtrace,online -o sarafu-at -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
-RUN go build -tags logtrace,online -o sarafu-ssh -ldflags="-X main.build=${BUILD} -s -w" cmd/ssh/main.go
+RUN go build -tags logdebug,online -o sarafu-at -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go

 FROM debian:bookworm-slim

@ -37,7 +36,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 WORKDIR /service

 COPY --from=build /build/sarafu-vise/sarafu-at .
-COPY --from=build /build/sarafu-vise/sarafu-ssh .
 COPY --from=build /build/sarafu-vise/LICENSE .
 COPY --from=build /build/sarafu-vise/README.md .
 COPY --from=build /build/sarafu-vise/services ./services
@ -45,6 +43,5 @@ COPY --from=build /build/sarafu-vise/.env.example .
 RUN mv .env.example .env

 EXPOSE 7123
-EXPOSE 7122

 CMD ["./sarafu-at"]
--- a/cmd/africastalking/main.go
+++ b/cmd/africastalking/main.go
@ -81,6 +81,7 @@ func main() {
 		OutputSize:    uint32(size),
 		FlagCount:     uint32(128),
 		MenuSeparator: menuSeparator,
+		ResetOnEmptyInput: true,
 	}

 	if engineDebug {
@ -133,6 +134,7 @@ func main() {

 	rp := &at.ATRequestParser{}
 	bsh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl)
+	bsh = bsh.WithEngineFunc(lhs.GetEngine)
 	sh := at.NewATRequestHandler(bsh)

 	mux := http.NewServeMux()
--- a/cmd/async/main.go
+++ b/cmd/async/main.go
@ -1,12 +1,15 @@
 package main

 import (
+	"bufio"
 	"context"
 	"flag"
 	"fmt"
+	"io"
 	"os"
 	"os/signal"
 	"path"
+	"strings"
 	"syscall"

 	"git.defalsify.org/vise.git/engine"
@ -93,6 +96,7 @@ func main() {
 		OutputSize:    uint32(size),
 		FlagCount:     uint32(128),
 		MenuSeparator: menuSeparator,
+		ResetOnEmptyInput: true,
 	}

 	if engineDebug {
@ -127,7 +131,6 @@ func main() {
 	lhs.SetDataStore(&userdataStore)

 	accountService := services.New(ctx, menuStorageService)
-
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
@ -145,6 +148,8 @@ func main() {
 		sessionId: sessionId,
 	}
 	sh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl)
+	sh = sh.WithEngineFunc(lhs.GetEngine)
+
 	cfg.SessionId = sessionId
 	rqs := request.RequestSession{
 		Ctx:    ctx,
@ -184,11 +189,19 @@ func main() {
 			os.Exit(1)
 		}
 		fmt.Println("")
-		_, err = fmt.Scanln(&rqs.Input)
+		in := bufio.NewReader(os.Stdin)
+		s, err := in.ReadString('\n')
 		if err != nil {
+			if err == io.EOF {
+				logg.DebugCtxf(ctx, "have EOF, bailing")
+				break
+			}
 			logg.ErrorCtxf(ctx, "error in input", "err", err)
 			fmt.Errorf("error in input: %v", err)
 			os.Exit(1)
 		}
+		rqs.Input = []byte{}
+		s = strings.TrimSpace(s)
+		rqs.Input = []byte(s)
 	}
 }
--- a/cmd/http/main.go
+++ b/cmd/http/main.go
@ -82,6 +82,7 @@ func main() {
 		OutputSize:    uint32(size),
 		FlagCount:     uint32(128),
 		MenuSeparator: menuSeparator,
+		ResetOnEmptyInput: true,
 	}

 	if engineDebug {
@ -133,6 +134,7 @@ func main() {

 	rp := &httprequest.DefaultRequestParser{}
 	bsh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl)
+	bsh = bsh.WithEngineFunc(lhs.GetEngine)
 	sh := httprequest.NewHTTPRequestHandler(bsh)
 	s := &http.Server{
 		Addr:    fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
--- a/cmd/main.go
+++ b/cmd/main.go
@ -62,7 +62,6 @@ func main() {
 	}

 	ctx := context.Background()
-	ctx = context.WithValue(ctx, "SessionId", sessionId)

 	ln, err := lang.LanguageFromCode(config.Language())
 	if err != nil {
@ -74,11 +73,13 @@ func main() {
 	pfp := path.Join(scriptDir, "pp.csv")

 	cfg := engine.Config{
-		Root:          "root",
-		SessionId:     sessionId,
-		OutputSize:    uint32(size),
-		FlagCount:     uint32(128),
-		MenuSeparator: menuSeparator,
+		Root:              "root",
+		SessionId:         sessionId,
+		OutputSize:        uint32(size),
+		FlagCount:         uint32(128),
+		MenuSeparator:     menuSeparator,
+		EngineDebug:       engineDebug,
+		ResetOnEmptyInput: true,
 	}

 	menuStorageService := storage.NewMenuStorageService(conns)
@ -124,17 +125,12 @@ func main() {
 	}

 	accountService := services.New(ctx, menuStorageService)
-	hl, err := lhs.GetHandler(accountService)
+	_, err = lhs.GetHandler(accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "get accounts service handler: %v\n", err)
 		os.Exit(1)
 	}
-
-	en := lhs.GetEngine()
-	en = en.WithFirst(hl.Init)
-	if engineDebug {
-		en = en.WithDebug(nil)
-	}
+	en := lhs.GetEngine(cfg, rs, pe)

 	cint := make(chan os.Signal)
 	cterm := make(chan os.Signal)
--- a/cmd/ssh/main.go
+++ b/cmd/ssh/main.go
@ -84,6 +84,7 @@ func main() {
 		Root:       "root",
 		OutputSize: uint32(size),
 		FlagCount:  uint32(128),
+		ResetOnEmptyInput: true,
 	}
 	if stateDebug {
 		cfg.StateDebug = true
--- a/devtools/admin/main.go
+++ b/devtools/admin/main.go
@ -42,7 +42,6 @@ func main() {
 	}

 	ctx := context.Background()
-	ctx = context.WithValue(ctx, "SessionId", sessionId)

 	pfp := path.Join(scriptDir, "pp.csv")
 	flagParser, err := application.NewFlagManager(pfp)
--- a/go.mod
+++ b/go.mod
@ -3,10 +3,10 @@ module git.grassecon.net/grassrootseconomics/sarafu-vise
 go 1.23.4

 require (
-	git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9
+	git.defalsify.org/vise.git v0.3.2-0.20250401123711-d481b04a6805
 	git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d
-	git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250123142805-2181388f5bf1
-	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250124100946-03d19283f6fa
+	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250411080608-34957e5b6ff8
+	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2
 	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694
 	github.com/alecthomas/assert/v2 v2.2.2
 	github.com/gofrs/uuid v4.4.0+incompatible
--- a/go.sum
+++ b/go.sum
@ -1,15 +1,21 @@
-git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9 h1:sPcqXQcywxA8W3W+9qQncLPmsrgqTIlec7vmD4/7vyA=
-git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.3.1 h1:A6FhMcur09ft/JzUPGXR+KpA17fltfeBnasyvLMZmq4=
+git.defalsify.org/vise.git v0.3.1/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.3.2-0.20250401123711-d481b04a6805 h1:FnT39aqXcP5YWhwPDBABopSjCu2SlbPFoOVitSpAVxU=
+git.defalsify.org/vise.git v0.3.2-0.20250401123711-d481b04a6805/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
 git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d h1:5mzLas+jxTUtusOKx4XvU+n2QvrV/mH17MnJRy46siQ=
 git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250123142805-2181388f5bf1 h1:BJHfokTHzrw9QjQ+4s2HmSER0iBPuE7byW5oQC2zLIQ=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250123142805-2181388f5bf1/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
-git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250124100946-03d19283f6fa h1:yQLKwby3eD/zNjNw/INU5lGiLuWPEHdsgASwMA4UptE=
-git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250124100946-03d19283f6fa/go.mod h1:pjKp9L/ZsWW3kMB0UoIl1yv9TBIuU33mn9Aghxp7vGk=
-git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121135340-ca97e23e8c84 h1:VoBmqsjlRdz+IPbtKsAkc1IrMepjR+QlesZT31Jokrk=
-git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121135340-ca97e23e8c84/go.mod h1:DpibtYpnT3nG4Kn556hRAkdu4+CtiI/6MbnQHal51mQ=
-git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121153115-bfb16bd5a57a h1:jyS1Q8ktEGnH8R5ne/1GN7SyuDPtEGTrGtC8Px3fVJc=
-git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121153115-bfb16bd5a57a/go.mod h1:DpibtYpnT3nG4Kn556hRAkdu4+CtiI/6MbnQHal51mQ=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310093912-8145b4bd004b h1:xiTpaqWWoF5qcnarY/9ZkT6aVdnKwqztb2gzIahJn4w=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310093912-8145b4bd004b/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401111804-2eed990921c5 h1:DwBZHP4sebfHxK8EU2nlA2CXU81+a7Kj/pnC5vDPcf4=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401111804-2eed990921c5/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401115503-5b41c8dc6440 h1:eWrBZMM3pBMCFyRl4rO/aaR+OmOMFJxogNyFAFry+EM=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401115503-5b41c8dc6440/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401122510-441e289854ad h1:tYjanaCf6mF+iXRtDx5gckQm5vhZYx9N/JlNIBZj1m0=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401122510-441e289854ad/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250411080608-34957e5b6ff8 h1:Emesd0rybSLhPwZwqdvLsk/P9ZsT+7CQwQV/mrjQp3o=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250411080608-34957e5b6ff8/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2 h1:YFztSsexCUgFo6M0tbngRwYdgJd3LQV3RO/Jw09u3+k=
+git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2/go.mod h1:6B6ByxXOiRY0NR7K02Bf3fEu7z+2c/6q8PFVNjC5G8w=
 git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 h1:DjJlBSz0S13acft5XZDWk7ZYnzElym0xLMYEVgyNJ+E=
 git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694/go.mod h1:DpibtYpnT3nG4Kn556hRAkdu4+CtiI/6MbnQHal51mQ=
 github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
--- a/handlers/application/menuhandler.go
+++ b/handlers/application/menuhandler.go
--- a/handlers/application/menuhandler_test.go
+++ b/handlers/application/menuhandler_test.go
--- a/handlers/event/token.go
+++ b/handlers/event/token.go
@ -49,9 +49,8 @@ func (eu *EventsUpdater) updateToken(ctx context.Context, identity identity.Iden

 // set default token to given symbol.
 func (eu *EventsUpdater) updateDefaultToken(ctx context.Context, identity identity.Identity, userStore *store.UserDataStore, activeSym string) error {
-	pfxDb := toPrefixDb(userStore, identity.SessionId)
 	// TODO: the activeSym input should instead be newline separated list?
-	tokenData, err := store.GetVoucherData(ctx, pfxDb, activeSym)
+	tokenData, err := store.GetVoucherData(ctx, userStore, identity.SessionId, activeSym)
 	if err != nil {
 		return err
 	}
--- a/handlers/local.go
+++ b/handlers/local.go
@ -6,6 +6,7 @@ import (

 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/engine"
+	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"

@ -13,6 +14,10 @@ import (
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
 )

+var (
+	logg = logging.NewVanilla().WithDomain("sarafu-vise.engine")
+)
+
 type HandlerService interface {
 	GetHandler() (*application.MenuHandlers, error)
 }
@ -24,6 +29,7 @@ type LocalHandlerService struct {
 	UserdataStore *db.Db
 	Cfg           engine.Config
 	Rs            resource.Resource
+	first         resource.EntryFunc
 }

 func NewLocalHandlerService(ctx context.Context, fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) {
@ -60,7 +66,6 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	if err != nil {
 		return nil, err
 	}
-	//appHandlers = appHandlers.WithPersister(ls.Pe)
 	appHandlers.SetPersister(ls.Pe)
 	ls.DbRs.AddLocalFunc("check_blocked_status", appHandlers.CheckBlockedStatus)
 	ls.DbRs.AddLocalFunc("set_language", appHandlers.SetLanguage)
@ -94,23 +99,18 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("verify_yob", appHandlers.VerifyYob)
 	ls.DbRs.AddLocalFunc("reset_incorrect_date_format", appHandlers.ResetIncorrectYob)
 	ls.DbRs.AddLocalFunc("initiate_transaction", appHandlers.InitiateTransaction)
-	ls.DbRs.AddLocalFunc("verify_new_pin", appHandlers.VerifyNewPin)
 	ls.DbRs.AddLocalFunc("confirm_pin_change", appHandlers.ConfirmPinChange)
 	ls.DbRs.AddLocalFunc("quit_with_help", appHandlers.QuitWithHelp)
 	ls.DbRs.AddLocalFunc("fetch_community_balance", appHandlers.FetchCommunityBalance)
-	ls.DbRs.AddLocalFunc("set_default_voucher", appHandlers.SetDefaultVoucher)
-	ls.DbRs.AddLocalFunc("check_vouchers", appHandlers.CheckVouchers)
+	ls.DbRs.AddLocalFunc("manage_vouchers", appHandlers.ManageVouchers)
 	ls.DbRs.AddLocalFunc("get_vouchers", appHandlers.GetVoucherList)
 	ls.DbRs.AddLocalFunc("view_voucher", appHandlers.ViewVoucher)
 	ls.DbRs.AddLocalFunc("set_voucher", appHandlers.SetVoucher)
 	ls.DbRs.AddLocalFunc("get_voucher_details", appHandlers.GetVoucherDetails)
-	ls.DbRs.AddLocalFunc("reset_valid_pin", appHandlers.ResetValidPin)
-	ls.DbRs.AddLocalFunc("check_pin_mismatch", appHandlers.CheckBlockedNumPinMisMatch)
 	ls.DbRs.AddLocalFunc("validate_blocked_number", appHandlers.ValidateBlockedNumber)
 	ls.DbRs.AddLocalFunc("retrieve_blocked_number", appHandlers.RetrieveBlockedNumber)
 	ls.DbRs.AddLocalFunc("reset_unregistered_number", appHandlers.ResetUnregisteredNumber)
 	ls.DbRs.AddLocalFunc("reset_others_pin", appHandlers.ResetOthersPin)
-	ls.DbRs.AddLocalFunc("save_others_temporary_pin", appHandlers.SaveOthersTemporaryPin)
 	ls.DbRs.AddLocalFunc("get_current_profile_info", appHandlers.GetCurrentProfileInfo)
 	ls.DbRs.AddLocalFunc("check_transactions", appHandlers.CheckTransactions)
 	ls.DbRs.AddLocalFunc("get_transactions", appHandlers.GetTransactionsList)
@ -118,13 +118,26 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("update_all_profile_items", appHandlers.UpdateAllProfileItems)
 	ls.DbRs.AddLocalFunc("set_back", appHandlers.SetBack)
 	ls.DbRs.AddLocalFunc("show_blocked_account", appHandlers.ShowBlockedAccount)
+	ls.DbRs.AddLocalFunc("clear_temporary_value", appHandlers.ClearTemporaryValue)
+	ls.DbRs.AddLocalFunc("reset_invalid_pin", appHandlers.ResetInvalidPIN)
+	ls.DbRs.AddLocalFunc("request_custom_alias", appHandlers.RequestCustomAlias)
+	ls.DbRs.AddLocalFunc("get_suggested_alias", appHandlers.GetSuggestedAlias)
+	ls.DbRs.AddLocalFunc("confirm_new_alias", appHandlers.ConfirmNewAlias)
+	ls.DbRs.AddLocalFunc("check_account_created", appHandlers.CheckAccountCreated)
+
+	ls.first = appHandlers.Init

 	return appHandlers, nil
 }

-// TODO: enable setting of sessionId on engine init time
-func (ls *LocalHandlerService) GetEngine() *engine.DefaultEngine {
-	en := engine.NewEngine(ls.Cfg, ls.Rs)
-	en = en.WithPersister(ls.Pe)
+func (ls *LocalHandlerService) GetEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine {
+	en := engine.NewEngine(cfg, rs)
+	if ls.first != nil {
+		en = en.WithFirst(ls.first)
+	}
+	en = en.WithPersister(pr)
+	if cfg.EngineDebug {
+		en = en.WithDebug(nil)
+	}
 	return en
 }
--- a/menutraversal_test/group_test.json
+++ b/menutraversal_test/group_test.json
@ -1,5 +1,67 @@
 {
    "groups": [
+        {
+            "name": "main_my_vouchers_select_voucher_using_index",
+            "steps": [
+                {
+                    "input": "",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                },
+                {
+                    "input": "2",
+                    "expectedContent": "My vouchers\n1:Select voucher\n2:Voucher details\n0:Back"
+                },
+                {
+                    "input": "1",
+                    "expectedContent": "Select number or symbol from your vouchers:\n1SRF\n0:Back\n99:Quit"
+                },
+                {
+                    "input": "",
+                    "expectedContent": "Select number or symbol from your vouchers:\n1SRF\n0:Back\n99:Quit"
+                },
+                {
+                    "input": "1",
+                    "expectedContent": "Enter PIN to confirm selection:\nSymbol: SRF\nBalance: 2.745987\n0:Back\n9:Quit"
+                },
+                {
+                    "input": "1234",
+                    "expectedContent": "Success! SRF is now your active voucher.\n0:Back\n9:Quit"
+                },
+                {
+                    "input": "0",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                }
+            ]
+        },
+        {
+            "name": "main_my_vouchers_select_voucher_using_symbol",
+            "steps": [
+                {
+                    "input": "",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                },
+                {
+                    "input": "2",
+                    "expectedContent": "My vouchers\n1:Select voucher\n2:Voucher details\n0:Back"
+                },
+                {
+                    "input": "1",
+                    "expectedContent": "Select number or symbol from your vouchers:\n1SRF\n0:Back\n99:Quit"
+                },
+                {
+                    "input": "SRF",
+                    "expectedContent": "Enter PIN to confirm selection:\nSymbol: SRF\nBalance: 2.745987\n0:Back\n9:Quit"
+                },
+                {
+                    "input": "1234",
+                    "expectedContent": "Success! SRF is now your active voucher.\n0:Back\n9:Quit"
+                },
+                {
+                    "input": "0",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                }
+            ]
+        },
        {
            "name": "my_account_change_pin",
            "steps": [
@ -9,7 +71,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                },
                {
                    "input": "5",
@ -46,7 +108,11 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                },
+                {
+                    "input": "",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                },
                {
                    "input": "2",
@ -54,7 +120,7 @@
                },
                {
                    "input": "1235",
-                    "expectedContent": "Incorrect PIN. You have: 2 remaining attempt(s).\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
                },
                {
                    "input": "1",
@ -74,6 +140,105 @@
                }
            ]
        },
+        {
+            "name": "menu_my_account_reset_others_pin_with_unregistered_number",
+            "steps": [
+                {
+                    "input": "",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                },
+                {
+                    "input": "3",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                },
+                {
+                    "input": "5",
+                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
+                },
+                {
+                    "input": "2",
+                    "expectedContent": "Enter other's phone number:\n0:Back"
+                },
+                {
+                    "input": "0700000001",
+                    "expectedContent": "The number you have entered is either not registered with Sarafu or is invalid.\n1:Retry\n9:Quit"
+                },
+                {
+                    "input": "1",
+                    "expectedContent": "Enter other's phone number:\n0:Back"
+                },
+                {
+                    "input": "0",
+                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
+                },
+                {
+                    "input": "0",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                },
+                {
+                    "input": "0",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                }
+            ]
+        },
+        {
+            "name": "menu_my_account_reset_others_pin_with_registered_number",
+            "steps": [
+                {
+                    "input": "",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                },
+                {
+                    "input": "3",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                },
+                {
+                    "input": "5",
+                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
+                },
+                {
+                    "input": "2",
+                    "expectedContent": "Enter other's phone number:\n0:Back"
+                },
+                {
+                    "input": "0700000000",
+                    "expectedContent": "{secondary_session_id} will get a PIN reset request.\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
+                },
+                {
+                    "input": "1234",
+                    "expectedContent": "PIN reset request for {secondary_session_id} was successful\n0:Back\n9:Quit"
+                },
+                {
+                    "input": "0",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                }
+            ]
+        },
+        {
+            "name": "menu_my_account_reset_others_pin_with_no_privileges",
+            "steps": [
+                {
+                    "input": "",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                },
+                {
+                    "input": "3",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                },
+                {
+                    "input": "5",
+                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
+                },
+                {
+                    "input": "2",
+                    "expectedContent": "You do not have privileges to perform this action\n\n9:Quit\n0:Back"
+                },
+                {
+                    "input": "0",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                }
+            ]
+        },
        {
            "name": "menu_my_account_check_my_balance",
            "steps": [
@ -83,7 +248,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                },
                {
                    "input": "3",
@ -95,7 +260,7 @@
                },
                {
                    "input": "1235",
-                    "expectedContent": "Incorrect PIN. You have: 2 remaining attempt(s).\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
                },
                {
                    "input": "1",
@ -103,7 +268,7 @@
                },
                {
                    "input": "1234",
-                    "expectedContent": "Balance: {balance}\n\n0:Back\n9:Quit"
+                    "expectedContent": "{balance}\n\n0:Back\n9:Quit"
                },
                {
                    "input": "0",
@ -111,7 +276,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                },
                {
                    "input": "0",
@ -128,7 +293,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                },
                {
                    "input": "3",
@ -140,7 +305,7 @@
                },
                {
                    "input": "1235",
-                    "expectedContent": "Incorrect PIN. You have: 2 remaining attempt(s).\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
                },
                {
                    "input": "1",
@ -156,7 +321,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                },
                {
                    "input": "0",
@ -173,7 +338,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                },
                {
                    "input": "1",
@ -230,7 +395,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                },
                {
                    "input": "1",
@ -267,7 +432,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                },
                {
                    "input": "1",
@ -277,6 +442,10 @@
                    "input": "3",
                    "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
                },
+                {
+                    "input": "",
+                    "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
+                },
                {
                    "input": "1",
                    "expectedContent": "Please enter your PIN:"
@ -304,7 +473,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                },
                {
                    "input": "1",
@ -341,7 +510,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                },
                {
                    "input": "1",
@ -378,7 +547,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                },
                {
                    "input": "1",
@ -415,7 +584,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                },
                {
                    "input": "1",
@ -427,7 +596,7 @@
                },
                {
                    "input": "1234",
-                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 80\nLocation: Kilifi\nYou provide: Bananas\nYour alias: \n\n0:Back\n9:Quit"
+                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 80\nLocation: Kilifi\nYou provide: Bananas\nYour alias: Not Provided\n\n0:Back\n9:Quit"
                },
                {
                    "input": "0",
@ -438,6 +607,47 @@
                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
+        },
+        {
+            "name": "menu_block_account_via_view_profile",
+            "steps": [
+                {
+                    "input": "",
+                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                },
+                {
+                    "input": "3",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                },
+                {
+                    "input": "1",
+                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
+                },
+                {
+                    "input": "7",
+                    "expectedContent": "Please enter your PIN:"
+                },
+                {
+                    "input": "1254",
+                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
+                },
+                {
+                    "input": "1",
+                    "expectedContent": "Please enter your PIN:"
+                },
+                {
+                    "input": "1254",
+                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
+                },
+                {
+                    "input": "1",
+                    "expectedContent": "Please enter your PIN:"
+                },
+                {
+                    "input": "1254",
+                    "expectedContent": "Your account has been locked. For help on how to unblock your account, contact support at: 0757628885"
+                }
+            ]
        }
    ]
 }
--- a/menutraversal_test/menu_traversal_test.go
+++ b/menutraversal_test/menu_traversal_test.go
@ -16,11 +16,12 @@ import (
 )

 var (
-	logg      = logging.NewVanilla().WithDomain("menutraversaltest")
-	testData  = driver.ReadData()
-	sessionID string
-	src       = rand.NewSource(42)
-	g         = rand.New(src)
+	logg               = logging.NewVanilla().WithDomain("menutraversaltest")
+	testData           = driver.ReadData()
+	sessionID          string
+	src                = rand.NewSource(42)
+	g                  = rand.New(src)
+	secondarySessionId = "+254700000000"
 )

 var groupTestFile = flag.String("test-file", "group_test.json", "The test file to use for running the group tests")
@ -67,6 +68,16 @@ func extractMaxAmount(response []byte) string {
 	return ""
 }

+func extractRemainingAttempts(response []byte) string {
+	// Regex to match "You have: <number> remaining attempt(s)"
+	re := regexp.MustCompile(`(?m)You have:\s+(\d+)\s+remaining attempt\(s\)`)
+	match := re.FindSubmatch(response)
+	if match != nil {
+		return string(match[1]) // "<number>" of remaining attempts
+	}
+	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"
@ -87,7 +98,43 @@ func TestMain(m *testing.M) {
 }

 func TestAccountCreationSuccessful(t *testing.T) {
-	en, fn, eventChannel := testutil.TestEngine(sessionID)
+	en, fn, eventChannel, _, _ := testutil.TestEngine(sessionID)
+	defer fn()
+	ctx := context.Background()
+	sessions := testData
+	for _, session := range sessions {
+		groups := driver.FilterGroupsByName(session.Groups, "account_creation_successful")
+		for _, group := range groups {
+			for i, step := range group.Steps {
+				logg.TraceCtxf(ctx, "executing step", "i", i, "step", step)
+				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)
+				}
+				if !cont {
+					break
+				}
+				w := bytes.NewBuffer(nil)
+				_, err = en.Flush(ctx, w)
+				if err != nil {
+					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
+				}
+				b := w.Bytes()
+				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)
+				}
+			}
+		}
+	}
+	<-eventChannel
+}
+
+func TestSecondaryAccount(t *testing.T) {
+	en, fn, eventChannel, _, _ := testutil.TestEngine(secondarySessionId)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@ -130,7 +177,7 @@ func TestAccountRegistrationRejectTerms(t *testing.T) {
 		t.Fail()
 	}
 	edgeCaseSessionID := v.String()
-	en, fn, _ := testutil.TestEngine(edgeCaseSessionID)
+	en, fn, _, _, _ := testutil.TestEngine(edgeCaseSessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@ -166,7 +213,7 @@ func TestAccountRegistrationRejectTerms(t *testing.T) {
 }

 func TestMainMenuHelp(t *testing.T) {
-	en, fn, _ := testutil.TestEngine(sessionID)
+	en, fn, _, _, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@ -208,7 +255,7 @@ func TestMainMenuHelp(t *testing.T) {
 }

 func TestMainMenuQuit(t *testing.T) {
-	en, fn, _ := testutil.TestEngine(sessionID)
+	en, fn, _, _, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@ -249,7 +296,7 @@ func TestMainMenuQuit(t *testing.T) {
 }

 func TestMyAccount_MyAddress(t *testing.T) {
-	en, fn, _ := testutil.TestEngine(sessionID)
+	en, fn, _, _, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@ -293,7 +340,7 @@ func TestMyAccount_MyAddress(t *testing.T) {
 }

 func TestMainMenuSend(t *testing.T) {
-	en, fn, _ := testutil.TestEngine(sessionID)
+	en, fn, _, _, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@ -344,9 +391,12 @@ func TestGroups(t *testing.T) {
 	if err != nil {
 		log.Fatalf("Failed to load test groups: %v", err)
 	}
-	en, fn, _ := testutil.TestEngine(sessionID)
+	en, fn, _, pe, flagParser := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
+
+	flag_admin_privilege, _ := flagParser.GetFlag("flag_admin_privilege")
+
 	// Create test cases from loaded groups
 	tests := driver.CreateTestCases(groups)
 	for _, tt := range tests {
@ -365,9 +415,21 @@ func TestGroups(t *testing.T) {
 			}
 			b := w.Bytes()
 			balance := extractBalance(b)
+			attempts := extractRemainingAttempts(b)
+
+			st := pe.GetState()
+
+			if st != nil {
+				st.SetFlag(flag_admin_privilege)
+				if tt.Name == "menu_my_account_reset_others_pin_with_no_privileges" {
+					st.ResetFlag(flag_admin_privilege)
+				}
+			}

 			expectedContent := []byte(tt.ExpectedContent)
 			expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
+			expectedContent = bytes.Replace(expectedContent, []byte("{attempts}"), []byte(attempts), -1)
+			expectedContent = bytes.Replace(expectedContent, []byte("{secondary_session_id}"), []byte(secondarySessionId), -1)

 			tt.ExpectedContent = string(expectedContent)

--- a/menutraversal_test/profile_edit_start_familyname.json
+++ b/menutraversal_test/profile_edit_start_familyname.json
@ -9,7 +9,7 @@
                    },
                    {
                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                    },
                    {
                        "input": "1",
--- a/menutraversal_test/profile_edit_start_firstname.json
+++ b/menutraversal_test/profile_edit_start_firstname.json
@ -9,7 +9,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                   "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                },
                {
                    "input": "1",
--- a/menutraversal_test/profile_edit_start_gender.json
+++ b/menutraversal_test/profile_edit_start_gender.json
@ -9,7 +9,7 @@
                    },
                    {
                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                    },
                    {
                        "input": "1",
--- a/menutraversal_test/profile_edit_start_location.json
+++ b/menutraversal_test/profile_edit_start_location.json
@ -9,7 +9,7 @@
                    },
                    {
                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                    },
                    {
                        "input": "1",
--- a/menutraversal_test/profile_edit_start_offerings.json
+++ b/menutraversal_test/profile_edit_start_offerings.json
@ -9,7 +9,7 @@
                    },
                    {
                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                    },
                    {
                        "input": "1",
--- a/menutraversal_test/profile_edit_start_yob.json
+++ b/menutraversal_test/profile_edit_start_yob.json
@ -9,7 +9,7 @@
                    },
                    {
                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                    },
                    {
                        "input": "1",
--- a/menutraversal_test/profile_edit_when_adjacent_item_set.json
+++ b/menutraversal_test/profile_edit_when_adjacent_item_set.json
@ -9,7 +9,7 @@
                    },
                    {
                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                    },
                    {
                        "input": "1",
--- a/menutraversal_test/test_setup.json
+++ b/menutraversal_test/test_setup.json
@ -116,7 +116,7 @@
                    },
                    {
                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                    },
                    {
                        "input": "6",
--- a/profile/profile_test.go
+++ b/profile/profile_test.go
@ -0,0 +1,42 @@
+package profile
+
+import (
+	"testing"
+
+	"github.com/alecthomas/assert/v2"
+	"github.com/stretchr/testify/require"
+)
+
+func TestInsertOrShift(t *testing.T) {
+	tests := []struct {
+		name     string
+		profile Profile
+		index   int
+		value   string
+		expected []string
+	}{
+		{
+			name:     "Insert within range",
+			profile:  Profile{ProfileItems: []string{"A", "B", "C"}, Max: 5},
+			index:    1,
+			value:    "X",
+			expected: []string{"A", "X"},
+		},
+		{
+			name:     "Insert beyond range",
+			profile:  Profile{ProfileItems: []string{"A"}, Max: 5},
+			index:    3,
+			value:    "Y",
+			expected: []string{"A", "0", "0", "Y"},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			p := tt.profile
+			p.InsertOrShift(tt.index, tt.value)
+			require.NotNil(t, p.ProfileItems)
+			assert.Equal(t, tt.expected, p.ProfileItems)
+		})
+	}
+}
--- a/services/registration/amount.vis
+++ b/services/registration/amount.vis
@ -1,12 +1,12 @@
 LOAD reset_transaction_amount 0
-LOAD max_amount 10
+LOAD max_amount 40
 RELOAD max_amount
 MAP max_amount
 MOUT back 0
 HALT
 LOAD validate_amount 64
 RELOAD validate_amount
-CATCH api_failure flag_api_call_error  1
+CATCH api_failure flag_api_call_error 1
 CATCH invalid_amount flag_invalid_amount 1
 INCMP _ 0
 LOAD get_recipient 0
--- a/services/registration/authorize_reset_others_pin
+++ b/services/registration/authorize_reset_others_pin
@ -0,0 +1,2 @@
+{{.retrieve_blocked_number}} will get a PIN reset request.
+Please enter your PIN to confirm:
--- a/services/registration/authorize_reset_others_pin.vis
+++ b/services/registration/authorize_reset_others_pin.vis
@ -0,0 +1,12 @@
+LOAD retrieve_blocked_number 0
+RELOAD retrieve_blocked_number
+MAP retrieve_blocked_number
+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 pin_reset_result *
--- a/services/registration/authorize_reset_others_pin_swa
+++ b/services/registration/authorize_reset_others_pin_swa
@ -0,0 +1,2 @@
+{{.retrieve_blocked_number}} atapokea ombi la kuweka upya PIN.
+Tafadhali weka PIN yako kudhibitisha:
--- a/services/registration/community_balance.vis
+++ b/services/registration/community_balance.vis
@ -1,6 +1,6 @@
 LOAD reset_incorrect 6
 LOAD fetch_community_balance 0
-CATCH api_failure  flag_api_call_error  1
+CATCH api_failure flag_api_call_error 1
 MAP fetch_community_balance
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
--- a/services/registration/confirm_create_pin.vis
+++ b/services/registration/confirm_create_pin.vis
@ -1,4 +1,7 @@
-LOAD save_temporary_pin 6
+MOUT back 0
 HALT
+INCMP _ 0
 LOAD verify_create_pin 8
+RELOAD verify_create_pin
+CATCH pin_mismatch flag_pin_mismatch 1
 INCMP account_creation *
--- a/services/registration/confirm_new_alias
+++ b/services/registration/confirm_new_alias
@ -0,0 +1,2 @@
+Your full alias will be: {{.get_suggested_alias}}
+Please enter your PIN to confirm: 
--- a/services/registration/confirm_new_alias.vis
+++ b/services/registration/confirm_new_alias.vis
@ -0,0 +1,12 @@
+LOAD reset_invalid_pin 6
+RELOAD reset_invalid_pin
+LOAD get_suggested_alias 0
+RELOAD get_suggested_alias
+MAP get_suggested_alias
+MOUT back 0
+HALT
+INCMP _ 0
+RELOAD authorize_account
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH invalid_pin flag_invalid_pin 1
+CATCH update_alias flag_allow_update 1
--- a/services/registration/confirm_new_alias_swa
+++ b/services/registration/confirm_new_alias_swa
@ -0,0 +1,2 @@
+Lakabu yako kamili itakuwa: {{.get_suggested_alias}}
+Tafadhali weka PIN yako ili kuthibitisha:
--- a/services/registration/confirm_others_new_pin
+++ b/services/registration/confirm_others_new_pin
@ -1 +0,0 @@
-Please confirm new PIN  for:{{.retrieve_blocked_number}}
--- a/services/registration/confirm_others_new_pin.vis
+++ b/services/registration/confirm_others_new_pin.vis
@ -1,14 +0,0 @@
-CATCH pin_entry flag_incorrect_pin 1
-RELOAD retrieve_blocked_number
-MAP retrieve_blocked_number
-CATCH invalid_others_pin flag_valid_pin 0
-CATCH pin_reset_result flag_account_authorized 1
-LOAD save_others_temporary_pin 6
-RELOAD save_others_temporary_pin
-MOUT back 0
-HALT 
-INCMP _ 0
-LOAD check_pin_mismatch 0
-RELOAD check_pin_mismatch
-CATCH others_pin_mismatch flag_pin_mismatch 1
-INCMP pin_entry *
--- a/services/registration/confirm_others_new_pin_swa
+++ b/services/registration/confirm_others_new_pin_swa
@ -1 +0,0 @@
-Tafadhali thibitisha PIN mpya ya: {{.retrieve_blocked_number}}
--- a/services/registration/confirm_pin_change.vis
+++ b/services/registration/confirm_pin_change.vis
@ -1,5 +1,7 @@
-CATCH invalid_pin flag_valid_pin 0
 MOUT back 0
 HALT
 INCMP _ 0
-INCMP * pin_reset_success
+LOAD confirm_pin_change 0
+RELOAD confirm_pin_change
+CATCH pin_mismatch flag_pin_mismatch 1
+INCMP pin_reset_success *
--- 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
+INCMP quit 0
 LOAD save_temporary_pin 6
 RELOAD save_temporary_pin
-CATCH . flag_incorrect_pin 1
-INCMP quit 0
+CATCH invalid_pin flag_invalid_pin 1
 INCMP confirm_create_pin *
--- a/services/registration/create_pin_mismatch.vis
+++ b/services/registration/create_pin_mismatch.vis
@ -1,5 +0,0 @@
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP confirm_create_pin 1
-INCMP quit 9
--- a/services/registration/enter_other_number.vis
+++ b/services/registration/enter_other_number.vis
@ -1,7 +1,10 @@
-CATCH no_admin_privilege flag_admin_privilege  0
+CATCH no_admin_privilege flag_admin_privilege 0
 LOAD reset_account_authorized 0
 RELOAD reset_account_authorized
 MOUT back 0
 HALT
 INCMP _ 0
-INCMP enter_others_new_pin *
+LOAD validate_blocked_number 6
+RELOAD validate_blocked_number
+CATCH unregistered_number flag_unregistered_number 1
+INCMP authorize_reset_others_pin *
--- a/services/registration/enter_others_new_pin
+++ b/services/registration/enter_others_new_pin
@ -1 +0,0 @@
-Please enter new PIN for: {{.retrieve_blocked_number}}
--- a/services/registration/enter_others_new_pin.vis
+++ b/services/registration/enter_others_new_pin.vis
@ -1,12 +0,0 @@
-LOAD validate_blocked_number 6
-RELOAD validate_blocked_number
-CATCH unregistered_number flag_unregistered_number 1
-LOAD retrieve_blocked_number 0
-RELOAD retrieve_blocked_number
-MAP retrieve_blocked_number
-MOUT back 0
-HALT 
-LOAD verify_new_pin 6
-RELOAD verify_new_pin
-INCMP _ 0
-INCMP * confirm_others_new_pin
--- a/services/registration/enter_others_new_pin_swa
+++ b/services/registration/enter_others_new_pin_swa
@ -1 +0,0 @@
-Tafadhali weka PIN mpya ya: {{.retrieve_blocked_number}}
--- a/services/registration/incorrect_pin.vis
+++ b/services/registration/incorrect_pin.vis
@ -7,3 +7,4 @@ MOUT quit 9
 HALT
 INCMP _ 1
 INCMP quit 9
+INCMP . *
--- a/services/registration/invalid_others_pin
+++ b/services/registration/invalid_others_pin
@ -1 +0,0 @@
-The PIN you have entered is invalid.Please try a 4 digit number instead.
--- a/services/registration/invalid_others_pin.vis
+++ b/services/registration/invalid_others_pin.vis
@ -1,5 +0,0 @@
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP enter_others_new_pin 1
-INCMP quit 9
--- a/services/registration/invalid_pin
+++ b/services/registration/invalid_pin
@ -1 +1 @@
-The PIN you entered is invalid.The PIN must be different from your current PIN.For help call +254757628885
+The PIN you entered is invalid. The PIN must be a 4 digit number.
--- a/services/registration/invalid_pin.vis
+++ b/services/registration/invalid_pin.vis
@ -1,3 +1,8 @@
-MOUT back 0
+LOAD reset_invalid_pin 6
+RELOAD reset_invalid_pin
+MOUT retry 1
+MOUT quit 9
 HALT
-INCMP _ 0
+INCMP _ 1
+INCMP quit 9
+INCMP . *
--- a/services/registration/invalid_pin_swa
+++ b/services/registration/invalid_pin_swa
@ -1 +1 @@
-PIN mpya na udhibitisho wa PIN mpya hazilingani.Tafadhali jaribu tena.Kwa usaidizi piga simu +254757628885.
+PIN uliyoweka si sahihi. PIN lazima iwe nambari 4.
--- a/services/registration/locale/swa/default.po
+++ b/services/registration/locale/swa/default.po
@ -30,3 +30,7 @@ msgstr "Salio la Kikundi: 0.00"

 msgid "Symbol: %s\nBalance: %s"
 msgstr "Sarafu: %s\nSalio: %s"
+
+
+msgid "%s balance: %s\n"
+msgstr "%s salio: %s\n"
--- a/services/registration/main.vis
+++ b/services/registration/main.vis
@ -1,7 +1,7 @@
-LOAD set_default_voucher 8
-RELOAD set_default_voucher
-LOAD check_vouchers 10
-RELOAD check_vouchers
+LOAD clear_temporary_value 2
+RELOAD clear_temporary_value
+LOAD manage_vouchers 160
+RELOAD manage_vouchers
 LOAD check_balance 128
 RELOAD check_balance
 CATCH api_failure flag_api_call_error 1
--- a/services/registration/my_account.vis
+++ b/services/registration/my_account.vis
@ -1,3 +1,4 @@
+LOAD authorize_account 16
 LOAD reset_allow_update 0
 MOUT profile 1
 MOUT change_language 2
@ -5,13 +6,15 @@ MOUT check_balance 3
 MOUT check_statement 4
 MOUT pin_options 5
 MOUT my_address 6
+MOUT my_account_alias 7
 MOUT back 0
 HALT
-INCMP main 0
+INCMP ^ 0
 INCMP edit_profile 1
 INCMP change_language 2
 INCMP balances 3
 INCMP check_statement 4
 INCMP pin_management 5
 INCMP address 6
+INCMP my_account_alias 7
 INCMP . *
--- a/services/registration/my_account_alias
+++ b/services/registration/my_account_alias
@ -0,0 +1,2 @@
+Current alias: {{.get_current_profile_info}}
+Enter your preferred alias:
--- a/services/registration/my_account_alias.vis
+++ b/services/registration/my_account_alias.vis
@ -0,0 +1,8 @@
+LOAD get_current_profile_info 0
+MAP get_current_profile_info
+MOUT back 0
+HALT 
+INCMP _ 0
+LOAD request_custom_alias 0
+RELOAD request_custom_alias
+INCMP confirm_new_alias *
--- a/services/registration/my_account_alias_menu
+++ b/services/registration/my_account_alias_menu
@ -0,0 +1 @@
+My Alias
--- a/services/registration/my_account_alias_menu_swa
+++ b/services/registration/my_account_alias_menu_swa
@ -0,0 +1 @@
+Lakabu yangu
--- a/services/registration/my_account_alias_swa
+++ b/services/registration/my_account_alias_swa
@ -0,0 +1,2 @@
+Lakabu ya sasa: {{.get_current_profile_info}}
+Weka lakabu unalopendelea:
--- a/services/registration/my_balance.vis
+++ b/services/registration/my_balance.vis
@ -1,6 +1,6 @@
 LOAD reset_incorrect 6
 LOAD check_balance 0
-CATCH api_failure  flag_api_call_error  1
+CATCH api_failure flag_api_call_error 1
 MAP check_balance
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
--- a/services/registration/new_pin.vis
+++ b/services/registration/new_pin.vis
@ -1,13 +1,6 @@
-LOAD authorize_account 12
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH old_pin flag_allow_update 0
 MOUT back 0
 HALT
 INCMP _ 0
-LOAD save_temporary_pin 6
-LOAD verify_new_pin 0
 RELOAD save_temporary_pin
-RELOAD verify_new_pin
-INCMP * confirm_pin_change
-
+CATCH invalid_pin flag_invalid_pin 1
+INCMP confirm_pin_change *
--- a/services/registration/no_admin_privilege.vis
+++ b/services/registration/no_admin_privilege.vis
@ -1,5 +1,5 @@
 MOUT quit 9
 MOUT back 0
 HALT
-INCMP pin_management 0
+INCMP ^ 0
 INCMP quit 9
--- a/services/registration/old_pin.vis
+++ b/services/registration/old_pin.vis
@ -1,7 +1,8 @@
-LOAD reset_allow_update 0
+RELOAD reset_incorrect
 MOUT back 0
 HALT
-RELOAD reset_allow_update
 INCMP _ 0
+RELOAD authorize_account
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH invalid_pin flag_invalid_pin 1
 INCMP new_pin *
-
--- a/services/registration/others_pin_mismatch
+++ b/services/registration/others_pin_mismatch
@ -1 +0,0 @@
-The PIN you have entered is not a match
--- a/services/registration/others_pin_mismatch_swa
+++ b/services/registration/others_pin_mismatch_swa
@ -1 +0,0 @@
-PIN uliyoweka hailingani.Jaribu tena.
--- a/services/registration/pin_management.vis
+++ b/services/registration/pin_management.vis
@ -1,8 +1,14 @@
+LOAD set_back 6
+LOAD authorize_account 16
+LOAD reset_allow_update 4
+LOAD save_temporary_pin 1
+LOAD reset_incorrect 0
+LOAD reset_invalid_pin 6
 MOUT change_pin 1
 MOUT reset_pin 2
 MOUT back 0
 HALT
-INCMP my_account 0
-INCMP old_pin  1
+INCMP _ 0
+INCMP old_pin 1
 INCMP enter_other_number 2
 INCMP . *
--- a/services/registration/create_pin_mismatch
+++ b/services/registration/create_pin_mismatch
--- a/services/registration/others_pin_mismatch.vis
+++ b/services/registration/others_pin_mismatch.vis
@ -3,3 +3,4 @@ MOUT quit 9
 HALT
 INCMP _ 1
 INCMP quit 9
+INCMP . *
--- a/services/registration/create_pin_mismatch_swa
+++ b/services/registration/create_pin_mismatch_swa
--- a/services/registration/pin_reset_mismatch
+++ b/services/registration/pin_reset_mismatch
@ -1 +0,0 @@
-The PIN is not a match. Try again
--- a/services/registration/pin_reset_mismatch.vis
+++ b/services/registration/pin_reset_mismatch.vis
@ -1,6 +0,0 @@
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP confirm_pin_change 1
-INCMP quit 9
-
--- a/services/registration/pin_reset_mismatch_swa
+++ b/services/registration/pin_reset_mismatch_swa
@ -1 +0,0 @@
-PIN uliyoweka hailingani.Jaribu tena.
--- a/services/registration/pin_reset_result.vis
+++ b/services/registration/pin_reset_result.vis
@ -1,8 +1,9 @@
+CATCH _ flag_account_authorized 0
 LOAD retrieve_blocked_number 0
 MAP retrieve_blocked_number
 LOAD reset_others_pin 6
 MOUT back 0
 MOUT quit 9
 HALT
-INCMP pin_management 0
-INCMP quit  9
+INCMP ^ 0
+INCMP quit 9
--- a/services/registration/pin_reset_success.vis
+++ b/services/registration/pin_reset_success.vis
@ -1,8 +1,6 @@
-LOAD confirm_pin_change 0
-RELOAD confirm_pin_change
-CATCH pin_reset_mismatch  flag_pin_mismatch 1
 MOUT back 0
 MOUT quit 9
 HALT
-INCMP main 0
+INCMP ^ 0
 INCMP quit 9
+INCMP . *
--- a/services/registration/pp.csv
+++ b/services/registration/pp.csv
@ -9,7 +9,7 @@ flag,flag_account_authorized,15,this is set to allow a user access guarded nodes
 flag,flag_invalid_recipient,16,this is set when the transaction recipient is invalid
 flag,flag_invalid_recipient_with_invite,17,this is set when the transaction recipient is valid but not on the platform
 flag,flag_invalid_amount,18,this is set when the given transaction amount is invalid
-flag,flag_incorrect_pin,19,this is set when the provided PIN is invalid or does not match the current account's PIN
+flag,flag_incorrect_pin,19,this is set when the provided PIN does not match the current account's PIN
 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
@ -29,4 +29,6 @@ flag,flag_location_set,35,this is set when the location of the profile is set
 flag,flag_offerings_set,36,this is set when the offerings of the profile is set
 flag,flag_back_set,37,this is set when it is a back navigation
 flag,flag_account_blocked,38,this is set when an account has been blocked after the allowed incorrect PIN attempts have been exceeded
-
+flag,flag_invalid_pin,39,this is set when the given PIN is invalid(is  less than or more than 4 digits)
+flag,flag_alias_set,40,this is set when an account alias has been assigned to a user
+flag,flag_account_pin_reset,41,this is set on an account when an admin triggers a PIN reset for them
--- a/services/registration/root.vis
+++ b/services/registration/root.vis
@ -1,12 +1,15 @@
 LOAD check_blocked_status 1
 RELOAD check_blocked_status
+LOAD check_account_created 2
+RELOAD check_account_created
+CATCH self_reset_pin flag_account_pin_reset 1
 CATCH blocked_account flag_account_blocked 1
 CATCH select_language flag_language_set 0
 CATCH terms flag_account_created 0
+CATCH create_pin flag_pin_set 0
 LOAD check_account_status 0
 RELOAD check_account_status
-CATCH api_failure flag_api_call_error  1
+CATCH api_failure flag_api_call_error 1
 CATCH account_pending flag_account_pending 1
-CATCH create_pin flag_pin_set 0
 CATCH main flag_account_success 1
 HALT
--- a/services/registration/self_reset_pin
+++ b/services/registration/self_reset_pin
@ -0,0 +1,2 @@
+A PIN reset has been done on your account.
+Please enter a new four number PIN:
--- a/services/registration/self_reset_pin.vis
+++ b/services/registration/self_reset_pin.vis
@ -0,0 +1,6 @@
+LOAD reset_invalid_pin 6
+HALT
+LOAD save_temporary_pin 1
+RELOAD save_temporary_pin
+CATCH invalid_pin flag_invalid_pin 1
+INCMP confirm_pin_change * 
--- a/services/registration/self_reset_pin_swa
+++ b/services/registration/self_reset_pin_swa
@ -0,0 +1,2 @@
+Uwekaji upya wa PIN umefanyika kwenye akaunti yako.
+Tafadhali weka PIN mpya ya nambari nne:
--- a/services/registration/unregistered_number.vis
+++ b/services/registration/unregistered_number.vis
@ -1,7 +1,8 @@
 LOAD reset_unregistered_number 0
 RELOAD reset_unregistered_number
-MOUT back 0
+MOUT retry 1
 MOUT quit 9
 HALT
-INCMP ^ 0
+INCMP _ 1
 INCMP quit 9
+INCMP . *
--- a/services/registration/update_alias
+++ b/services/registration/update_alias
@ -0,0 +1 @@
+Your alias has been updated successfully
--- a/services/registration/update_alias.vis
+++ b/services/registration/update_alias.vis
@ -0,0 +1,7 @@
+LOAD confirm_new_alias 0
+RELOAD confirm_new_alias
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP ^ 0
+INCMP quit 9
--- a/services/registration/update_alias_swa
+++ b/services/registration/update_alias_swa
@ -0,0 +1 @@
+Ombi lako la kubadilisha lakabu limefanikiwa.
--- a/services/remote.go
+++ b/services/remote.go
@ -14,6 +14,6 @@ import (
 func New(ctx context.Context, storageService storage.StorageService) remote.AccountService {
 	return &httpremote.HTTPAccountService{
 		SS:     storageService,
-		UseApi: false,
+		UseApi: true,
 	}
 }
--- a/ssh/ssh.go
+++ b/ssh/ssh.go
@ -177,20 +177,14 @@ func (s *SshRunner) GetEngine(sessionId string) (engine.Engine, func(), error) {
 		return nil, nil, err
 	}

-	// TODO: clear up why pointer here and by-value other cmds
-	accountService := services.New(ctx, menuStorageService)
-
-	hl, err := lhs.GetHandler(accountService)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	en := lhs.GetEngine()
-	en = en.WithFirst(hl.Init)
-	if s.Debug {
-		en = en.WithDebug(nil)
-	}
 	// TODO: this is getting very hacky!
+	accountService := services.New(ctx, menuStorageService)
+	_, err = lhs.GetHandler(accountService)
+	if err != nil {
+	       fmt.Fprintf(os.Stderr, "get accounts service handler: %v\n", err)
+	       os.Exit(1)
+	}
+	en := lhs.GetEngine(lhs.Cfg, rs, pe)
 	closer := func() {
 		err := menuStorageService.Close(ctx)
 		if err != nil {
--- a/store/db/db.go
+++ b/store/db/db.go
@ -63,6 +63,10 @@ const (
 	DATA_INITIAL_LANGUAGE_CODE
 	//Fully qualified account alias string
 	DATA_ACCOUNT_ALIAS
+	//currently suggested alias by the api awaiting user's confirmation as accepted account alias
+	DATA_SUGGESTED_ALIAS
+	//Key used to store a value of 1 for a user to reset their own PIN once they access the menu. 
+	DATA_SELF_PIN_RESET
 )

 const (
@ -130,7 +134,8 @@ func StringToDataTyp(str string) (DataTyp, error) {
 		return DATA_GENDER, nil
 	case "DATA_OFFERINGS":
 		return DATA_OFFERINGS, nil
-
+	case "DATA_ACCOUNT_ALIAS":
+		return DATA_ACCOUNT_ALIAS, nil
 	default:
 		return 0, errors.New("invalid DataTyp string")
 	}
--- a/store/db/sub_prefix_db.go
+++ b/store/db/sub_prefix_db.go
@ -33,11 +33,14 @@ func (s *SubPrefixDb) toKey(k []byte) []byte {
 func (s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
 	s.store.SetPrefix(db.DATATYPE_USERDATA)
 	key = s.toKey(key)
+	logg.InfoCtxf(ctx, "SubPrefixDb Get log", "key", string(key))
+
 	return s.store.Get(ctx, key)
 }

 func (s *SubPrefixDb) Put(ctx context.Context, key []byte, val []byte) error {
 	s.store.SetPrefix(db.DATATYPE_USERDATA)
 	key = s.toKey(key)
+	logg.InfoCtxf(ctx, "SubPrefixDb Put log", "key", string(key))
 	return s.store.Put(ctx, key, val)
 }
--- a/store/vouchers.go
+++ b/store/vouchers.go
@ -68,7 +68,7 @@ func ScaleDownBalance(balance, decimals string) string {
 }

 // GetVoucherData retrieves and matches voucher data
-func GetVoucherData(ctx context.Context, db storedb.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) {
+func GetVoucherData(ctx context.Context, store DataStore, sessionId string, input string) (*dataserviceapi.TokenHoldings, error) {
 	keys := []storedb.DataTyp{
 		storedb.DATA_VOUCHER_SYMBOLS,
 		storedb.DATA_VOUCHER_BALANCES,
@ -78,9 +78,9 @@ func GetVoucherData(ctx context.Context, db storedb.PrefixDb, input string) (*da
 	data := make(map[storedb.DataTyp]string)

 	for _, key := range keys {
-		value, err := db.Get(ctx, storedb.ToBytes(key))
+		value, err := store.ReadEntry(ctx, sessionId, key)
 		if err != nil {
-			return nil, fmt.Errorf("failed to get prefix key %x: %v", storedb.ToBytes(key), err)
+			return nil, fmt.Errorf("failed to get data key %x: %v", key, err)
 		}
 		data[key] = string(value)
 	}
--- a/store/vouchers_test.go
+++ b/store/vouchers_test.go
@ -8,7 +8,6 @@ import (
 	"github.com/alecthomas/assert/v2"
 	"github.com/stretchr/testify/require"

-	visedb "git.defalsify.org/vise.git/db"
 	memdb "git.defalsify.org/vise.git/db/mem"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
@ -77,16 +76,8 @@ func TestProcessVouchers(t *testing.T) {
 }

 func TestGetVoucherData(t *testing.T) {
-	ctx := context.Background()
-
-	db := memdb.NewMemDb()
-	err := db.Connect(ctx, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	prefix := storedb.ToBytes(visedb.DATATYPE_USERDATA)
-	spdb := storedb.NewSubPrefixDb(db, prefix)
+	ctx, store := InitializeTestDb(t)
+	sessionId := "session123"

 	// Test voucher data
 	mockData := map[storedb.DataTyp][]byte{
@ -98,13 +89,13 @@ func TestGetVoucherData(t *testing.T) {

 	// Put the data
 	for key, value := range mockData {
-		err = spdb.Put(ctx, []byte(storedb.ToBytes(key)), []byte(value))
+		err := store.WriteEntry(ctx, sessionId, key, []byte(value))
 		if err != nil {
 			t.Fatal(err)
 		}
 	}

-	result, err := GetVoucherData(ctx, spdb, "1")
+	result, err := GetVoucherData(ctx, store, sessionId, "1")

 	assert.NoError(t, err)
 	assert.Equal(t, "SRF", result.TokenSymbol)
--- a/testutil/engine.go
+++ b/testutil/engine.go
@ -9,7 +9,9 @@ import (
 	"path/filepath"
 	"time"

+	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/engine"
+	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
 	httpremote "git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
@ -60,7 +62,7 @@ func CleanDatabase() {
 	}
 }

-func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
+func TestEngine(sessionId string) (engine.Engine, func(), chan bool, *persist.Persister, *asm.FlagParser) {
 	config.LoadConfig()
 	err := config.Apply(override)
 	if err != nil {
@ -75,6 +77,12 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 	logg.InfoCtxf(ctx, "loaded engine setup", "conns", conns)
 	pfp := path.Join(scriptDir, "pp.csv")

+	parser := asm.NewFlagParser()
+	_, err = parser.Load(pfp)
+	if err != nil {
+		os.Exit(1)
+	}
+
 	var eventChannel = make(chan bool)

 	cfg := engine.Config{
@ -137,14 +145,14 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 		panic("Unknown account service type")
 	}

-	hl, err := lhs.GetHandler(testtag.AccountService)
+	// TODO: triggers withfirst assignment
+	_, 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)
+	en := lhs.GetEngine(lhs.Cfg, rs, pe)
 	cleanFn := func() {
 		err := en.Finish(ctx)
 		if err != nil {
@ -157,5 +165,5 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 		}
 		logg.Infof("testengine storage closed")
 	}
-	return en, cleanFn, eventChannel
+	return en, cleanFn, eventChannel, pe, parser
 }
--- a/testutil/engine_test.go
+++ b/testutil/engine_test.go
@ -5,7 +5,7 @@ import (
 )

 func TestCreateEngine(t *testing.T) {
-	o, clean, eventC := TestEngine("foo")
+	o, clean, eventC, _, _ := TestEngine("foo")
 	defer clean()
 	defer func() {
 		<-eventC
				`@ -1 +0,0 @@`
				`Please confirm new PIN for:{{.retrieve_blocked_number}}`
				`@ -1 +0,0 @@`
				`Tafadhali thibitisha PIN mpya ya: {{.retrieve_blocked_number}}`
				`@ -1 +0,0 @@`
				`Please enter new PIN for: {{.retrieve_blocked_number}}`
				`@ -1 +0,0 @@`
				`Tafadhali weka PIN mpya ya: {{.retrieve_blocked_number}}`
				`@ -1 +0,0 @@`
				`The PIN you have entered is invalid.Please try a 4 digit number instead.`
				`@ -0,0 +1 @@`
				`Ombi lako la kubadilisha lakabu limefanikiwa.`