Merge remote-tracking branch 'remotes/origin/lash/thread-gdbm' into wip-menu-select-fix

update test,check for errors
remove need for initial Exec before loop
2024-09-23 15:08:21 +03:00 · 2024-09-23 13:29:02 +03:00 · 2024-09-23 11:18:57 +03:00 · 2024-09-23 11:18:56 +03:00 · 2024-09-23 11:18:56 +03:00 · 2024-09-23 11:18:55 +03:00
62 changed files with 508 additions and 1953 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,3 @@ go.work*
 **/*/*.bin
 **/*/.state/
 cmd/.state/
-id_*
-*.gdbm
--- a/cmd/africastalking/main.go
+++ b/cmd/africastalking/main.go
@@ -17,7 +17,6 @@ import (
 	"git.defalsify.org/vise.git/resource"

 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	httpserver "git.grassecon.net/urdt/ussd/internal/http"
 	"git.grassecon.net/urdt/ussd/internal/storage"
 )
@@ -70,11 +69,13 @@ func main() {
 	var resourceDir string
 	var size uint
 	var engineDebug bool
+	var stateDebug bool
 	var host string
 	var port uint
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
+	flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", "127.0.0.1", "http host")
 	flag.UintVar(&port, "p", 7123, "http port")
@@ -88,9 +89,11 @@ func main() {
 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
+	}
+	if stateDebug {
+		cfg.StateDebug = true
 	}
-
 	if engineDebug {
 		cfg.EngineDebug = true
 	}
@@ -128,8 +131,7 @@ func main() {
 		os.Exit(1)
 	}

-	accountService := server.AccountService{}
-	hl, err := lhs.GetHandler(&accountService)
+	hl, err := lhs.GetHandler()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
--- a/cmd/async/main.go
+++ b/cmd/async/main.go
@@ -14,7 +14,6 @@ import (
 	"git.defalsify.org/vise.git/resource"

 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/storage"
 )

@@ -42,12 +41,14 @@ func main() {
 	var resourceDir string
 	var size uint
 	var engineDebug bool
+	var stateDebug bool
 	var host string
 	var port uint
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
+	flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", "127.0.0.1", "http host")
 	flag.UintVar(&port, "p", 7123, "http port")
@@ -61,9 +62,11 @@ func main() {
 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
+	}
+	if stateDebug {
+		cfg.StateDebug = true
 	}
-
 	if engineDebug {
 		cfg.EngineDebug = true
 	}
@@ -95,9 +98,8 @@ func main() {

 	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
-	accountService := server.AccountService{}

-	hl, err := lhs.GetHandler(&accountService)
+	hl, err := lhs.GetHandler()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -136,26 +138,22 @@ func main() {
 	for true {
 		rqs, err = sh.Process(rqs)
 		if err != nil {
-			logg.ErrorCtxf(ctx, "error in process: %v", "err", err)
 			fmt.Errorf("error in process: %v", err)
 			os.Exit(1)
 		}
 		rqs, err = sh.Output(rqs)
 		if err != nil {
-			logg.ErrorCtxf(ctx, "error in output: %v", "err", err)
 			fmt.Errorf("error in output: %v", err)
 			os.Exit(1)
 		}
 		rqs, err = sh.Reset(rqs)
 		if err != nil {
-			logg.ErrorCtxf(ctx, "error in reset: %v", "err", err)
 			fmt.Errorf("error in reset: %v", err)
 			os.Exit(1)
 		}
 		fmt.Println("")
 		_, err = fmt.Scanln(&rqs.Input)
 		if err != nil {
-			logg.ErrorCtxf(ctx, "error in input", "err", err)
 			fmt.Errorf("error in input: %v", err)
 			os.Exit(1)
 		}
--- a/cmd/http/main.go
+++ b/cmd/http/main.go
@@ -16,7 +16,6 @@ import (
 	"git.defalsify.org/vise.git/resource"

 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	httpserver "git.grassecon.net/urdt/ussd/internal/http"
 	"git.grassecon.net/urdt/ussd/internal/storage"
 )
@@ -31,11 +30,13 @@ func main() {
 	var resourceDir string
 	var size uint
 	var engineDebug bool
+	var stateDebug bool
 	var host string
 	var port uint
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
+	flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", "127.0.0.1", "http host")
 	flag.UintVar(&port, "p", 7123, "http port")
@@ -49,9 +50,11 @@ func main() {
 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
+	}
+	if stateDebug {
+		cfg.StateDebug = true
 	}
-
 	if engineDebug {
 		cfg.EngineDebug = true
 	}
@@ -88,8 +91,8 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-	accountService := server.AccountService{}
-	hl, err := lhs.GetHandler(&accountService)
+
+	hl, err := lhs.GetHandler()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -11,7 +11,6 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/storage"
 )

@@ -24,10 +23,10 @@ func main() {
 	var dbDir string
 	var size uint
 	var sessionId string
-	var engineDebug bool
+	var debug bool
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.BoolVar(&debug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.Parse()

@@ -41,7 +40,7 @@ func main() {
 		Root:       "root",
 		SessionId:  sessionId,
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
 	}

 	resourceDir := scriptDir
@@ -86,8 +85,7 @@ func main() {
 		os.Exit(1)
 	}

-	accountService := server.AccountService{}
-	hl, err := lhs.GetHandler(&accountService)
+	hl, err := lhs.GetHandler()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -95,7 +93,7 @@ func main() {

 	en := lhs.GetEngine()
 	en = en.WithFirst(hl.Init)
-	if engineDebug {
+	if debug {
 		en = en.WithDebug(nil)
 	}

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

 require (
-	git.defalsify.org/vise.git v0.1.0-rc.3.0.20240923162317-c20d557a3dbb
+	git.defalsify.org/vise.git v0.1.0-rc.3.0.20240922152136-7ea16f9137b4
 	github.com/alecthomas/assert/v2 v2.2.2
 	github.com/peteole/testdata-loader v0.3.0
+	golang.org/x/crypto v0.17.0
 	gopkg.in/leonelquinteros/gotext.v1 v1.3.1
 )

+require golang.org/x/sys v0.15.0 // indirect
+
 require (
 	github.com/alecthomas/participle/v2 v2.0.0 // indirect
 	github.com/alecthomas/repr v0.2.0 // indirect
 	github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fxamacker/cbor/v2 v2.4.0 // indirect
-	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 // indirect
 	github.com/hexops/gotextdiff v1.0.3 // indirect
 	github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a // indirect
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-git.defalsify.org/vise.git v0.1.0-rc.3.0.20240923162317-c20d557a3dbb h1:6P4kxihcwMjDKzvUFC6t2zGNb7MDW+l/ACGlSAN1N8Y=
-git.defalsify.org/vise.git v0.1.0-rc.3.0.20240923162317-c20d557a3dbb/go.mod h1:JDguWmcoWBdsnpw7PUjVZAEpdC/ubBmjdUBy3tjP63M=
+git.defalsify.org/vise.git v0.1.0-rc.3.0.20240922152136-7ea16f9137b4 h1:IMVUK9OkZ/QtYZPHgTZ+XUs5VQ4eIewIaTyVSCF/nAY=
+git.defalsify.org/vise.git v0.1.0-rc.3.0.20240922152136-7ea16f9137b4/go.mod h1:JDguWmcoWBdsnpw7PUjVZAEpdC/ubBmjdUBy3tjP63M=
 github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
 github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
 github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=
@@ -12,8 +12,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
 github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
-github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
-github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 h1:U4kkNYryi/qfbBF8gh7Vsbuz+cVmhf5kt6pE9bYYyLo=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4/go.mod h1:zpZDgZFzeq9s0MIeB1P50NIEWDFFHSFBohI/NbaTD/Y=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
@@ -30,6 +28,12 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/leonelquinteros/gotext.v1 v1.3.1 h1:8d9/fdTG0kn/B7NNGV1BsEyvektXFAbkMsTZS2sFSCc=
--- a/internal/handlers/base.go
+++ b/internal/handlers/base.go
@@ -46,7 +46,7 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
 	var err error
 	var ok bool
 	
-	logg.InfoCtxf(rqs.Ctx, "new request", "data", rqs)
+	logg.InfoCtxf(rqs.Ctx, "new request",  rqs)

 	rqs.Storage, err = f.provider.Get(rqs.Config.SessionId)
 	if err != nil {
--- a/internal/handlers/handlerservice.go
+++ b/internal/handlers/handlerservice.go
@@ -6,7 +6,6 @@ import (
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
 )

@@ -53,8 +52,8 @@ func (ls *LocalHandlerService) SetDataStore(db *db.Db) {
 	ls.UserdataStore = db
 }

-func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceInterface) (*ussd.Handlers, error) {
-	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore,accountService)
+func (ls *LocalHandlerService) GetHandler() (*ussd.Handlers, error) {
+	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore)
 	if err != nil {
 		return nil, err
 	}
@@ -83,17 +82,18 @@ func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceIn
 	ls.DbRs.AddLocalFunc("save_location", ussdHandlers.SaveLocation)
 	ls.DbRs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
 	ls.DbRs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
+	ls.DbRs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
 	ls.DbRs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
 	ls.DbRs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
 	ls.DbRs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
 	ls.DbRs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
 	ls.DbRs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
+	ls.DbRs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
 	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)

 	return ussdHandlers, nil
 }
--- a/internal/handlers/server/accountservice.go
+++ b/internal/handlers/server/accountservice.go
@@ -4,23 +4,21 @@ import (
 	"encoding/json"
 	"io"
 	"net/http"
-	"time"

 	"git.grassecon.net/urdt/ussd/config"
 	"git.grassecon.net/urdt/ussd/internal/models"
 )

 type AccountServiceInterface interface {
-	CheckBalance(publicKey string) (*models.BalanceResponse, error)
+	CheckBalance(publicKey string) (string, error)
 	CreateAccount() (*models.AccountResponse, error)
-	CheckAccountStatus(trackingId string) (*models.TrackStatusResponse, error)
+	CheckAccountStatus(trackingId string) (string, error)
 }

 type AccountService struct {
 }

-type TestAccountService struct {
-}
+

 // CheckAccountStatus retrieves the status of an account transaction based on the provided tracking ID.
 //
@@ -29,51 +27,64 @@ type TestAccountService struct {
 //     CreateAccount or a similar function that returns an AccountResponse. The `trackingId` field in the
 //     AccountResponse struct can be used here to check the account status during a transaction.
 //
+//
 // Returns:
 //   - string: The status of the transaction as a string. If there is an error during the request or processing, this will be an empty string.
 //   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
 //     If no error occurs, this will be nil.
-func (as *AccountService) CheckAccountStatus(trackingId string) (*models.TrackStatusResponse, error) {
+//
+func (as *AccountService) CheckAccountStatus(trackingId string) (string, error) {
 	resp, err := http.Get(config.TrackStatusURL + trackingId)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 	defer resp.Body.Close()

 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
+
 	var trackResp models.TrackStatusResponse
 	err = json.Unmarshal(body, &trackResp)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
-	return &trackResp, nil
+
+	status := trackResp.Result.Transaction.Status
+
+	return status, nil
 }

+
 // CheckBalance retrieves the balance for a given public key from the custodial balance API endpoint.
 // Parameters:
 //   - publicKey: The public key associated with the account whose balance needs to be checked.
-func (as *AccountService) CheckBalance(publicKey string) (*models.BalanceResponse, error) {
+func (as *AccountService) CheckBalance(publicKey string) (string, error) {
+
 	resp, err := http.Get(config.BalanceURL + publicKey)
 	if err != nil {
-		return nil, err
+		return "0.0", err
 	}
 	defer resp.Body.Close()
+
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return nil, err
+		return "0.0", err
 	}
+
 	var balanceResp models.BalanceResponse
 	err = json.Unmarshal(body, &balanceResp)
 	if err != nil {
-		return nil, err
+		return "0.0", err
 	}
-	return &balanceResp, nil
+
+	balance := balanceResp.Result.Balance
+	return balance, nil
 }

-// CreateAccount creates a new account in the custodial system.
+
+//CreateAccount creates a new account in the custodial system.
 // Returns:
 //   - *models.AccountResponse: A pointer to an AccountResponse struct containing the details of the created account.
 //     If there is an error during the request or processing, this will be nil.
@@ -85,69 +96,17 @@ func (as *AccountService) CreateAccount() (*models.AccountResponse, error) {
 		return nil, err
 	}
 	defer resp.Body.Close()
+
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
+
 	var accountResp models.AccountResponse
 	err = json.Unmarshal(body, &accountResp)
 	if err != nil {
 		return nil, err
 	}
+
 	return &accountResp, nil
 }
-
-func (tas *TestAccountService) CreateAccount() (*models.AccountResponse, error) {
-	return &models.AccountResponse{
-		Ok: true,
-		Result: struct {
-			CustodialId json.Number `json:"custodialId"`
-			PublicKey   string      `json:"publicKey"`
-			TrackingId  string      `json:"trackingId"`
-		}{
-			CustodialId: json.Number("182"),
-			PublicKey:   "0x48ADca309b5085852207FAaf2816eD72B52F527C",
-			TrackingId:  "28ebe84d-b925-472c-87ae-bbdfa1fb97be",
-		},
-	}, nil
-}
-
-func (tas *TestAccountService) CheckBalance(publicKey string) (*models.BalanceResponse, error) {
-
-	balanceResponse := &models.BalanceResponse{
-		Ok: true,
-		Result: struct {
-			Balance string      `json:"balance"`
-			Nonce   json.Number `json:"nonce"`
-		}{
-			Balance: "0.003 CELO",
-			Nonce:   json.Number("0"),
-		},
-	}
-
-	return balanceResponse, nil
-}
-
-func (tas *TestAccountService) CheckAccountStatus(trackingId string) (*models.TrackStatusResponse, error) {
-	trackResponse := &models.TrackStatusResponse{
-		Ok: true,
-		Result: struct {
-			Transaction struct {
-				CreatedAt     time.Time   "json:\"createdAt\""
-				Status        string      "json:\"status\""
-				TransferValue json.Number "json:\"transferValue\""
-				TxHash        string      "json:\"txHash\""
-				TxType        string      "json:\"txType\""
-			}
-		}{
-			Transaction: models.Transaction{
-				CreatedAt:     time.Now(),
-				Status:        "SUCCESS",
-				TransferValue: json.Number("0.5"),
-				TxHash:        "0x123abc456def",
-				TxType:        "transfer",
-			},
-		},
-	}
-	return trackResponse, nil
-}
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -61,7 +61,7 @@ type Handlers struct {
 	accountService server.AccountServiceInterface
 }

-func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db, accountService server.AccountServiceInterface) (*Handlers, error) {
+func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db) (*Handlers, error) {
 	if userdataStore == nil {
 		return nil, fmt.Errorf("cannot create handler with nil userdata store")
 	}
@@ -71,7 +71,7 @@ func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db, accountService s
 	h := &Handlers{
 		userdataStore:  userDb,
 		flagManager:    appFlags,
-		accountService: accountService,
+		accountService: &server.AccountService{},
 	}
 	return h, nil
 }
@@ -276,6 +276,17 @@ func (h *Handlers) ConfirmPinChange(ctx context.Context, sym string, input []byt
 	return res, nil
 }

+// SetResetSingleEdit sets and resets  flags to allow gradual editing of profile information.
+func (h *Handlers) SetResetSingleEdit(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	flag_single_edit, err := h.flagManager.GetFlag("flag_single_edit")
+	if err != nil {
+		return res, err
+	}
+	res.FlagReset = append(res.FlagReset, flag_single_edit)
+	return res, nil
+}
+
 // VerifyPin checks whether the confirmation PIN is similar to the account PIN
 // If similar, it sets the USERFLAG_PIN_SET flag allowing the user
 // to access the main menu
@@ -325,6 +336,13 @@ func (h *Handlers) SaveFirstname(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+
+	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
+	flag_single_edit, _ := h.flagManager.GetFlag("flag_single_edit")
+
+	res.FlagReset = append(res.FlagReset, flag_allow_update)
+	res.FlagSet = append(res.FlagSet, flag_single_edit)
+
 	if len(input) > 0 {
 		firstName := string(input)
 		store := h.userdataStore
@@ -345,7 +363,6 @@ func (h *Handlers) SaveFamilyname(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
 	if len(input) > 0 {
 		familyName := string(input)
 		store := h.userdataStore
@@ -368,7 +385,6 @@ func (h *Handlers) SaveYob(ctx context.Context, sym string, input []byte) (resou
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
 	if len(input) == 4 {
 		yob := string(input)
 		store := h.userdataStore
@@ -389,7 +405,6 @@ func (h *Handlers) SaveLocation(ctx context.Context, sym string, input []byte) (
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
 	if len(input) > 0 {
 		location := string(input)
 		store := h.userdataStore
@@ -404,19 +419,41 @@ func (h *Handlers) SaveLocation(ctx context.Context, sym string, input []byte) (

 // SaveGender updates the gender in the gdbm with the provided input.
 func (h *Handlers) SaveGender(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	symbol, _ := h.st.Where()
 	var res resource.Result
 	var err error
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+	code := codeFromCtx(ctx)
+	if len(input) > 0 {
+		gender := string(input)
+		switch gender {
+		case "1":
+			if code == "swa" {
+				gender = "Mwanaume"
+			} else {
+				gender = "Male"
+			}
+		case "2":
+			if code == "swa" {
+				gender = "Mwanamke"
+			} else {
+				gender = "Female"
+			}
+		case "3":
+			if code == "swa" {
+				gender = "Haijabainishwa"
+			} else {
+				gender = "Unspecified"
+			}

-	gender := strings.Split(symbol, "_")[1]
-	store := h.userdataStore
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_GENDER, []byte(gender))
-	if err != nil {
-		return res, nil
+		}
+		store := h.userdataStore
+		err = store.WriteEntry(ctx, sessionId, utils.DATA_GENDER, []byte(gender))
+		if err != nil {
+			return res, nil
+		}
 	}

 	return res, nil
@@ -523,7 +560,9 @@ func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (res
 // ResetIncorrectPin resets the incorrect pin flag  after a new PIN attempt.
 func (h *Handlers) ResetIncorrectPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
+
 	flag_incorrect_pin, _ := h.flagManager.GetFlag("flag_incorrect_pin")
+
 	res.FlagReset = append(res.FlagReset, flag_incorrect_pin)
 	return res, nil
 }
@@ -535,7 +574,6 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b

 	flag_account_success, _ := h.flagManager.GetFlag("flag_account_success")
 	flag_account_pending, _ := h.flagManager.GetFlag("flag_account_pending")
-	flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")

 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
@@ -547,23 +585,18 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
 		return res, err
 	}

-	accountStatus, err := h.accountService.CheckAccountStatus(string(trackingId))
+	status, err := h.accountService.CheckAccountStatus(string(trackingId))
 	if err != nil {
 		fmt.Println("Error checking account status:", err)
 		return res, err
 	}
-	if !accountStatus.Ok {
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		return res, err
-	}
-	res.FlagReset = append(res.FlagReset, flag_api_error)
-	status := accountStatus.Result.Transaction.Status

 	err = store.WriteEntry(ctx, sessionId, utils.DATA_ACCOUNT_STATUS, []byte(status))
 	if err != nil {
 		return res, nil
 	}
-	if accountStatus.Result.Transaction.Status == "SUCCESS" {
+
+	if status == "SUCCESS" {
 		res.FlagSet = append(res.FlagSet, flag_account_success)
 		res.FlagReset = append(res.FlagReset, flag_account_pending)
 	} else {
@@ -643,8 +676,6 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 	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")
@@ -656,60 +687,15 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 		return res, err
 	}

-	balanceResponse, err := h.accountService.CheckBalance(string(publicKey))
+	balance, err := h.accountService.CheckBalance(string(publicKey))
 	if err != nil {
 		return res, nil
 	}
-	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
 	res.Content = balance

 	return res, nil
 }

-func (h *Handlers) FetchCustodialBalances(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
-
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-	symbol, _ := h.st.Where()
-	balanceType := strings.Split(symbol, "_")[0]
-
-	store := h.userdataStore
-	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
-	if err != nil {
-		return res, err
-	}
-
-	balanceResponse, err := h.accountService.CheckBalance(string(publicKey))
-	if err != nil {
-		return res, nil
-	}
-	if !balanceResponse.Ok {
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		return res, nil
-	}
-	res.FlagReset = append(res.FlagReset, flag_api_error)
-	balance := balanceResponse.Result.Balance
-
-	switch balanceType {
-	case "my":
-		res.Content = fmt.Sprintf("Your balance is %s", balance)
-	case "community":
-		res.Content = fmt.Sprintf("Your community balance is %s", balance)
-	default:
-		break
-	}
-	return res, nil
-}
-
 // ValidateRecipient validates that the given input is a valid phone number.
 func (h *Handlers) ValidateRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
@@ -806,11 +792,10 @@ func (h *Handlers) MaxAmount(ctx context.Context, sym string, input []byte) (res
 	store := h.userdataStore
 	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)

-	balanceResp, err := h.accountService.CheckBalance(string(publicKey))
+	balance, err := h.accountService.CheckBalance(string(publicKey))
 	if err != nil {
 		return res, nil
 	}
-	balance := balanceResp.Result.Balance

 	res.Content = balance

@@ -829,25 +814,18 @@ func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte)
 	}

 	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)

 	amountStr := string(input)

-	balanceRes, err := h.accountService.CheckBalance(string(publicKey))
-	balanceStr := balanceRes.Result.Balance
+	balanceStr, err := h.accountService.CheckBalance(string(publicKey))

-	if !balanceRes.Ok {
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		return res, nil
-	}
 	if err != nil {
 		return res, err
 	}
 	res.Content = balanceStr
-	res.FlagReset = append(res.FlagReset, flag_api_error)

 	// Parse the balance
 	balanceParts := strings.Split(balanceStr, " ")
@@ -939,6 +917,36 @@ func (h *Handlers) GetAmount(ctx context.Context, sym string, input []byte) (res
 	return res, nil
 }

+// QuickWithBalance retrieves the balance for a given public key from the custodial balance API endpoint before
+// gracefully exiting the session.
+func (h *Handlers) QuitWithBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	var err error
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
+
+	code := codeFromCtx(ctx)
+	l := gotext.NewLocale(translationDir, code)
+	l.AddDomain("default")
+
+	store := h.userdataStore
+	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
+	if err != nil {
+		return res, err
+	}
+	balance, err := h.accountService.CheckBalance(string(publicKey))
+	if err != nil {
+		return res, nil
+	}
+	res.Content = l.Get("Your account balance is %s", balance)
+	res.FlagReset = append(res.FlagReset, flag_account_authorized)
+	return res, nil
+}
+
 // InitiateTransaction returns a confirmation and resets the transaction data
 // on the gdbm store.
 func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []byte) (resource.Result, error) {
@@ -972,6 +980,7 @@ func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []
 	return res, nil
 }

+// GetProfileInfo retrieves and formats the profile information of a user from a Gdbm backed storage.
 func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	var defaultValue string
@@ -979,11 +988,10 @@ func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-	language, ok := ctx.Value("Language").(lang.Language)
-	if !ok {
-		return res, fmt.Errorf("value for 'Language' is not of type lang.Language")
-	}
-	code := language.Code
+
+	code := h.st.Language.Code
+
+	// Default value when an entry is not found
 	if code == "swa" {
 		defaultValue = "Haipo"
 	} else {
@@ -1025,7 +1033,7 @@ func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte)
 			return res, fmt.Errorf("invalid year of birth: %v", err)
 		}
 	}
-	switch language.Code {
+	switch code {
 	case "eng":
 		res.Content = fmt.Sprintf(
 			"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
@@ -1042,6 +1050,5 @@ func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte)
 			name, gender, age, location, offerings,
 		)
 	}
-
 	return res, nil
 }
--- a/internal/handlers/ussd/menuhandler_test.go
+++ b/internal/handlers/ussd/menuhandler_test.go
@@ -7,15 +7,11 @@ import (
 	"log"
 	"path"
 	"testing"
-	"time"

-	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/db"
-	"git.defalsify.org/vise.git/lang"
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
 	"git.defalsify.org/vise.git/state"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/mocks"
 	"git.grassecon.net/urdt/ussd/internal/models"
 	"git.grassecon.net/urdt/ussd/internal/utils"
@@ -29,46 +25,10 @@ var (
 	flagsPath = path.Join(baseDir, "services", "registration", "pp.csv")
 )

-func TestNewHandlers(t *testing.T) {
-	fm, err := NewFlagManager(flagsPath)
-	accountService := server.TestAccountService{}
-	if err != nil {
-		t.Logf(err.Error())
-	}
-	t.Run("Valid UserDataStore", func(t *testing.T) {
-		mockStore := &mocks.MockUserDataStore{}
-		handlers, err := NewHandlers(fm.parser, mockStore, &accountService)
-		if err != nil {
-			t.Fatalf("expected no error, got %v", err)
-		}
-		if handlers == nil {
-			t.Fatal("expected handlers to be non-nil")
-		}
-		if handlers.userdataStore == nil {
-			t.Fatal("expected userdataStore to be set in handlers")
-		}
-	})
-
-	// Test case for nil userdataStore
-	t.Run("Nil UserDataStore", func(t *testing.T) {
-		appFlags := &asm.FlagParser{}
-
-		handlers, err := NewHandlers(appFlags, nil, &accountService)
-
-		if err == nil {
-			t.Fatal("expected an error, got none")
-		}
-		if handlers != nil {
-			t.Fatal("expected handlers to be nil")
-		}
-		if err.Error() != "cannot create handler with nil userdata store" {
-			t.Fatalf("expected specific error, got %v", err)
-		}
-	})
-}
-
 func TestCreateAccount(t *testing.T) {
+
 	fm, err := NewFlagManager(flagsPath)
+
 	if err != nil {
 		t.Logf(err.Error())
 	}
@@ -136,26 +96,12 @@ func TestCreateAccount(t *testing.T) {
 	mockDataStore.AssertExpectations(t)
 }

-func TestWithPersister(t *testing.T) {
-	// Test case: Setting a persister
-	h := &Handlers{}
-	p := &persist.Persister{}
-
-	result := h.WithPersister(p)
-
-	assert.Equal(t, p, h.pe, "The persister should be set correctly.")
-	assert.Equal(t, h, result, "The returned handler should be the same instance.")
-}
-
-func TestWithPersister_PanicWhenAlreadySet(t *testing.T) {
-	// Test case: Panic on multiple calls
-	h := &Handlers{pe: &persist.Persister{}}
-	require.Panics(t, func() {
-		h.WithPersister(&persist.Persister{})
-	}, "Should panic when trying to set a persister again.")
-}
-
 func TestSaveFirstname(t *testing.T) {
+
+	fm, err := NewFlagManager(flagsPath)
+	if err != nil {
+		t.Fatal(err)
+	}
 	// Create a new instance of MockMyDataStore
 	mockStore := new(mocks.MockUserDataStore)

@@ -164,12 +110,16 @@ func TestSaveFirstname(t *testing.T) {
 	firstName := "John"
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)

+	flag_allow_update, _ := fm.parser.GetFlag("flag_allow_update")
+	flag_single_edit, _ := fm.parser.GetFlag("flag_single_edit")
+
 	// Set up the expected behavior of the mock
 	mockStore.On("WriteEntry", ctx, sessionId, utils.DATA_FIRST_NAME, []byte(firstName)).Return(nil)

 	// Create the Handlers instance with the mock store
 	h := &Handlers{
 		userdataStore: mockStore,
+		flagManager:   fm.parser,
 	}

 	// Call the method
@@ -177,7 +127,10 @@ func TestSaveFirstname(t *testing.T) {

 	// Assert results
 	assert.NoError(t, err)
-	assert.Equal(t, resource.Result{}, res)
+	assert.Equal(t, resource.Result{
+		FlagSet:   []uint32{flag_single_edit},
+		FlagReset: []uint32{flag_allow_update},
+	}, res)

 	// Assert all expectations were met
 	mockStore.AssertExpectations(t)
@@ -356,7 +309,6 @@ func TestSaveOfferings(t *testing.T) {
 func TestSaveGender(t *testing.T) {
 	// Create a new instance of MockMyDataStore
 	mockStore := new(mocks.MockUserDataStore)
-	mockState := state.NewState(16)

 	// Define the session ID and context
 	sessionId := "session123"
@@ -364,32 +316,34 @@ func TestSaveGender(t *testing.T) {

 	// Define test cases
 	tests := []struct {
-		name            string
-		input           []byte
-		expectedGender  string
-		expectCall      bool
-		executingSymbol string
+		name           string
+		input          []byte
+		expectedGender string
+		expectCall     bool
 	}{
 		{
-			name:            "Valid Male Input",
-			input:           []byte("1"),
-			expectedGender:  "male",
-			executingSymbol: "set_male",
-			expectCall:      true,
+			name:           "Valid Male Input",
+			input:          []byte("1"),
+			expectedGender: "Male",
+			expectCall:     true,
 		},
 		{
-			name:            "Valid Female Input",
-			input:           []byte("2"),
-			expectedGender:  "female",
-			executingSymbol: "set_female",
-			expectCall:      true,
+			name:           "Valid Female Input",
+			input:          []byte("2"),
+			expectedGender: "Female",
+			expectCall:     true,
 		},
 		{
-			name:            "Valid Unspecified Input",
-			input:           []byte("3"),
-			executingSymbol: "set_unspecified",
-			expectedGender:  "unspecified",
-			expectCall:      true,
+			name:           "Valid Unspecified Input",
+			input:          []byte("3"),
+			expectedGender: "Unspecified",
+			expectCall:     true,
+		},
+		{
+			name:           "Empty Input",
+			input:          []byte(""),
+			expectedGender: "",
+			expectCall:     false,
 		},
 	}

@@ -402,11 +356,10 @@ func TestSaveGender(t *testing.T) {
 			} else {
 				mockStore.On("WriteEntry", ctx, sessionId, utils.DATA_GENDER, []byte(tt.expectedGender)).Return(nil)
 			}
-			mockState.ExecPath = append(mockState.ExecPath, tt.executingSymbol)
+
 			// Create the Handlers instance with the mock store
 			h := &Handlers{
 				userdataStore: mockStore,
-				st:            mockState,
 			}

 			// Call the method
@@ -482,10 +435,7 @@ func TestMaxAmount(t *testing.T) {
 	sessionId := "session123"
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 	publicKey := "0xcasgatweksalw1018221"
-
-	expectedBalance := &models.BalanceResponse{
-		Ok: true,
-	}
+	expectedBalance := "0.003CELO"

 	// Set up the expected behavior of the mock
 	mockStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return([]byte(publicKey), nil)
@@ -501,7 +451,7 @@ func TestMaxAmount(t *testing.T) {
 	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)
+	assert.Equal(t, expectedBalance, res.Content)

 }

@@ -580,10 +530,12 @@ func TestGetRecipient(t *testing.T) {
 func TestGetFlag(t *testing.T) {
 	fm, err := NewFlagManager(flagsPath)
 	expectedFlag := uint32(9)
+
 	if err != nil {
 		t.Logf(err.Error())
 	}
 	flag, err := fm.GetFlag("flag_account_created")
+
 	if err != nil {
 		t.Logf(err.Error())
 	}
@@ -603,10 +555,12 @@ func TestSetLanguage(t *testing.T) {
 		name           string
 		execPath       []string
 		expectedResult resource.Result
+		symbol         string
 	}{
 		{
 			name:     "Set Default Language (English)",
 			execPath: []string{"set_eng"},
+			symbol:   "set_eng",
 			expectedResult: resource.Result{
 				FlagSet: []uint32{state.FLAG_LANG, 8},
 				Content: "eng",
@@ -614,6 +568,7 @@ func TestSetLanguage(t *testing.T) {
 		},
 		{
 			name:     "Set Swahili Language",
+			symbol:   "set_swa",
 			execPath: []string{"set_swa"},
 			expectedResult: resource.Result{
 				FlagSet: []uint32{state.FLAG_LANG, 8},
@@ -635,7 +590,7 @@ func TestSetLanguage(t *testing.T) {
 			}

 			// Call the method
-			res, err := h.SetLanguage(context.Background(), "set_language", nil)
+			res, err := h.SetLanguage(context.Background(), tt.symbol, nil)

 			if err != nil {
 				t.Error(err)
@@ -647,6 +602,76 @@ func TestSetLanguage(t *testing.T) {
 		})
 	}
 }
+
+func TestSetResetSingleEdit(t *testing.T) {
+	fm, err := NewFlagManager(flagsPath)
+
+	//flag_allow_update, _ := fm.parser.GetFlag("flag_allow_update")
+	flag_single_edit, _ := fm.parser.GetFlag("flag_single_edit")
+
+	if err != nil {
+		log.Fatal(err)
+	}
+	// Define test cases
+	tests := []struct {
+		name           string
+		input          []byte
+		expectedResult resource.Result
+	}{
+		// {
+		// 	name:  "Set single Edit",
+		// 	input: []byte("2"),
+		// 	expectedResult: resource.Result{
+		// 		FlagSet:   []uint32{flag_single_edit},
+		// 		FlagReset: []uint32{flag_allow_update},
+		// 	},
+		// },
+		// {
+		// 	name:  "Set single Edit",
+		// 	input: []byte("3"),
+		// 	expectedResult: resource.Result{
+		// 		FlagSet:   []uint32{flag_single_edit},
+		// 		FlagReset: []uint32{flag_allow_update},
+		// 	},
+		// },
+		// {
+		// 	name:  "Set single edit",
+		// 	input: []byte("4"),
+		// 	expectedResult: resource.Result{
+		// 		FlagReset: []uint32{flag_allow_update},
+		// 		FlagSet:   []uint32{flag_single_edit},
+		// 	},
+		// },
+		{
+			name:  "No single edit set",
+			input: []byte("1"),
+			expectedResult: resource.Result{
+				FlagReset: []uint32{flag_single_edit},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+
+			// Create the Handlers instance with the mock flag manager
+			h := &Handlers{
+				flagManager: fm.parser,
+			}
+
+			// Call the method
+			res, err := h.SetResetSingleEdit(context.Background(), "set_reset_single_edit", tt.input)
+
+			if err != nil {
+				t.Error(err)
+			}
+			// Assert that the Result FlagSet has the required flags after language switch
+			assert.Equal(t, res, tt.expectedResult, "Flags should match reset edit")
+
+		})
+	}
+}
+
 func TestResetAllowUpdate(t *testing.T) {
 	fm, err := NewFlagManager(flagsPath)

@@ -1053,109 +1078,61 @@ func TestVerifyPin(t *testing.T) {

 func TestCheckAccountStatus(t *testing.T) {
 	fm, err := NewFlagManager(flagsPath)
+
 	if err != nil {
 		t.Logf(err.Error())
 	}
+	mockDataStore := new(mocks.MockUserDataStore)
+	mockCreateAccountService := new(mocks.MockAccountService)
+
 	sessionId := "session123"
 	flag_account_success, _ := fm.GetFlag("flag_account_success")
 	flag_account_pending, _ := fm.GetFlag("flag_account_pending")
-	flag_api_error, _ := fm.GetFlag("flag_api_call_error")

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

+	h := &Handlers{
+		userdataStore:  mockDataStore,
+		accountService: mockCreateAccountService,
+		flagManager:    fm.parser,
+	}
 	tests := []struct {
 		name           string
 		input          []byte
-		response       *models.TrackStatusResponse
+		status         string
 		expectedResult resource.Result
 	}{
 		{
-			name:  "Test when account status is Success",
-			input: []byte("TrackingId1234"),
-			response: &models.TrackStatusResponse{
-				Ok: true,
-				Result: struct {
-					Transaction struct {
-						CreatedAt     time.Time   "json:\"createdAt\""
-						Status        string      "json:\"status\""
-						TransferValue json.Number "json:\"transferValue\""
-						TxHash        string      "json:\"txHash\""
-						TxType        string      "json:\"txType\""
-					}
-				}{
-					Transaction: models.Transaction{
-						CreatedAt:     time.Now(),
-						Status:        "SUCCESS",
-						TransferValue: json.Number("0.5"),
-						TxHash:        "0x123abc456def",
-						TxType:        "transfer",
-					},
-				},
-			},
+			name:   "Test when account status is Success",
+			input:  []byte("TrackingId1234"),
+			status: "SUCCESS",
 			expectedResult: resource.Result{
 				FlagSet:   []uint32{flag_account_success},
-				FlagReset: []uint32{flag_api_error, flag_account_pending},
+				FlagReset: []uint32{flag_account_pending},
 			},
 		},
 		{
-			name:  "Test when fetching  account status is not  Success",
-			input: []byte("TrackingId1234"),
-			response: &models.TrackStatusResponse{
-				Ok: false,
-			},
+			name:   "Test when account status is not a success",
+			input:  []byte("TrackingId12"),
+			status: "REVERTED",
 			expectedResult: resource.Result{
-				FlagSet: []uint32{flag_api_error},
-			},
-		},
-		{
-			name:  "Test when checking account status api call is a SUCCESS but an account is not yet ready",
-			input: []byte("TrackingId1234"),
-			response: &models.TrackStatusResponse{
-				Ok: true,
-				Result: struct {
-					Transaction struct {
-						CreatedAt     time.Time   "json:\"createdAt\""
-						Status        string      "json:\"status\""
-						TransferValue json.Number "json:\"transferValue\""
-						TxHash        string      "json:\"txHash\""
-						TxType        string      "json:\"txType\""
-					}
-				}{
-					Transaction: models.Transaction{
-						CreatedAt:     time.Now(),
-						Status:        "IN_NETWORK",
-						TransferValue: json.Number("0.5"),
-						TxHash:        "0x123abc456def",
-						TxType:        "transfer",
-					},
-				},
-			},
-			expectedResult: resource.Result{
-				FlagSet:   []uint32{flag_account_pending},
-				FlagReset: []uint32{flag_api_error, flag_account_success},
+				FlagSet:   []uint32{flag_account_success},
+				FlagReset: []uint32{flag_account_pending},
 			},
 		},
 	}
+
+	typ := utils.DATA_TRACKING_ID
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			mockDataStore := new(mocks.MockUserDataStore)
-			mockCreateAccountService := new(mocks.MockAccountService)
+			mockCreateAccountService.On("CheckAccountStatus", string(tt.input)).Return(tt.status, nil)

-			h := &Handlers{
-				userdataStore:  mockDataStore,
-				accountService: mockCreateAccountService,
-				flagManager:    fm.parser,
-			}
-
-			status := tt.response.Result.Transaction.Status
+			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_ACCOUNT_STATUS, []byte(tt.status)).Return(nil).Maybe()
 			// Define expected interactions with the mock
-			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_TRACKING_ID).Return(tt.input, nil)
-
-			mockCreateAccountService.On("CheckAccountStatus", string(tt.input)).Return(tt.response, nil)
-			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_ACCOUNT_STATUS, []byte(status)).Return(nil).Maybe()
+			mockDataStore.On("ReadEntry", ctx, sessionId, typ).Return(tt.input, nil)

 			// Call the method under test
-			res, _ := h.CheckAccountStatus(ctx, "check_account_status", tt.input)
+			res, _ := h.CheckAccountStatus(ctx, "check_status", tt.input)

 			// Assert that no errors occurred
 			assert.NoError(t, err)
@@ -1455,14 +1432,14 @@ func TestIsValidPIN(t *testing.T) {
 	}
 }

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

 	if err != nil {
 		t.Logf(err.Error())
 	}
-	flag_invalid_amount, _ := fm.parser.GetFlag("flag_invalid_amount")
-	flag_api_error, _ := fm.GetFlag("flag_api_call_error")
+	flag_account_authorized, _ := fm.parser.GetFlag("flag_account_authorized")
+
 	mockDataStore := new(mocks.MockUserDataStore)
 	mockCreateAccountService := new(mocks.MockAccountService)

@@ -1476,69 +1453,19 @@ func TestValidateAmount(t *testing.T) {
 		flagManager:    fm.parser,
 	}
 	tests := []struct {
-		name            string
-		input           []byte
-		publicKey       []byte
-		balanceResponse *models.BalanceResponse
-		expectedResult  resource.Result
+		name           string
+		input          []byte
+		publicKey      []byte
+		balance        string
+		expectedResult resource.Result
 	}{
 		{
-			name:  "Test with valid amount",
-			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"),
-				},
-			},
+			name:      "Test quit with balance",
+			balance:   "0.02CELO",
 			publicKey: []byte("0xrqeqrequuq"),
 			expectedResult: resource.Result{
-				Content:   "0.001",
-				FlagReset: []uint32{flag_api_error},
-			},
-		},
-		{
-			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},
-				FlagReset: []uint32{flag_api_error},
-				Content:   "0.02",
-			},
-		},
-		{
-			name:  "Test with invalid amount",
-			input: []byte("0.02ms"),
-			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",
+				FlagReset: []uint32{flag_account_authorized},
+				Content:   fmt.Sprintf("Your account balance is %s", "0.02CELO"),
 			},
 		},
 	}
@@ -1547,7 +1474,86 @@ func TestValidateAmount(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {

 			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return(tt.publicKey, nil)
-			mockCreateAccountService.On("CheckBalance", string(tt.publicKey)).Return(tt.balanceResponse, nil)
+			mockCreateAccountService.On("CheckBalance", string(tt.publicKey)).Return(tt.balance, nil)
+
+			// Call the method under test
+			res, _ := h.QuitWithBalance(ctx, "test_quit_with_balance", tt.input)
+
+			// Assert that no errors occurred
+			assert.NoError(t, err)
+
+			//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 that expectations were met
+			mockDataStore.AssertExpectations(t)
+
+		})
+	}
+}
+
+func TestValidateAmount(t *testing.T) {
+	fm, err := NewFlagManager(flagsPath)
+
+	if err != nil {
+		t.Logf(err.Error())
+	}
+	flag_invalid_amount, _ := fm.parser.GetFlag("flag_invalid_amount")
+	mockDataStore := new(mocks.MockUserDataStore)
+	mockCreateAccountService := new(mocks.MockAccountService)
+
+	sessionId := "session123"
+
+	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
+
+	h := &Handlers{
+		userdataStore:  mockDataStore,
+		accountService: mockCreateAccountService,
+		flagManager:    fm.parser,
+	}
+	tests := []struct {
+		name           string
+		input          []byte
+		publicKey      []byte
+		balance        string
+		expectedResult resource.Result
+	}{
+		{
+			name:      "Test with valid amount",
+			input:     []byte("0.001"),
+			balance:   "0.003 CELO",
+			publicKey: []byte("0xrqeqrequuq"),
+			expectedResult: resource.Result{
+				Content: "0.001",
+			},
+		},
+		{
+			name:      "Test with amount larger than balance",
+			input:     []byte("0.02"),
+			balance:   "0.003 CELO",
+			publicKey: []byte("0xrqeqrequuq"),
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_invalid_amount},
+				Content: "0.02",
+			},
+		},
+		{
+			name:      "Test with invalid amount",
+			input:     []byte("0.02ms"),
+			balance:   "0.003 CELO",
+			publicKey: []byte("0xrqeqrequuq"),
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_invalid_amount},
+				Content: "0.02ms",
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+
+			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return(tt.publicKey, nil)
+			mockCreateAccountService.On("CheckBalance", string(tt.publicKey)).Return(tt.balance, nil)
 			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_AMOUNT, tt.input).Return(nil).Maybe()

 			// Call the method under test
@@ -1626,83 +1632,30 @@ func TestValidateRecipient(t *testing.T) {

 func TestCheckBalance(t *testing.T) {

+	mockDataStore := new(mocks.MockUserDataStore)
 	sessionId := "session123"
 	publicKey := "0X13242618721"
-	fm, _ := NewFlagManager(flagsPath)
-	flag_api_error, _ := fm.GetFlag("flag_api_call_error")
+	balance := "0.003 CELO"
+
+	expectedResult := resource.Result{
+		Content: "0.003 CELO",
+	}
+
+	mockCreateAccountService := new(mocks.MockAccountService)

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

-	tests := []struct {
-		name           string
-		balanceResonse *models.BalanceResponse
-		expectedResult resource.Result
-	}{
-		{
-			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:   "0.003 CELO",
-				FlagReset: []uint32{flag_api_error},
-			},
-		},
+	h := &Handlers{
+		userdataStore:  mockDataStore,
+		accountService: mockCreateAccountService,
 	}
+	//mock call operations
+	mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return([]byte(publicKey), nil)
+	mockCreateAccountService.On("CheckBalance", string(publicKey)).Return(balance, nil)

-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
+	res, _ := h.CheckBalance(ctx, "check_balance", []byte("123456"))

-			mockDataStore := new(mocks.MockUserDataStore)
-			mockCreateAccountService := new(mocks.MockAccountService)
-			mockState := state.NewState(16)
-
-			// Create the Handlers instance with the mock store
-			h := &Handlers{
-				userdataStore:  mockDataStore,
-				flagManager:    fm.parser,
-				st:             mockState,
-				accountService: mockCreateAccountService,
-			}
-
-			// 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)
-
-			// Call the method
-			res, _ := h.CheckBalance(ctx, "check_balance", []byte(""))
-
-			// Assert that expectations were met
-			mockDataStore.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")
-
-		})
-	}
+	assert.Equal(t, res, expectedResult, "Result should contain flag(s) that have been reset")

 }

@@ -1719,6 +1672,7 @@ func TestGetProfile(t *testing.T) {
 		accountService: mockCreateAccountService,
 		st:             mockState,
 	}
+	ctx := context.WithValue(context.Background(), "SessionId", sessionId)

 	tests := []struct {
 		name         string
@@ -1742,7 +1696,7 @@ func TestGetProfile(t *testing.T) {
 		{
 			name:         "Test with with profile information in swa ",
 			keys:         []utils.DataTyp{utils.DATA_FAMILY_NAME, utils.DATA_FIRST_NAME, utils.DATA_GENDER, utils.DATA_OFFERINGS, utils.DATA_LOCATION, utils.DATA_YOB},
-			profileInfo:  []string{"Doee", "John", "Male", "Bananas", "Kilifi", "1976"},
+			profileInfo:  []string{"Doee", "John", "Jinsia", "Bananas", "Kilifi", "1976"},
 			languageCode: "swa",
 			result: resource.Result{
 				Content: fmt.Sprintf(
@@ -1754,7 +1708,7 @@ func TestGetProfile(t *testing.T) {
 		{
 			name:         "Test with with profile information with language that is not yet supported",
 			keys:         []utils.DataTyp{utils.DATA_FAMILY_NAME, utils.DATA_FIRST_NAME, utils.DATA_GENDER, utils.DATA_OFFERINGS, utils.DATA_LOCATION, utils.DATA_YOB},
-			profileInfo:  []string{"Doee", "John", "Male", "Bananas", "Kilifi", "1976"},
+			profileInfo:  []string{"Doee", "John", "Jinsia", "Bananas", "Kilifi", "1976"},
 			languageCode: "nor",
 			result: resource.Result{
 				Content: fmt.Sprintf(
@@ -1766,14 +1720,16 @@ func TestGetProfile(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			ctx := context.WithValue(context.Background(), "SessionId", sessionId)
-			ctx = context.WithValue(ctx, "Language", lang.Language{
-				Code: tt.languageCode,
-			})
 			for index, key := range tt.keys {
-				mockDataStore.On("ReadEntry", ctx, sessionId, key).Return([]byte(tt.profileInfo[index]), nil).Maybe()
+				mockDataStore.On("ReadEntry", ctx, sessionId, key).Return([]byte(tt.profileInfo[index]), nil)
 			}

+			err := mockState.SetLanguage(tt.languageCode)
+			if err != nil {
+				t.Fail()
+			}
+			h.st = mockState
+
 			res, _ := h.GetProfileInfo(ctx, "get_profile_info", []byte(""))

 			// Assert that expectations were met
@@ -1881,6 +1837,25 @@ func TestSaveTemporaryPIn(t *testing.T) {
 	mockStore.AssertExpectations(t)
 }

+func TestWithPersister(t *testing.T) {
+	// Test case: Setting a persister
+	h := &Handlers{}
+	p := &persist.Persister{}
+
+	result := h.WithPersister(p)
+
+	assert.Equal(t, p, h.pe, "The persister should be set correctly.")
+	assert.Equal(t, h, result, "The returned handler should be the same instance.")
+}
+
+func TestWithPersister_PanicWhenAlreadySet(t *testing.T) {
+	// Test case: Panic on multiple calls
+	h := &Handlers{pe: &persist.Persister{}}
+	require.Panics(t, func() {
+		h.WithPersister(&persist.Persister{})
+	}, "Should panic when trying to set a persister again.")
+}
+
 func TestConfirmPin(t *testing.T) {
 	sessionId := "session123"

@@ -1930,85 +1905,3 @@ func TestConfirmPin(t *testing.T) {
 	}

 }
-
-func TestFetchCustodialBalances(t *testing.T) {
-	fm, err := NewFlagManager(flagsPath)
-	if err != nil {
-		t.Logf(err.Error())
-	}
-	flag_api_error, _ := fm.GetFlag("flag_api_call_error")
-
-	// Define test data
-	sessionId := "session123"
-	publicKey := "0X13242618721"
-	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
-
-	tests := []struct {
-		name           string
-		balanceResonse *models.BalanceResponse
-		expectedResult resource.Result
-	}{
-		{
-			name: "Test when fetch custodial balances 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 fetch custodial balances 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{
-				FlagReset: []uint32{flag_api_error},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-
-			mockDataStore := new(mocks.MockUserDataStore)
-			mockCreateAccountService := new(mocks.MockAccountService)
-			mockState := state.NewState(16)
-
-			// Create the Handlers instance with the mock store
-			h := &Handlers{
-				userdataStore:  mockDataStore,
-				flagManager:    fm.parser,
-				st:             mockState,
-				accountService: mockCreateAccountService,
-			}
-
-			// 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)
-
-			// Call the method
-			res, _ := h.FetchCustodialBalances(ctx, "fetch_custodial_balances", []byte(""))
-
-			// Assert that expectations were met
-			mockDataStore.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")
-
-		})
-	}
-}
--- a/internal/mocks/servicemock.go
+++ b/internal/mocks/servicemock.go
@@ -15,12 +15,12 @@ func (m *MockAccountService) CreateAccount() (*models.AccountResponse, error) {
 	return args.Get(0).(*models.AccountResponse), args.Error(1)
 }

-func (m *MockAccountService) CheckBalance(publicKey string) (*models.BalanceResponse, error) {
+func (m *MockAccountService) CheckBalance(publicKey string) (string, error) {
 	args := m.Called(publicKey)
-	return args.Get(0).(*models.BalanceResponse), args.Error(1)
+	return args.String(0), args.Error(1)
 }

-func (m *MockAccountService) CheckAccountStatus(trackingId string) (*models.TrackStatusResponse, error) {
+func (m *MockAccountService) CheckAccountStatus(trackingId string) (string, error) {
 	args := m.Called(trackingId)
-	return args.Get(0).(*models.TrackStatusResponse), args.Error(1)
+	return args.String(0), args.Error(1)
 }
--- a/internal/models/trackstatusresponse.go
+++ b/internal/models/trackstatusresponse.go
@@ -5,13 +5,6 @@ import (
 	"time"
 )

-type Transaction struct {
-	CreatedAt     time.Time   `json:"createdAt"`
-	Status        string      `json:"status"`
-	TransferValue json.Number `json:"transferValue"`
-	TxHash        string      `json:"txHash"`
-	TxType        string      `json:"txType"`
-}

 type TrackStatusResponse struct {
 	Ok     bool `json:"ok"`
@@ -24,4 +17,4 @@ type TrackStatusResponse struct {
 			TxType        string      `json:"txType"`
 		}
 	} `json:"result"`
-}
+}
--- a/internal/storage/db.go
+++ b/internal/storage/db.go
@@ -1,43 +0,0 @@
-package storage
-
-import (
-	"context"
-
-	"git.defalsify.org/vise.git/db"
-)
-
-const (
-	DATATYPE_USERSUB = 64
-)
-
-type SubPrefixDb struct {
-	store db.Db
-	pfx []byte
-}
-
-func NewSubPrefixDb(store db.Db, pfx []byte) *SubPrefixDb {
-	return &SubPrefixDb{
-		store: store,
-		pfx: pfx,
-	}
-}
-
-func(s *SubPrefixDb) toKey(k []byte) []byte {
-        return append(s.pfx, k...)
-}
-
-func(s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
-        s.store.SetPrefix(DATATYPE_USERSUB)
-	key = s.toKey(key)
-        v, err := s.store.Get(ctx, key)
-        if err != nil {
-                return nil, err
-        }
-        return v, nil
-}
-
-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/storage/db_test.go
+++ b/internal/storage/db_test.go
@@ -1,54 +0,0 @@
-package storage
-
-import (
-	"bytes"
-	"context"
-	"testing"
-
-	memdb "git.defalsify.org/vise.git/db/mem"
-)
-
-func TestSubPrefix(t *testing.T) {
-	ctx := context.Background()
-	db := memdb.NewMemDb()
-	err := db.Connect(ctx, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	sdba := NewSubPrefixDb(db, []byte("tinkywinky"))
-	err = sdba.Put(ctx, []byte("foo"), []byte("dipsy"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	r, err := sdba.Get(ctx, []byte("foo"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !bytes.Equal(r, []byte("dipsy")) {
-		t.Fatalf("expected 'dipsy', got %s", r)
-	}
-
-	sdbb := NewSubPrefixDb(db, []byte("lala"))
-	r, err = sdbb.Get(ctx, []byte("foo"))
-	if err == nil {
-		t.Fatal("expected not found")
-	}
-
-	err = sdbb.Put(ctx, []byte("foo"), []byte("pu"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	r, err = sdbb.Get(ctx, []byte("foo"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !bytes.Equal(r, []byte("pu")) {
-		t.Fatalf("expected 'pu', got %s", r)
-	}
-
-	r, err = sdba.Get(ctx, []byte("foo"))
-	if !bytes.Equal(r, []byte("dipsy")) {
-		t.Fatalf("expected 'dipsy', got %s", r)
-	}
-}
--- a/internal/storage/gdbm.go
+++ b/internal/storage/gdbm.go
@@ -109,7 +109,6 @@ func(tdb *ThreadGdbmDb) Get(ctx context.Context, key []byte) ([]byte, error) {
 func(tdb *ThreadGdbmDb) Close() error {
 	tdb.reserve()
 	close(dbC[tdb.connStr])
-	delete(dbC, tdb.connStr)
 	err := tdb.db.Close()
 	tdb.db = nil
 	return err
--- a/internal/storage/storage.go
+++ b/internal/storage/storage.go
@@ -5,6 +5,10 @@ import (
 	"git.defalsify.org/vise.git/persist"
 )

+const (
+	DATATYPE_CUSTOM = 128 
+)
+
 type Storage struct {
 	Persister *persist.Persister
 	UserdataDb db.Db	
--- a/internal/testutil/TestEngine.go
+++ b/internal/testutil/TestEngine.go
@@ -1,121 +0,0 @@
-package testutil
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path"
-	"time"
-
-	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/logging"
-	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
-	"git.grassecon.net/urdt/ussd/internal/storage"
-	testdataloader "github.com/peteole/testdata-loader"
-)
-
-var (
-	baseDir   = testdataloader.GetBasePath()
-	logg      = logging.NewVanilla()
-	scriptDir = path.Join(baseDir, "services", "registration")
-)
-
-func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
-	ctx := context.Background()
-	ctx = context.WithValue(ctx, "SessionId", sessionId)
-	pfp := path.Join(scriptDir, "pp.csv")
-
-	var eventChannel = make(chan bool)
-
-	cfg := engine.Config{
-		Root:       "root",
-		SessionId:  sessionId,
-		OutputSize: uint32(160),
-		FlagCount:  uint32(128),
-	}
-
-	dbDir := ".test_state"
-	resourceDir := scriptDir
-	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
-
-	err := menuStorageService.EnsureDbDir()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	rs, err := menuStorageService.GetResource(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	pe, err := menuStorageService.GetPersister(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	userDataStore, err := menuStorageService.GetUserdataDb(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	dbResource, ok := rs.(*resource.DbResource)
-	if !ok {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
-	lhs.SetDataStore(&userDataStore)
-	lhs.SetPersister(pe)
-
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	if AccountService == nil {
-		AccountService = &server.AccountService{}
-	}
-
-	switch AccountService.(type) {
-	case *server.TestAccountService:
-		go func() {
-			eventChannel <- false
-		}()
-	case *server.AccountService:
-		go func() {
-			time.Sleep(5 * time.Second) // Wait for 5 seconds
-			eventChannel <- true
-		}()
-	default:
-		panic("Unknown account service type")
-	}
-
-	hl, err := lhs.GetHandler(AccountService)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	en := lhs.GetEngine()
-	en = en.WithFirst(hl.Init)
-	cleanFn := func() {
-		err := en.Finish()
-		if err != nil {
-			logg.Errorf(err.Error())
-		}
-
-		err = menuStorageService.Close()
-		if err != nil {
-			logg.Errorf(err.Error())
-		}
-		logg.Infof("testengine storage closed")
-	}
-	return en, cleanFn, eventChannel
-}
--- a/internal/testutil/offlinetest.go
+++ b/internal/testutil/offlinetest.go
@@ -1,11 +0,0 @@
-// +build !online
-
-package testutil
-
-import (
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
-)
-
-var (
-	AccountService server.AccountServiceInterface = &server.TestAccountService{}
-)
--- a/internal/testutil/onlinetest.go
+++ b/internal/testutil/onlinetest.go
@@ -1,9 +0,0 @@
-// +build online
-
-package testutil
-
-import "git.grassecon.net/urdt/ussd/internal/handlers/server"
-
-var (
-	AccountService server.AccountServiceInterface
-)
--- a/internal/utils/isocodes.go
+++ b/internal/utils/isocodes.go
--- a/menutraversal_test/group_test.json
+++ b/menutraversal_test/group_test.json
@@ -1,460 +0,0 @@
-{
-    "groups": [
-        {
-            "name": "my_account_change_pin",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "Balance: 0.003 CELO\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\n0:Back"
-                },
-                {
-                    "input": "5",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n3:Guard my PIN\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Enter your old PIN\n\n0:Back"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Enter a new four number PIN:\n\n0:Back"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Confirm your new PIN:\n\n0:Back"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Your PIN change request has been successful\n\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_language_change",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "Balance: 0.003 CELO\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\n0:Back"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Select language:\n0:english\n1:kiswahili"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "Your language change request was successful.\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_check_my_balance",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "Balance: 0.003 CELO\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\n0:Back"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Your balance is 0.003 CELO\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                     "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
-                    
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_check_community_balance",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "Balance: 0.003 CELO\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\n0:Back"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Your community balance is 0.003 CELO\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                     "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
-                    
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_edit_firstname",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "Balance: 0.003 CELO\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\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": "1",
-                    "expectedContent": "Enter your first names:\n0:Back"
-                },
-                {
-                    "input": "foo",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "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": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_edit_familyname",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "Balance: 0.003 CELO\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\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": "2",
-                    "expectedContent": "Enter family name:\n0:Back"
-                },
-                {
-                    "input": "bar",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "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": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-               
-            ]
-        },
-        {
-            "name": "menu_my_account_edit_gender",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "Balance: 0.003 CELO\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\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": "3",
-                    "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "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": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_edit_yob",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "Balance: 0.003 CELO\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\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": "4",
-                    "expectedContent": "Enter your year of birth\n0:Back"
-                },
-                {
-                    "input": "1945",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "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": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_edit_location",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "Balance: 0.003 CELO\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\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": "5",
-                    "expectedContent": "Enter your location:\n0:Back"
-                },
-                {
-                    "input": "Kilifi",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "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": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_edit_offerings",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "Balance: 0.003 CELO\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\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": "6",
-                    "expectedContent": "Enter the services or goods you offer: \n0:Back"
-                },
-                {
-                    "input": "Bananas",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "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": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_view_profile",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "Balance: 0.003 CELO\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\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": "1234",
-                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 79\nLocation: Kilifi\nYou provide: Bananas\n\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "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": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "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
@@ -1,278 +0,0 @@
-package menutraversaltest
-
-import (
-	"bytes"
-	"context"
-	"log"
-	"math/rand"
-	"os"
-	"regexp"
-	"testing"
-
-	"git.grassecon.net/urdt/ussd/driver"
-	"git.grassecon.net/urdt/ussd/internal/testutil"
-	"github.com/gofrs/uuid"
-)
-
-var (
-	testData      = driver.ReadData()
-	testStore     = ".test_state"
-	groupTestFile = "group_test.json"
-	sessionID     string
-	src           = rand.NewSource(42)
-	g             = rand.New(src)
-)
-
-func GenerateSessionId() string {
-	uu := uuid.NewGenWithOptions(uuid.WithRandomReader(g))
-	v, err := uu.NewV4()
-	if err != nil {
-		panic(err)
-	}
-	return v.String()
-}
-
-// Extract the public key from the engine response
-func extractPublicKey(response []byte) string {
-	// Regex pattern to match the public key starting with 0x and 40 characters
-	re := regexp.MustCompile(`0x[a-fA-F0-9]{40}`)
-	match := re.Find(response)
-	if match != nil {
-		return string(match)
-	}
-	return ""
-}
-
-func TestMain(m *testing.M) {
-	sessionID = GenerateSessionId()
-	defer func() {
-		if err := os.RemoveAll(testStore); err != nil {
-			log.Fatalf("Failed to delete state store %s: %v", testStore, err)
-		}
-	}()
-	m.Run()
-}
-
-func TestAccountCreationSuccessful(t *testing.T) {
-	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 _, 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)
-				}
-				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 TestAccountRegistrationRejectTerms(t *testing.T) {
-	// Generate a new UUID for this edge case test
-	uu := uuid.NewGenWithOptions(uuid.WithRandomReader(g))
-	v, err := uu.NewV4()
-	if err != nil {
-		t.Fail()
-	}
-	edgeCaseSessionID := v.String()
-	en, fn, _ := testutil.TestEngine(edgeCaseSessionID)
-	defer fn()
-	ctx := context.Background()
-	sessions := testData
-	for _, session := range sessions {
-		groups := driver.FilterGroupsByName(session.Groups, "account_creation_reject_terms")
-		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()
-				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 TestMainMenuHelp(t *testing.T) {
-	en, fn, _ := testutil.TestEngine(sessionID)
-	defer fn()
-	ctx := context.Background()
-	sessions := testData
-	for _, session := range sessions {
-		groups := driver.FilterGroupsByName(session.Groups, "main_menu_help")
-		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()
-				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 TestMainMenuQuit(t *testing.T) {
-	en, fn, _ := testutil.TestEngine(sessionID)
-	defer fn()
-	ctx := context.Background()
-	sessions := testData
-	for _, session := range sessions {
-		groups := driver.FilterGroupsByName(session.Groups, "main_menu_quit")
-		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()
-				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 TestMyAccount_MyAddress(t *testing.T) {
-	en, fn, _ := testutil.TestEngine(sessionID)
-	defer fn()
-	ctx := context.Background()
-	sessions := testData
-	for _, session := range sessions {
-		groups := driver.FilterGroupsByName(session.Groups, "menu_my_account_my_address")
-		for _, group := range groups {
-			for index, step := range group.Steps {
-				t.Logf("step %v with input %v", index, step.Input)
-				cont, err := en.Exec(ctx, []byte(step.Input))
-				if err != nil {
-					t.Errorf("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.Errorf("Test case '%s' failed during Flush: %v", group.Name, err)
-				}
-				b := w.Bytes()
-
-				publicKey := extractPublicKey(b)
-				expectedContent := bytes.Replace([]byte(step.ExpectedContent), []byte("{public_key}"), []byte(publicKey), -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", expectedContent, b)
-				}
-			}
-		}
-	}
-}
-
-func TestGroups(t *testing.T) {
-	groups, err := driver.LoadTestGroups(groupTestFile)
-	if err != nil {
-		log.Fatalf("Failed to load test groups: %v", err)
-	}
-	en, fn, _ := testutil.TestEngine(sessionID)
-	defer fn()
-	ctx := context.Background()
-	// Create test cases from loaded groups
-	tests := driver.CreateTestCases(groups)
-	for _, tt := range tests {
-		t.Run(tt.Name, func(t *testing.T) {
-			cont, err := en.Exec(ctx, []byte(tt.Input))
-			if err != nil {
-				t.Errorf("Test case '%s' failed at input '%s': %v", tt.Name, tt.Input, err)
-				return
-			}
-			if !cont {
-				return
-			}
-			w := bytes.NewBuffer(nil)
-			if _, err := en.Flush(ctx, w); err != nil {
-				t.Errorf("Test case '%s' failed during Flush: %v", tt.Name, err)
-			}
-			b := w.Bytes()
-			match, err := tt.MatchesExpectedContent(b)
-			if err != nil {
-				t.Fatalf("Error compiling regex for step '%s': %v", tt.Input, err)
-			}
-			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
@@ -1,153 +0,0 @@
-[
-    {
-        "name": "session one",
-        "groups": [
-            {
-                "name": "account_creation_successful",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:english\n1:kiswahili"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "Do you agree to terms and conditions?\n0:yes\n1:no"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "Please enter a new four number PIN for your account:\n0:Exit"
-                    },
-                    {
-                        "input": "1234",
-                        "expectedContent": "Enter your four number PIN again:"
-                    },
-                    {
-                        "input": "1111",
-                        "expectedContent": "The PIN is not a match. Try again\n1:retry\n9:Quit"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "Enter your four number PIN again:"
-                    },
-                    {
-                        "input": "1234",
-                        "expectedContent": "Your account is being created...Thank you for using Sarafu. Goodbye!"
-                    }
-                ]
-            },
-            {
-                "name": "account_creation_reject_terms",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:english\n1:kiswahili"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "Do you agree to terms and conditions?\n0:yes\n1:no"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "Thank you for using Sarafu. Goodbye!"
-                    }
-                ]
-            },
-            {
-                "name": "send_with_invalid_inputs",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "Enter recipient's phone number:\n0:Back"
-                    },
-                    {
-                        "input": "000",
-                        "expectedContent": "000 is not registered or invalid, please try again:\n1:retry\n9:Quit"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "Enter recipient's phone number:\n0:Back"
-                    },
-                    {
-                        "input": "065656",
-                        "expectedContent": "Maximum amount: 0.003 CELO\nEnter amount:\n0:Back"
-                    },
-                    {
-                        "input": "0.1",
-                        "expectedContent": "Amount 0.1 is invalid, please try again:\n1:retry\n9:Quit"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "Maximum amount: 0.003 CELO\nEnter amount:\n0:Back"
-                    },
-                    {
-                        "input": "0.001",
-                        "expectedContent": "065656 will receive 0.001 from {public_key}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
-                    },
-                    {
-                        "input": "1222",
-                        "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
-                    },
-                    {
-                        "input": "1",
-                        "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 0.001 from {public_key}."
-                    }
-                ]
-            },
-            {
-                "name": "main_menu_help",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    },
-                    {
-                        "input": "4",
-                        "expectedContent": "For more help,please call: 0757628885"
-                    }
-                ]
-            },
-            {
-                "name": "main_menu_quit",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    },
-                    {
-                        "input": "9",
-                        "expectedContent": "Thank you for using Sarafu. Goodbye!"
-                    }
-                ]
-            },
-            {
-                "name": "menu_my_account_my_address",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "Balance: 0.003 CELO\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\n0:Back"
-                    },
-                    {
-                        "input": "6",
-                        "expectedContent": "Address: {public_key}\n9:Quit"
-                    },
-                    {
-                        "input": "9",
-                        "expectedContent": "Thank you for using Sarafu. Goodbye!"
-                    }
-                ]
-            }
-        ]
-    }
-]
--- a/services/registration/_catch
+++ b/services/registration/_catch
@@ -1 +0,0 @@
-Something went wrong.Please try again
--- a/services/registration/_catch.vis
+++ b/services/registration/_catch.vis
@@ -1 +0,0 @@
-HALT
--- a/services/registration/amount.vis
+++ b/services/registration/amount.vis
@@ -5,10 +5,8 @@ MOUT back 0
 HALT
 LOAD validate_amount 64
 RELOAD validate_amount
-CATCH api_failure  flag_api_call_error  1
 CATCH invalid_amount flag_invalid_amount 1
 INCMP _ 0
 LOAD get_recipient 12
 LOAD get_sender 64
-LOAD get_amount 12
 INCMP transaction_pin *
--- a/services/registration/api_failure
+++ b/services/registration/api_failure
@@ -1 +0,0 @@
-Failed to connect to the custodial service.Please try again.
--- a/services/registration/api_failure.vis
+++ b/services/registration/api_failure.vis
@@ -1,5 +0,0 @@
-MOUT retry 0
-MOUT quit 9
-HALT
-INCMP _ 0
-INCMP quit 9
--- a/services/registration/balances.vis
+++ b/services/registration/balances.vis
@@ -1,5 +1,4 @@
 LOAD reset_account_authorized 0
-RELOAD reset_account_authorized
 MOUT my_balance 1
 MOUT community_balance 2
 MOUT back 0
--- a/services/registration/community_balance
+++ b/services/registration/community_balance
@@ -1 +1 @@
-{{.fetch_custodial_balances}}
+Your community balance is: 0.00SRF
--- a/services/registration/community_balance.vis
+++ b/services/registration/community_balance.vis
@@ -1,11 +1,5 @@
-LOAD reset_incorrect 6
-LOAD fetch_custodial_balances 0
-CATCH api_failure  flag_api_call_error  1
-MAP fetch_custodial_balances
+LOAD reset_incorrect 0
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
-MOUT back 0
-MOUT quit 9
+LOAD quit_with_balance 0
 HALT
-INCMP _ 0
-INCMP quit 9
--- a/services/registration/edit_familyname_menu
+++ b/services/registration/edit_familyname_menu
@@ -1 +0,0 @@
-Edit family name
--- a/services/registration/edit_familyname_menu_swa
+++ b/services/registration/edit_familyname_menu_swa
@@ -1 +0,0 @@
-Weka jina la familia
--- a/services/registration/edit_profile.vis
+++ b/services/registration/edit_profile.vis
@@ -1,21 +1,20 @@
 LOAD reset_account_authorized 16
-RELOAD reset_account_authorized
 LOAD reset_allow_update 0
 RELOAD reset_allow_update
 MOUT edit_name 1
-MOUT edit_familyname 2
-MOUT edit_gender 3
-MOUT edit_yob 4
-MOUT edit_location 5
-MOUT edit_offerings 6
-MOUT view 7
+MOUT edit_gender 2
+MOUT edit_yob 3
+MOUT edit_location 4
+MOUT edit_offerings 5
+MOUT view 6
 MOUT back 0
 HALT
-INCMP my_account 0
+INCMP _ 0
+LOAD set_reset_single_edit 0
+RELOAD set_reset_single_edit
 INCMP enter_name 1
-INCMP enter_familyname 2
-INCMP select_gender 3
-INCMP enter_yob 4
-INCMP enter_location 5
-INCMP enter_offerings 6
-INCMP view_profile 7
+INCMP select_gender 2
+INCMP enter_yob 3
+INCMP enter_location 4
+INCMP enter_offerings 5
+INCMP view_profile 6
--- a/services/registration/enter_familyname.vis
+++ b/services/registration/enter_familyname.vis
@@ -1,9 +1,5 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD save_familyname 0
-RELOAD save_familyname
+LOAD save_firstname 0
 MOUT back 0
 HALT
-RELOAD save_familyname
 INCMP _ 0
-INCMP pin_entry *
+INCMP select_gender *
--- a/services/registration/enter_familyname_swa
+++ b/services/registration/enter_familyname_swa
@@ -1 +0,0 @@
-Weka jina la familia
--- a/services/registration/enter_location.vis
+++ b/services/registration/enter_location.vis
@@ -1,8 +1,9 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD save_location 0
+CATCH incorrect_date_format flag_incorrect_date_format 1
+LOAD save_yob 0
+CATCH update_success flag_allow_update 1
 MOUT back 0
 HALT
-RELOAD save_location
 INCMP _ 0
-INCMP pin_entry *
+LOAD save_location 0
+CATCH pin_entry flag_single_edit 0
+INCMP enter_offerings *
--- a/services/registration/enter_name.vis
+++ b/services/registration/enter_name.vis
@@ -1,12 +1,4 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD save_firstname 0
-RELOAD save_firstname 
 MOUT back 0
 HALT
-RELOAD save_firstname
 INCMP _ 0
-INCMP pin_entry *
-
-
-
+INCMP enter_familyname *
--- a/services/registration/enter_offerings.vis
+++ b/services/registration/enter_offerings.vis
@@ -1,8 +1,8 @@
+LOAD save_location 0
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD save_offerings 0
+CATCH update_success flag_allow_update 1
 MOUT back 0
 HALT
-RELOAD save_offerings
+LOAD save_offerings 0
 INCMP _ 0
 INCMP pin_entry *
--- a/services/registration/enter_yob.vis
+++ b/services/registration/enter_yob.vis
@@ -1,10 +1,9 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD save_yob 0
+LOAD save_gender 0
+CATCH update_success flag_allow_update 1
 MOUT back 0
 HALT
-LOAD verify_yob 0
-CATCH incorrect_date_format flag_incorrect_date_format 1
-RELOAD save_yob
 INCMP _ 0
-INCMP pin_entry *
+LOAD verify_yob 8
+LOAD save_yob 0
+CATCH pin_entry flag_single_edit 0
+INCMP enter_location *
--- a/services/registration/main.vis
+++ b/services/registration/main.vis
@@ -1,6 +1,5 @@
 LOAD check_balance 64
 RELOAD check_balance
-CATCH api_failure  flag_api_call_error  1
 MAP check_balance
 MOUT send 1
 MOUT vouchers 2
--- a/services/registration/my_account.vis
+++ b/services/registration/my_account.vis
@@ -7,7 +7,7 @@ MOUT pin_options 5
 MOUT my_address 6
 MOUT back 0
 HALT
-INCMP main 0
+INCMP _ 0
 INCMP edit_profile 1
 INCMP change_language 2
 INCMP balances 3
--- a/services/registration/my_balance
+++ b/services/registration/my_balance
@@ -1 +1 @@
-{{.fetch_custodial_balances}}
+Your balance is: 0.00 SRF
--- a/services/registration/my_balance.vis
+++ b/services/registration/my_balance.vis
@@ -1,11 +1,5 @@
-LOAD reset_incorrect 6
-LOAD fetch_custodial_balances 0
-CATCH api_failure  flag_api_call_error  1
-MAP fetch_custodial_balances
+LOAD reset_incorrect 0
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
-MOUT back 0
-MOUT quit 9
+LOAD quit_with_balance 0
 HALT
-INCMP _ 0
-INCMP quit 9
--- a/services/registration/new_pin
+++ b/services/registration/new_pin
@@ -1 +1 @@
-Enter a new four number PIN:
+Enter a new four number pin
--- a/services/registration/pp.csv
+++ b/services/registration/pp.csv
@@ -14,4 +14,3 @@ 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_api_call_error,25,this is set when communication  to an external service fails
--- a/services/registration/profile_update_success
+++ b/services/registration/profile_update_success
@@ -1 +0,0 @@
-Profile updated successfully
--- a/services/registration/profile_update_success.vis
+++ b/services/registration/profile_update_success.vis
@@ -1,5 +0,0 @@
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP edit_profile 0
-INCMP quit 9
--- a/services/registration/profile_update_success_swa
+++ b/services/registration/profile_update_success_swa
@@ -1 +0,0 @@
-Ombi la Kuweka wasifu limefanikiwa
--- a/services/registration/root.vis
+++ b/services/registration/root.vis
@@ -1,8 +1,6 @@
 CATCH select_language flag_language_set 0
 CATCH terms flag_account_created 0
 LOAD check_account_status 0
-RELOAD check_account_status
-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
--- a/services/registration/select_gender.vis
+++ b/services/registration/select_gender.vis
@@ -1,15 +1,13 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
+LOAD save_familyname 0
+CATCH update_success flag_allow_update 1
 MOUT male 1
 MOUT female 2
 MOUT unspecified 3
 MOUT back 0
 HALT
+LOAD save_gender 0
+CATCH pin_entry flag_single_edit 0
 INCMP _ 0
-INCMP set_male 1
-INCMP set_female 2
-INCMP set_unspecified 3
-
-
-
-
+INCMP enter_yob 1
+INCMP enter_yob 2
+INCMP enter_yob 3
--- a/services/registration/set_female.vis
+++ b/services/registration/set_female.vis
@@ -1,4 +0,0 @@
-LOAD save_gender 0
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-MOVE pin_entry
--- a/services/registration/set_male.vis
+++ b/services/registration/set_male.vis
@@ -1,4 +0,0 @@
-LOAD save_gender 0
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-MOVE pin_entry
--- a/services/registration/set_unspecified.vis
+++ b/services/registration/set_unspecified.vis
@@ -1,4 +0,0 @@
-LOAD save_gender 0
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-MOVE pin_entry
--- a/services/registration/transaction_initiated.vis
+++ b/services/registration/transaction_initiated.vis
@@ -1,7 +1,7 @@
 LOAD reset_incorrect 6
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH _ flag_account_authorized 0
-RELOAD get_amount
+LOAD get_amount 10
 MAP get_amount
 RELOAD get_recipient
 MAP get_recipient
--- a/services/registration/transaction_pin
+++ b/services/registration/transaction_pin
@@ -1,2 +1,2 @@
-{{.get_recipient}} will receive {{.get_amount}} from {{.get_sender}}
+{{.get_recipient}} will receive {{.validate_amount}} from {{.get_sender}}
 Please enter your PIN to confirm:
--- a/services/registration/transaction_pin.vis
+++ b/services/registration/transaction_pin.vis
@@ -1,13 +1,12 @@
-RELOAD get_amount
-MAP get_amount
+MAP validate_amount
 RELOAD get_recipient
 MAP get_recipient
 RELOAD get_sender
 MAP get_sender
 MOUT back 0
 MOUT quit 9
-LOAD authorize_account 6
 HALT
+LOAD authorize_account 6
 RELOAD authorize_account
 CATCH incorrect_pin flag_incorrect_pin 1
 INCMP _ 0
--- a/services/registration/transaction_pin_swa
+++ b/services/registration/transaction_pin_swa
@@ -1,2 +1,2 @@
-{{.get_recipient}} atapokea {{.get_amount}} kutoka kwa {{.get_sender}}
+{{.get_recipient}} atapokea {{.validate_amount}} kutoka kwa {{.get_sender}}
 Tafadhali weka PIN yako kudhibitisha:
--- a/services/registration/update_success_swa
+++ b/services/registration/update_success_swa
@@ -1 +1 @@
-Akaunti imeupdatiwa
+Ombi lako la kuweka wasifu limefanikiwa
Author	SHA1	Message	Date
Carlosokumu	06dc822232	Merge remote-tracking branch 'remotes/origin/lash/thread-gdbm' into wip-menu-select-fix	2024-09-23 15:08:21 +03:00
Carlosokumu	371779d74c	update test,check for errors	2024-09-23 13:29:02 +03:00
alfred-mk	e8798e1ab2	remove need for initial Exec before loop	2024-09-23 11:18:57 +03:00
alfred-mk	3a14dafb98	rename all WriteResult to Flush	2024-09-23 11:18:56 +03:00
alfred-mk	a7e38727f1	use updated latest commit from go-vise 0.2.0	2024-09-23 11:18:56 +03:00
alfred-mk	3a96c2851c	removed unused code	2024-09-23 11:18:55 +03:00
alfred-mk	772d33ca29	remove init and use Exec	2024-09-23 11:18:55 +03:00
alfred-mk	59a072a340	use latest commit from go-vise 0.2.0	2024-09-23 11:18:54 +03:00
Carlosokumu	05749b493a	add edit single option on save_firstname function	2024-09-23 10:50:34 +03:00
Carlosokumu	aec2f3db29	remove deprecated code	2024-09-23 10:47:22 +03:00
Carlosokumu	0284bc5ef9	change single edit flag check	2024-09-23 10:47:03 +03:00
Carlosokumu	b54f3f32b5	use navigation path matching for case selection	2024-09-20 22:42:47 +03:00
Carlosokumu	df260c2288	add expected navigation paths for single edit	2024-09-20 22:42:02 +03:00
Carlosokumu	ffd091c9a9	use symbol for language selection	2024-09-20 14:43:14 +03:00
Carlosokumu	a20e275db3	update tests	2024-09-20 14:42:44 +03:00
Carlosokumu	33f8733106	add supported language codes	2024-09-20 14:39:52 +03:00
Carlosokumu	250341a8bd	rename to set_eng	2024-09-20 14:19:22 +03:00
Carlosokumu	f5ed1ce120	add swahili version	2024-09-20 14:19:00 +03:00
Carlosokumu	5898f8e87a	add swahili view menu option	2024-09-20 14:16:44 +03:00
Carlosokumu	aa18d41c81	rename set_default to set_eng	2024-09-20 14:16:05 +03:00
Carlosokumu	c75ca1b30b	rename set_default to set_eng	2024-09-20 14:15:31 +03:00
Carlosokumu	37c62f3d01	Merge remote-tracking branch 'remotes/origin/master' into wip-menu-select-fix	2024-09-20 08:53:41 +03:00
Carlosokumu	8feee318b7	split symbol	2024-09-18 09:39:53 +03:00
				`@@ -1 +0,0 @@`
				`Failed to connect to the custodial service.Please try again.`