update test engine

pass account service as a global var
chore: rename entities
2024-10-12 13:33:13 +03:00 · 2024-10-12 13:32:34 +03:00 · 2024-10-12 13:31:26 +03:00 · 2024-10-12 13:30:46 +03:00 · 2024-10-10 16:53:59 +03:00 · 2024-10-10 09:13:04 +03:00
92 changed files with 884 additions and 1980 deletions
--- a/.env.example
+++ b/.env.example
@@ -1,18 +0,0 @@
-#Serve Http
-PORT=7123
-HOST=127.0.0.1
-
-#PostgreSQL
-DB_HOST=localhost
-DB_USER=postgres
-DB_PASSWORD=strongpass
-DB_NAME=urdt_ussd
-DB_PORT=5432
-DB_SSLMODE=disable
-DB_TIMEZONE=Africa/Nairobi
-
-#External API Calls
-CREATE_ACCOUNT_URL=http://localhost:5003/api/v2/account/create
-TRACK_STATUS_URL=https://custodial.sarafu.africa/api/track/
-BALANCE_URL=https://custodial.sarafu.africa/api/account/status/
-TRACK_URL=http://localhost:5003/api/v2/account/status
--- a/cmd/africastalking/main.go
+++ b/cmd/africastalking/main.go
@@ -15,11 +15,9 @@ import (
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
-
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/initializers"
-	"git.grassecon.net/urdt/ussd/internal/handlers"
 	"git.grassecon.net/urdt/ussd/internal/handlers/server"
+
+	"git.grassecon.net/urdt/ussd/internal/handlers"
 	httpserver "git.grassecon.net/urdt/ussd/internal/http"
 	"git.grassecon.net/urdt/ussd/internal/storage"
 )
@@ -29,10 +27,6 @@ var (
 	scriptDir = path.Join("services", "registration")
 )

-func init() {
-	initializers.LoadEnvVariables()
-}
-
 type atRequestParser struct{}

 func (arp *atRequestParser) GetSessionId(rq any) (string, error) {
@@ -72,34 +66,29 @@ func (arp *atRequestParser) GetInput(rq any) ([]byte, error) {
 }

 func main() {
-	config.LoadConfig()
-
 	var dbDir string
 	var resourceDir string
 	var size uint
-	var database string
 	var engineDebug 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.StringVar(&database, "db", "gdbm", "database to be used")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
-	flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
-	flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
+	flag.StringVar(&host, "h", "127.0.0.1", "http host")
+	flag.UintVar(&port, "p", 7123, "http port")
 	flag.Parse()

 	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)

 	ctx := context.Background()
-	ctx = context.WithValue(ctx, "Database", database)
 	pfp := path.Join(scriptDir, "pp.csv")

 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
 	}

 	if engineDebug {
--- a/cmd/async/main.go
+++ b/cmd/async/main.go
@@ -13,11 +13,9 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"

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

 var (
@@ -25,10 +23,6 @@ var (
 	scriptDir = path.Join("services", "registration")
 )

-func init() {
-	initializers.LoadEnvVariables()
-}
-
 type asyncRequestParser struct {
 	sessionId string
 	input     []byte
@@ -43,36 +37,31 @@ func (p *asyncRequestParser) GetInput(r any) ([]byte, error) {
 }

 func main() {
-	config.LoadConfig()
-
 	var sessionId string
 	var dbDir string
 	var resourceDir string
 	var size uint
-	var database string
 	var engineDebug 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.StringVar(&database, "db", "gdbm", "database to be used")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
-	flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
-	flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
+	flag.StringVar(&host, "h", "127.0.0.1", "http host")
+	flag.UintVar(&port, "p", 7123, "http port")
 	flag.Parse()

 	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size, "sessionId", sessionId)

 	ctx := context.Background()
-	ctx = context.WithValue(ctx, "Database", database)
 	pfp := path.Join(scriptDir, "pp.csv")

 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
 	}

 	if engineDebug {
--- a/cmd/http/main.go
+++ b/cmd/http/main.go
@@ -15,12 +15,10 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"

-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/initializers"
 	"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"
+	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 )

 var (
@@ -28,39 +26,30 @@ var (
 	scriptDir = path.Join("services", "registration")
 )

-func init() {
-	initializers.LoadEnvVariables()
-}
-
 func main() {
-	config.LoadConfig()
-
 	var dbDir string
 	var resourceDir string
 	var size uint
-	var database string
 	var engineDebug 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.StringVar(&database, "db", "gdbm", "database to be used")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
-	flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
-	flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
+	flag.StringVar(&host, "h", "127.0.0.1", "http host")
+	flag.UintVar(&port, "p", 7123, "http port")
 	flag.Parse()

 	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)

 	ctx := context.Background()
-	ctx = context.WithValue(ctx, "Database", database)
 	pfp := path.Join(scriptDir, "pp.csv")

 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
 	}

 	if engineDebug {
@@ -99,7 +88,9 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
+
 	accountService := server.AccountService{}
+
 	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -10,8 +10,6 @@ import (
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/initializers"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
 	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/storage"
@@ -22,20 +20,12 @@ var (
 	scriptDir = path.Join("services", "registration")
 )

-func init() {
-	initializers.LoadEnvVariables()
-}
-
 func main() {
-	config.LoadConfig()
-
 	var dbDir string
 	var size uint
 	var sessionId string
-	var database string
 	var engineDebug bool
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&database, "db", "gdbm", "database to be used")
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
@@ -45,14 +35,13 @@ func main() {

 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
-	ctx = context.WithValue(ctx, "Database", database)
 	pfp := path.Join(scriptDir, "pp.csv")

 	cfg := engine.Config{
 		Root:       "root",
 		SessionId:  sessionId,
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
 	}

 	resourceDir := scriptDir
@@ -96,7 +85,6 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-
 	accountService := server.AccountService{}
 	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {
--- a/config/config.go
+++ b/config/config.go
@@ -1,18 +1,10 @@
 package config

-import "git.grassecon.net/urdt/ussd/initializers"

-var (
-	CreateAccountURL string
-	TrackStatusURL   string
-	BalanceURL       string
-    TrackURL         string
+
+const (
+    CreateAccountURL = "https://custodial.sarafu.africa/api/account/create"
+    TrackStatusURL   = "https://custodial.sarafu.africa/api/track/"
+    BalanceURL       = "https://custodial.sarafu.africa/api/account/status/"
 )

-// LoadConfig initializes the configuration values after environment variables are loaded.
-func LoadConfig() {
-	CreateAccountURL = initializers.GetEnv("CREATE_ACCOUNT_URL", "http://localhost:5003/api/v2/account/create")
-	TrackStatusURL = initializers.GetEnv("TRACK_STATUS_URL", "https://custodial.sarafu.africa/api/track/")
-	BalanceURL = initializers.GetEnv("BALANCE_URL", "https://custodial.sarafu.africa/api/account/status/")
-    TrackURL = initializers.GetEnv("TRACK_URL", "http://localhost:5003/api/v2/account/status")
-}
--- a/internal/testutil/driver/groupdriver.go
+++ b/internal/testutil/driver/groupdriver.go
--- a/go.mod
+++ b/go.mod
@@ -1,41 +1,25 @@
 module git.grassecon.net/urdt/ussd

-go 1.23.0
-
-toolchain go1.23.2
+go 1.22.6

 require (
-	git.defalsify.org/vise.git v0.2.1-0.20241017112704-307fa6fcdc6b
+	git.defalsify.org/vise.git v0.1.0-rc.3.0.20240923162317-c20d557a3dbb
 	github.com/alecthomas/assert/v2 v2.2.2
-	github.com/grassrootseconomics/eth-custodial v1.3.0-beta
 	github.com/peteole/testdata-loader v0.3.0
 	gopkg.in/leonelquinteros/gotext.v1 v1.3.1
 )

-require (
-	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
-	github.com/jackc/pgx/v5 v5.7.1 // indirect
-	github.com/jackc/puddle/v2 v2.2.2 // indirect
-	github.com/joho/godotenv v1.5.1
-	github.com/kr/text v0.2.0 // indirect
-	github.com/rogpeppe/go-internal v1.13.1 // indirect
-	golang.org/x/crypto v0.27.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/text v0.18.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.2-0.20180830191138-d8f796af33cc // 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
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/stretchr/testify v1.9.0
 	github.com/x448/float16 v0.8.4 // indirect
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-git.defalsify.org/vise.git v0.2.1-0.20241017112704-307fa6fcdc6b h1:dxBplsIlzJHV+5EH+gzB+w08Blt7IJbb2jeRe1OEjLU=
-git.defalsify.org/vise.git v0.2.1-0.20241017112704-307fa6fcdc6b/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+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=
 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=
@@ -8,65 +8,31 @@ github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk
 github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c h1:H9Nm+I7Cg/YVPpEV1RzU3Wq2pjamPc/UtHDgItcb7lE=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c/go.mod h1:rGod7o6KPeJ+hyBpHfhi4v7blx9sf+QsHsA7KAsdN6U=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+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/grassrootseconomics/eth-custodial v1.3.0-beta h1:twrMBhl89GqDUL9PlkzQxMP/6OST1BByrNDj+rqXDmU=
-github.com/grassrootseconomics/eth-custodial v1.3.0-beta/go.mod h1:7uhRcdnJplX4t6GKCEFkbeDhhjlcaGJeJqevbcvGLZo=
 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=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
-github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
-github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
-github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.7.1 h1:x7SYsPBYDkHDksogeSmZZ5xzThcTgRz++I5E+ePFUcs=
-github.com/jackc/pgx/v5 v5.7.1/go.mod h1:e7O26IywZZ+naJtWWos6i6fvWK+29etgITqrqHLfoZA=
-github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
-github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
-github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a h1:0Q3H0YXzMHiciXtRcM+j0jiCe8WKPQHoRgQiRTnfcLY=
 github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a/go.mod h1:CdTTBOYzS5E4mWS1N8NWP6AHI19MP0A2B18n3hLzRMk=
-github.com/pashagolub/pgxmock/v4 v4.3.0 h1:DqT7fk0OCK6H0GvqtcMsLpv8cIwWqdxWgfZNLeHCb/s=
-github.com/pashagolub/pgxmock/v4 v4.3.0/go.mod h1:9VoVHXwS3XR/yPtKGzwQvwZX1kzGB9sM8SviDcHDa3A=
 github.com/peteole/testdata-loader v0.3.0 h1:8jckE9KcyNHgyv/VPoaljvKZE0Rqr8+dPVYH6rfNr9I=
 github.com/peteole/testdata-loader v0.3.0/go.mod h1:Mt0ZbRtb56u8SLJpNP+BnQbENljMorYBpqlvt3cS83U=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 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.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
-golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+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/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/leonelquinteros/gotext.v1 v1.3.1 h1:8d9/fdTG0kn/B7NNGV1BsEyvektXFAbkMsTZS2sFSCc=
 gopkg.in/leonelquinteros/gotext.v1 v1.3.1/go.mod h1:X1WlGDeAFIYsW6GjgMm4VwUwZ2XjI7Zan2InxSUQWrU=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/initializers/load.go
+++ b/initializers/load.go
@@ -1,34 +0,0 @@
-package initializers
-
-import (
-	"log"
-	"os"
-	"strconv"
-
-	"github.com/joho/godotenv"
-)
-
-func LoadEnvVariables() {
-	err := godotenv.Load()
-	if err != nil {
-		log.Fatal("Error loading .env file")
-	}
-}
-
-// Helper to get environment variables with a default fallback
-func GetEnv(key, defaultVal string) string {
-  if value, exists := os.LookupEnv(key); exists {
-   	return value
-	}
-  return defaultVal
-}
-
-// Helper to safely convert environment variables to uint
-func GetEnvUint(key string, defaultVal uint) uint {
-	if value, exists := os.LookupEnv(key); exists {
-		if parsed, err := strconv.Atoi(value); err == nil && parsed >= 0 {
-			return uint(parsed)
-		}
-	}
-	return defaultVal
-}
--- a/internal/handlers/handlerservice.go
+++ b/internal/handlers/handlerservice.go
@@ -6,8 +6,8 @@ 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"
+	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 )

 type HandlerService interface {
@@ -61,8 +61,8 @@ func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceIn
 	ussdHandlers = ussdHandlers.WithPersister(ls.Pe)
 	ls.DbRs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
 	ls.DbRs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
-	ls.DbRs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
-	ls.DbRs.AddLocalFunc("verify_create_pin", ussdHandlers.VerifyCreatePin)
+	ls.DbRs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
+	ls.DbRs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
 	ls.DbRs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
 	ls.DbRs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
 	ls.DbRs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
@@ -83,21 +83,17 @@ 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("initiate_transaction", ussdHandlers.InitiateTransaction)
+	ls.DbRs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
 	ls.DbRs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
 	ls.DbRs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
 	ls.DbRs.AddLocalFunc("quit_with_help", ussdHandlers.QuitWithHelp)
-	ls.DbRs.AddLocalFunc("fetch_custodial_balances", ussdHandlers.FetchCustodialBalances)
-	ls.DbRs.AddLocalFunc("set_default_voucher", ussdHandlers.SetDefaultVoucher)
-	ls.DbRs.AddLocalFunc("check_vouchers", ussdHandlers.CheckVouchers)
-	ls.DbRs.AddLocalFunc("get_vouchers", ussdHandlers.GetVoucherList)
-	ls.DbRs.AddLocalFunc("view_voucher", ussdHandlers.ViewVoucher)
-	ls.DbRs.AddLocalFunc("set_voucher", ussdHandlers.SetVoucher)

 	return ussdHandlers, nil
 }
--- a/internal/handlers/server/accountservice.go
+++ b/internal/handlers/server/accountservice.go
@@ -1,35 +1,28 @@
 package server

 import (
-	"context"
 	"encoding/json"
-	"errors"
-	"fmt"
 	"io"
 	"net/http"
-	"os"

 	"git.grassecon.net/urdt/ussd/config"
 	"git.grassecon.net/urdt/ussd/internal/models"
-	"github.com/grassrootseconomics/eth-custodial/pkg/api"
-)
-
-var (
-	okResponse  api.OKResponse
-	errResponse api.ErrResponse
 )

 type AccountServiceInterface interface {
-	CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error)
-	CreateAccount(ctx context.Context) (*api.OKResponse, error)
-	CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error)
-	TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error)
-	FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error)
+	CheckBalance(publicKey string) (string, error)
+	CreateAccount() (*models.AccountResponse, 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.
+//
 // Parameters:
 //   - trackingId: A unique identifier for the account.This should be obtained from a previous call to
 //     CreateAccount or a similar function that returns an AccountResponse. The `trackingId` field in the
@@ -38,88 +31,52 @@ type AccountService struct {
 // 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(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error) {
-	resp, err := http.Get(config.BalanceURL + trackingId)
+//     If no error occurs, this will be nil.
+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
-
-}
-
-func (as *AccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error) {
-	var err error
-	// Construct the URL with the path parameter
-	url := fmt.Sprintf("%s/%s", config.TrackURL, publicKey)
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("X-GE-KEY", "xd")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		errResponse.Description = err.Error()
-		return nil, err
-	}
-	if resp.StatusCode >= http.StatusBadRequest {
-		err := json.Unmarshal([]byte(body), &errResponse)
-		if err != nil {
-			return nil, err
-		}
-		return nil, errors.New(errResponse.Description)
-	}
-	err = json.Unmarshal([]byte(body), &okResponse)
-	if err != nil {
-		return nil, err
-	}
-	if len(okResponse.Result) == 0 {
-		return nil, errors.New("Empty api result")
-	}
-	return &okResponse, nil
-
+	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(ctx context.Context, 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.
@@ -128,58 +85,58 @@ func (as *AccountService) CheckBalance(ctx context.Context, publicKey string) (*
 //     If there is an error during the request or processing, this will be nil.
 //   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
 //     If no error occurs, this will be nil.
-func (as *AccountService) CreateAccount(ctx context.Context) (*api.OKResponse, error) {
-	var err error
-
-	// Create a new request
-	req, err := http.NewRequest("POST", config.CreateAccountURL, nil)
+func (as *AccountService) CreateAccount() (*models.AccountResponse, error) {
+	resp, err := http.Post(config.CreateAccountURL, "application/json", nil)
 	if err != nil {
 		return nil, err
 	}
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("X-GE-KEY", "xd")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		errResponse.Description = err.Error()
-		return nil, err
-	}
 	defer resp.Body.Close()

 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
-	if resp.StatusCode >= http.StatusBadRequest {
-		err := json.Unmarshal([]byte(body), &errResponse)
-		if err != nil {
-			return nil, err
-		}
-		return nil, errors.New(errResponse.Description)
-	}
-	err = json.Unmarshal([]byte(body), &okResponse)
+
+	var accountResp models.AccountResponse
+	err = json.Unmarshal(body, &accountResp)
 	if err != nil {
 		return nil, err
 	}
-	if len(okResponse.Result) == 0 {
-		return nil, errors.New("Empty api result")
-	}
-	return &okResponse, nil
+
+	return &accountResp, nil
 }

-// FetchVouchers retrieves the token holdings for a given public key from the custodial holdings API endpoint
-// Parameters:
-//   - publicKey: The public key associated with the account.
-func (as *AccountService) FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error) {
-	file, err := os.Open("sample_tokens.json")
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-	var holdings models.VoucherHoldingResponse
-
-	if err := json.NewDecoder(file).Decode(&holdings); err != nil {
-		return nil, err
-	}
-	return &holdings, nil
+func (tas *TestAccountService) CreateAccount() (*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) (string, 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.Result.Balance, nil
+}
+
+func (tas *TestAccountService) CheckAccountStatus(trackingId string) (string, error) {
+	return "SUCCESS", nil
 }
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -10,7 +10,6 @@ import (
 	"strings"

 	"git.defalsify.org/vise.git/asm"
-	"github.com/grassrootseconomics/eth-custodial/pkg/api"

 	"git.defalsify.org/vise.git/cache"
 	"git.defalsify.org/vise.git/db"
@@ -22,17 +21,12 @@ import (
 	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/utils"
 	"gopkg.in/leonelquinteros/gotext.v1"
-
-	"git.grassecon.net/urdt/ussd/internal/storage"
 )

 var (
 	logg           = logging.NewVanilla().WithDomain("ussdmenuhandler")
 	scriptDir      = path.Join("services", "registration")
 	translationDir = path.Join(scriptDir, "locale")
-	okResponse     *api.OKResponse
-	errResponse    *api.ErrResponse
-	backOption     = []byte("0")
 )

 // FlagManager handles centralized flag management
@@ -142,18 +136,13 @@ func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (r
 }

 func (h *Handlers) createAccountNoExist(ctx context.Context, sessionId string, res *resource.Result) error {
-	flag_account_created, _ := h.flagManager.GetFlag("flag_account_created")
-	okResponse, err := h.accountService.CreateAccount(ctx)
-	if err != nil {
-		return err
-	}
-	trackingId := okResponse.Result["trackingId"].(string)
-	publicKey := okResponse.Result["publicKey"].(string)
-
+	accountResp, err := h.accountService.CreateAccount()
 	data := map[utils.DataTyp]string{
-		utils.DATA_TRACKING_ID: trackingId,
-		utils.DATA_PUBLIC_KEY:  publicKey,
+		utils.DATA_TRACKING_ID:  accountResp.Result.TrackingId,
+		utils.DATA_PUBLIC_KEY:   accountResp.Result.PublicKey,
+		utils.DATA_CUSTODIAL_ID: accountResp.Result.CustodialId.String(),
 	}
+
 	for key, value := range data {
 		store := h.userdataStore
 		err := store.WriteEntry(ctx, sessionId, key, []byte(value))
@@ -161,8 +150,9 @@ func (h *Handlers) createAccountNoExist(ctx context.Context, sessionId string, r
 			return err
 		}
 	}
+	flag_account_created, _ := h.flagManager.GetFlag("flag_account_created")
 	res.FlagSet = append(res.FlagSet, flag_account_created)
-	return nil
+	return err

 }

@@ -190,6 +180,34 @@ func (h *Handlers) CreateAccount(ctx context.Context, sym string, input []byte)
 	return res, nil
 }

+// SavePin persists the user's PIN choice into the filesystem
+func (h *Handlers) SavePin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	var err error
+
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	flag_incorrect_pin, _ := h.flagManager.GetFlag("flag_incorrect_pin")
+
+	accountPIN := string(input)
+	// Validate that the PIN is a 4-digit number
+	if !isValidPIN(accountPIN) {
+		res.FlagSet = append(res.FlagSet, flag_incorrect_pin)
+		return res, nil
+	}
+
+	res.FlagReset = append(res.FlagReset, flag_incorrect_pin)
+	store := h.userdataStore
+	err = store.WriteEntry(ctx, sessionId, utils.DATA_ACCOUNT_PIN, []byte(accountPIN))
+	if err != nil {
+		return res, err
+	}
+	return res, nil
+}
+
 func (h *Handlers) VerifyNewPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	res := resource.Result{}
 	_, ok := ctx.Value("SessionId").(string)
@@ -208,9 +226,6 @@ func (h *Handlers) VerifyNewPin(ctx context.Context, sym string, input []byte) (
 	return res, nil
 }

-// SaveTemporaryPin saves the valid PIN input to the DATA_TEMPORARY_PIN
-// during the account creation process
-// and during the change PIN process
 func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	var err error
@@ -219,7 +234,6 @@ func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byt
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-
 	flag_incorrect_pin, _ := h.flagManager.GetFlag("flag_incorrect_pin")

 	accountPIN := string(input)
@@ -229,15 +243,11 @@ func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byt
 		res.FlagSet = append(res.FlagSet, flag_incorrect_pin)
 		return res, nil
 	}
-
-	res.FlagReset = append(res.FlagReset, flag_incorrect_pin)
-
 	store := h.userdataStore
 	err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_PIN, []byte(accountPIN))
 	if err != nil {
 		return res, err
 	}
-
 	return res, nil
 }

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

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

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

-	if bytes.Equal(input, temporaryPin) {
+	if bytes.Equal(input, AccountPin) {
 		res.FlagSet = []uint32{flag_valid_pin}
 		res.FlagReset = []uint32{flag_pin_mismatch}
 		res.FlagSet = append(res.FlagSet, flag_pin_set)
@@ -294,11 +306,6 @@ func (h *Handlers) VerifyCreatePin(ctx context.Context, sym string, input []byte
 		res.FlagSet = []uint32{flag_pin_mismatch}
 	}

-	err = store.WriteEntry(ctx, sessionId, utils.DATA_ACCOUNT_PIN, []byte(temporaryPin))
-	if err != nil {
-		return res, err
-	}
-
 	return res, nil
 }

@@ -321,9 +328,6 @@ func (h *Handlers) SaveFirstname(ctx context.Context, sym string, input []byte)
 		return res, fmt.Errorf("missing session")
 	}
 	if len(input) > 0 {
-		if bytes.Equal(input, backOption) {
-			return res, nil
-		}
 		firstName := string(input)
 		store := h.userdataStore
 		err = store.WriteEntry(ctx, sessionId, utils.DATA_FIRST_NAME, []byte(firstName))
@@ -343,10 +347,8 @@ func (h *Handlers) SaveFamilyname(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+
 	if len(input) > 0 {
-		if bytes.Equal(input, backOption) {
-			return res, nil
-		}
 		familyName := string(input)
 		store := h.userdataStore
 		err = store.WriteEntry(ctx, sessionId, utils.DATA_FAMILY_NAME, []byte(familyName))
@@ -368,6 +370,7 @@ 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
@@ -388,10 +391,8 @@ func (h *Handlers) SaveLocation(ctx context.Context, sym string, input []byte) (
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+
 	if len(input) > 0 {
-		if bytes.Equal(input, backOption) {
-			return res, nil
-		}
 		location := string(input)
 		store := h.userdataStore
 		err = store.WriteEntry(ctx, sessionId, utils.DATA_LOCATION, []byte(location))
@@ -412,9 +413,7 @@ func (h *Handlers) SaveGender(ctx context.Context, sym string, input []byte) (re
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-	if bytes.Equal(input, backOption) {
-		return res, nil
-	}
+
 	gender := strings.Split(symbol, "_")[1]
 	store := h.userdataStore
 	err = store.WriteEntry(ctx, sessionId, utils.DATA_GENDER, []byte(gender))
@@ -433,6 +432,7 @@ func (h *Handlers) SaveOfferings(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+
 	if len(input) > 0 {
 		offerings := string(input)
 		store := h.userdataStore
@@ -458,6 +458,7 @@ func (h *Handlers) ResetAllowUpdate(ctx context.Context, sym string, input []byt
 // ResetAccountAuthorized resets the account authorization flag after a successful PIN entry.
 func (h *Handlers) ResetAccountAuthorized(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
+
 	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")

 	res.FlagReset = append(res.FlagReset, flag_account_authorized)
@@ -467,10 +468,12 @@ func (h *Handlers) ResetAccountAuthorized(ctx context.Context, sym string, input
 // CheckIdentifier retrieves the PublicKey from the JSON data file.
 func (h *Handlers) CheckIdentifier(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
+
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+
 	store := h.userdataStore
 	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)

@@ -484,10 +487,12 @@ func (h *Handlers) CheckIdentifier(ctx context.Context, sym string, input []byte
 func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	var err error
+
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+
 	flag_incorrect_pin, _ := h.flagManager.GetFlag("flag_incorrect_pin")
 	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
 	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
@@ -520,7 +525,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
 }
@@ -532,28 +539,29 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b

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

 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
 	store := h.userdataStore
-	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
+	trackingId, err := store.ReadEntry(ctx, sessionId, utils.DATA_TRACKING_ID)
 	if err != nil {
 		return res, err
 	}
-	okResponse, err = h.accountService.TrackAccountStatus(ctx, string(publicKey))
+
+	status, err := h.accountService.CheckAccountStatus(string(trackingId))
 	if err != nil {
-		res.FlagSet = append(res.FlagSet, flag_api_error)
+		fmt.Println("Error checking account status:", err)
 		return res, err
 	}
-	res.FlagReset = append(res.FlagReset, flag_api_error)
-	isActive := okResponse.Result["active"].(bool)
-	if !ok {
-		return res, err
+
+	err = store.WriteEntry(ctx, sessionId, utils.DATA_ACCOUNT_STATUS, []byte(status))
+	if err != nil {
+		return res, nil
 	}
-	if isActive {
+
+	if status == "SUCCESS" {
 		res.FlagSet = append(res.FlagSet, flag_account_success)
 		res.FlagReset = append(res.FlagReset, flag_account_pending)
 	} else {
@@ -627,7 +635,7 @@ func (h *Handlers) ResetIncorrectYob(ctx context.Context, sym string, input []by
 	return res, nil
 }

-// CheckBalance retrieves the balance of the active voucher and sets
+// CheckBalance retrieves the balance from the API using the "PublicKey" and sets
 // the balance as the result content
 func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
@@ -638,70 +646,18 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 		return res, fmt.Errorf("missing session")
 	}

-	code := codeFromCtx(ctx)
-	l := gotext.NewLocale(translationDir, code)
-	l.AddDomain("default")
-
-	store := h.userdataStore
-
-	// get the active sym and active balance
-	activeSym, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_SYM)
-	if err != nil {
-		if db.IsNotFound(err) {
-			balance := "0.00"
-			res.Content = l.Get("Balance: %s\n", balance)
-			return res, nil
-		}
-
-		return res, err
-	}
-
-	activeBal, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_BAL)
-	if err != nil {
-		return res, err
-	}
-
-	res.Content = l.Get("Balance: %s\n", fmt.Sprintf("%s %s", activeBal, activeSym))
-
-	return res, nil
-}
-
-func (h *Handlers) FetchCustodialBalances(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
-
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-	symbol, _ := h.st.Where()
-	balanceType := strings.Split(symbol, "_")[0]
-
 	store := h.userdataStore
 	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
 	if err != nil {
 		return res, err
 	}

-	balanceResponse, err := h.accountService.CheckBalance(ctx, 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

-	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
 }

@@ -799,13 +755,14 @@ func (h *Handlers) MaxAmount(ctx context.Context, sym string, input []byte) (res
 		return res, fmt.Errorf("missing session")
 	}
 	store := h.userdataStore
+	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)

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

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

 	return res, nil
 }
@@ -814,29 +771,47 @@ func (h *Handlers) MaxAmount(ctx context.Context, sym string, input []byte) (res
 // it is not more than the current balance.
 func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
+	var err error

 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+
 	flag_invalid_amount, _ := h.flagManager.GetFlag("flag_invalid_amount")
+
 	store := h.userdataStore
+	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)

-	var balanceValue float64
+	amountStr := string(input)
+
+	balanceStr, err := h.accountService.CheckBalance(string(publicKey))

-	// retrieve the active balance
-	activeBal, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_BAL)
 	if err != nil {
 		return res, err
 	}
-	balanceValue, err = strconv.ParseFloat(string(activeBal), 64)
+	res.Content = balanceStr
+
+	// Parse the balance
+	balanceParts := strings.Split(balanceStr, " ")
+	if len(balanceParts) != 2 {
+		return res, fmt.Errorf("unexpected balance format: %s", balanceStr)
+	}
+	balanceValue, err := strconv.ParseFloat(balanceParts[0], 64)
 	if err != nil {
-		return res, err
+		return res, fmt.Errorf("failed to parse balance: %v", err)
 	}

-	// Extract numeric part from the input amount
-	amountStr := strings.TrimSpace(string(input))
-	inputAmount, err := strconv.ParseFloat(amountStr, 64)
+	// Extract numeric part from input
+	re := regexp.MustCompile(`^(\d+(\.\d+)?)\s*(?:CELO)?$`)
+	matches := re.FindStringSubmatch(strings.TrimSpace(amountStr))
+	if len(matches) < 2 {
+		res.FlagSet = append(res.FlagSet, flag_invalid_amount)
+		res.Content = amountStr
+		return res, nil
+	}
+
+	inputAmount, err := strconv.ParseFloat(matches[1], 64)
 	if err != nil {
 		res.FlagSet = append(res.FlagSet, flag_invalid_amount)
 		res.Content = amountStr
@@ -849,14 +824,12 @@ func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte)
 		return res, nil
 	}

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

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

@@ -876,7 +849,7 @@ func (h *Handlers) GetRecipient(ctx context.Context, sym string, input []byte) (
 	return res, nil
 }

-// GetSender returns the sessionId (phoneNumber)
+// GetSender retrieves the public key from the Gdbm Db
 func (h *Handlers) GetSender(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result

@@ -885,7 +858,10 @@ func (h *Handlers) GetSender(ctx context.Context, sym string, input []byte) (res
 		return res, fmt.Errorf("missing session")
 	}

-	res.Content = string(sessionId)
+	store := h.userdataStore
+	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
+
+	res.Content = string(publicKey)

 	return res, nil
 }
@@ -899,17 +875,40 @@ func (h *Handlers) GetAmount(ctx context.Context, sym string, input []byte) (res
 		return res, fmt.Errorf("missing session")
 	}
 	store := h.userdataStore
+	amount, _ := store.ReadEntry(ctx, sessionId, utils.DATA_AMOUNT)

-	// retrieve the active symbol
-	activeSym, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_SYM)
+	res.Content = string(amount)
+
+	return res, nil
+}
+
+// QuickWithBalance retrieves the balance for a given public key from the custodial balance API endpoint before
+// gracefully exiting the session.
+func (h *Handlers) QuitWithBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	var err error
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
+
+	code := codeFromCtx(ctx)
+	l := gotext.NewLocale(translationDir, code)
+	l.AddDomain("default")
+
+	store := h.userdataStore
+	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
 	if err != nil {
 		return res, err
 	}
-
-	amount, _ := store.ReadEntry(ctx, sessionId, utils.DATA_AMOUNT)
-
-	res.Content = fmt.Sprintf("%s %s", string(amount), string(activeSym))
-
+	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
 }

@@ -929,14 +928,13 @@ func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []
 	// TODO
 	// Use the amount, recipient and sender to call the API and initialize the transaction
 	store := h.userdataStore
+	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)

 	amount, _ := store.ReadEntry(ctx, sessionId, utils.DATA_AMOUNT)

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

-	activeSym, _ := store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_SYM)
-
-	res.Content = l.Get("Your request has been sent. %s will receive %s %s from %s.", string(recipient), string(amount), string(activeSym), string(sessionId))
+	res.Content = l.Get("Your request has been sent. %s will receive %s from %s.", string(recipient), string(amount), string(publicKey))

 	account_authorized_flag, err := h.flagManager.GetFlag("flag_account_authorized")
 	if err != nil {
@@ -947,23 +945,16 @@ func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []
 	return res, nil
 }

+// GetProfileInfo retrieves and formats the profile information of a user from a Gdbm backed storage.
 func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
-	var defaultValue string
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-	language, ok := ctx.Value("Language").(lang.Language)
-	if !ok {
-		return res, fmt.Errorf("value for 'Language' is not of type lang.Language")
-	}
-	code := language.Code
-	if code == "swa" {
-		defaultValue = "Haipo"
-	} else {
-		defaultValue = "Not Provided"
-	}
+
+	// Default value when an entry is not found
+	defaultValue := "Not Provided"

 	// Helper function to handle nil byte slices and convert them to string
 	getEntryOrDefault := func(entry []byte, err error) string {
@@ -1000,299 +991,12 @@ func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte)
 			return res, fmt.Errorf("invalid year of birth: %v", err)
 		}
 	}
-	switch language.Code {
-	case "eng":
-		res.Content = fmt.Sprintf(
-			"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
-			name, gender, age, location, offerings,
-		)
-	case "swa":
-		res.Content = fmt.Sprintf(
-			"Jina: %s\nJinsia: %s\nUmri: %s\nEneo: %s\nUnauza: %s\n",
-			name, gender, age, location, offerings,
-		)
-	default:
-		res.Content = fmt.Sprintf(
-			"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
-			name, gender, age, location, offerings,
-		)
-	}
-
-	return res, nil
-}
-
-// SetDefaultVoucher retrieves the current vouchers
-// and sets the first as the default voucher, if no active voucher is set
-func (h *Handlers) SetDefaultVoucher(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	var err error
-	store := h.userdataStore
-
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	flag_no_active_voucher, _ := h.flagManager.GetFlag("flag_no_active_voucher")
-
-	// check if the user has an active sym
-	_, err = store.ReadEntry(ctx, sessionId, utils.DATA_ACTIVE_SYM)
-
-	if err != nil {
-		if db.IsNotFound(err) {
-			publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
-			if err != nil {
-				return res, nil
-			}
-
-			// Fetch vouchers from the API using the public key
-			vouchersResp, err := h.accountService.FetchVouchers(ctx, string(publicKey))
-			if err != nil {
-				return res, nil
-			}
-
-			// Return if there is no voucher
-			if len(vouchersResp.Result.Holdings) == 0 {
-				res.FlagSet = append(res.FlagSet, flag_no_active_voucher)
-				return res, nil
-			}
-
-			// Use only the first voucher
-			firstVoucher := vouchersResp.Result.Holdings[0]
-			defaultSym := firstVoucher.TokenSymbol
-			defaultBal := firstVoucher.Balance
-
-			// set the active symbol
-			err = store.WriteEntry(ctx, sessionId, utils.DATA_ACTIVE_SYM, []byte(defaultSym))
-			if err != nil {
-				return res, err
-			}
-			// set the active balance
-			err = store.WriteEntry(ctx, sessionId, utils.DATA_ACTIVE_BAL, []byte(defaultBal))
-			if err != nil {
-				return res, err
-			}
-
-			return res, nil
-		}
-
-		return res, err
-	}
-
-	res.FlagReset = append(res.FlagReset, flag_no_active_voucher)
-
-	return res, nil
-}
-
-// CheckVouchers retrieves the token holdings from the API using the "PublicKey" and stores
-// them to gdbm
-func (h *Handlers) CheckVouchers(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	store := h.userdataStore
-	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
-	if err != nil {
-		return res, nil
-	}
-
-	// Fetch vouchers from the API using the public key
-	vouchersResp, err := h.accountService.FetchVouchers(ctx, string(publicKey))
-	if err != nil {
-		return res, nil
-	}
-
-	// process voucher data
-	voucherSymbolList, voucherBalanceList := ProcessVouchers(vouchersResp.Result.Holdings)
-
-	prefixdb := storage.NewSubPrefixDb(store, []byte("vouchers"))
-	err = prefixdb.Put(ctx, []byte("sym"), []byte(voucherSymbolList))
-	if err != nil {
-		return res, nil
-	}
-
-	err = prefixdb.Put(ctx, []byte("bal"), []byte(voucherBalanceList))
-	if err != nil {
-		return res, nil
-	}
-
-	return res, nil
-}
-
-// ProcessVouchers formats the holdings into symbol and balance lists.
-func ProcessVouchers(holdings []struct {
-	ContractAddress string `json:"contractAddress"`
-	TokenSymbol     string `json:"tokenSymbol"`
-	TokenDecimals   string `json:"tokenDecimals"`
-	Balance         string `json:"balance"`
-}) (string, string) {
-	var numberedSymbols, numberedBalances []string
-
-	for i, voucher := range holdings {
-		numberedSymbols = append(numberedSymbols, fmt.Sprintf("%d:%s", i+1, voucher.TokenSymbol))
-		numberedBalances = append(numberedBalances, fmt.Sprintf("%d:%s", i+1, voucher.Balance))
-	}
-
-	voucherSymbolList := strings.Join(numberedSymbols, "\n")
-	voucherBalanceList := strings.Join(numberedBalances, "\n")
-
-	return voucherSymbolList, voucherBalanceList
-}
-
-// GetVoucherList fetches the list of vouchers and formats them
-func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-
-	// Read vouchers from the store
-	store := h.userdataStore
-	prefixdb := storage.NewSubPrefixDb(store, []byte("vouchers"))
-
-	voucherData, err := prefixdb.Get(ctx, []byte("sym"))
-	if err != nil {
-		return res, nil
-	}
-
-	res.Content = string(voucherData)
-
-	return res, nil
-}
-
-// ViewVoucher retrieves the token holding and balance from the subprefixDB
-func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	store := h.userdataStore
-
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	flag_incorrect_voucher, _ := h.flagManager.GetFlag("flag_incorrect_voucher")
-
-	inputStr := string(input)
-
-	if inputStr == "0" || inputStr == "99" {
-		res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
-		return res, nil
-	}
-
-	prefixdb := storage.NewSubPrefixDb(store, []byte("vouchers"))
-
-	// Retrieve the voucher symbol list
-	voucherSymbolList, err := prefixdb.Get(ctx, []byte("sym"))
-	if err != nil {
-		return res, fmt.Errorf("failed to retrieve voucher symbol list: %v", err)
-	}
-
-	// Retrieve the voucher balance list
-	voucherBalanceList, err := prefixdb.Get(ctx, []byte("bal"))
-	if err != nil {
-		return res, fmt.Errorf("failed to retrieve voucher balance list: %v", err)
-	}
-
-	// match the voucher symbol and balance with the input
-	matchedSymbol, matchedBalance := MatchVoucher(inputStr, string(voucherSymbolList), string(voucherBalanceList))
-
-	// If a match is found, write the temporary sym and balance
-	if matchedSymbol != "" && matchedBalance != "" {
-		err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_SYM, []byte(matchedSymbol))
-		if err != nil {
-			return res, err
-		}
-		err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_BAL, []byte(matchedBalance))
-		if err != nil {
-			return res, err
-		}
-
-		res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
-		res.Content = fmt.Sprintf("%s\n%s", matchedSymbol, matchedBalance)
-	} else {
-		res.FlagSet = append(res.FlagSet, flag_incorrect_voucher)
-	}
-
-	return res, nil
-}
-
-// MatchVoucher finds the matching voucher symbol and balance based on the input.
-func MatchVoucher(inputStr string, voucherSymbols, voucherBalances string) (string, string) {
-	// Split the lists into slices for processing
-	symbols := strings.Split(voucherSymbols, "\n")
-	balances := strings.Split(voucherBalances, "\n")
-
-	var matchedSymbol, matchedBalance string
-
-	for i, symbol := range symbols {
-		symbolParts := strings.SplitN(symbol, ":", 2)
-		if len(symbolParts) != 2 {
-			continue
-		}
-		voucherNum := symbolParts[0]
-		voucherSymbol := symbolParts[1]
-
-		// Check if input matches either the number or the symbol
-		if inputStr == voucherNum || strings.EqualFold(inputStr, voucherSymbol) {
-			matchedSymbol = voucherSymbol
-			// Ensure there's a corresponding balance
-			if i < len(balances) {
-				matchedBalance = strings.SplitN(balances[i], ":", 2)[1]
-			}
-			break
-		}
-	}
-
-	return matchedSymbol, matchedBalance
-}
-
-// SetVoucher retrieves the temporary sym and balance,
-// sets them as the active data and
-// clears the temporary data
-func (h *Handlers) SetVoucher(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	var err error
-	store := h.userdataStore
-
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	// get the current temporary symbol
-	temporarySym, err := store.ReadEntry(ctx, sessionId, utils.DATA_TEMPORARY_SYM)
-	if err != nil {
-		return res, err
-	}
-	// get the current temporary balance
-	temporaryBal, err := store.ReadEntry(ctx, sessionId, utils.DATA_TEMPORARY_BAL)
-	if err != nil {
-		return res, err
-	}
-
-	// set the active symbol
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_ACTIVE_SYM, []byte(temporarySym))
-	if err != nil {
-		return res, err
-	}
-	// set the active balance
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_ACTIVE_BAL, []byte(temporaryBal))
-	if err != nil {
-		return res, err
-	}
-
-	// reset the temporary symbol
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_SYM, []byte(""))
-	if err != nil {
-		return res, err
-	}
-	// reset the temporary balance
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_BAL, []byte(""))
-	if err != nil {
-		return res, err
-	}
-
-	res.Content = string(temporarySym)
+
+	// Format the result
+	res.Content = fmt.Sprintf(
+		"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
+		name, gender, age, location, offerings,
+	)

 	return res, nil
 }
--- a/internal/handlers/ussd/menuhandler_test.go
+++ b/internal/handlers/ussd/menuhandler_test.go
@@ -7,21 +7,15 @@ 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/mocks"
 	"git.grassecon.net/urdt/ussd/internal/models"
-	"git.grassecon.net/urdt/ussd/internal/testutil/mocks"
-	"git.grassecon.net/urdt/ussd/internal/testutil/testservice"
-
 	"git.grassecon.net/urdt/ussd/internal/utils"
 	"github.com/alecthomas/assert/v2"
-	"github.com/grassrootseconomics/eth-custodial/pkg/api"
 	testdataloader "github.com/peteole/testdata-loader"
 	"github.com/stretchr/testify/require"
 )
@@ -31,117 +25,75 @@ var (
 	flagsPath = path.Join(baseDir, "services", "registration", "pp.csv")
 )

-func TestNewHandlers(t *testing.T) {
-	fm, err := NewFlagManager(flagsPath)
-	accountService := testservice.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())
 	}
+
 	// Create required mocks
-	flag_account_created, err := fm.GetFlag("flag_account_created")
+	mockDataStore := new(mocks.MockUserDataStore)
+	mockCreateAccountService := new(mocks.MockAccountService)
+	expectedResult := resource.Result{}
+	accountCreatedFlag, err := fm.GetFlag("flag_account_created")
+
 	if err != nil {
 		t.Logf(err.Error())
 	}
+	expectedResult.FlagSet = append(expectedResult.FlagSet, accountCreatedFlag)
+
 	// Define session ID and mock data
 	sessionId := "session123"
-	notFoundErr := db.ErrNotFound{}
+	typ := utils.DATA_ACCOUNT_CREATED
+	fakeError := db.ErrNotFound{}
+	// Create context with session ID
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)

-	tests := []struct {
-		name           string
-		serverResponse *api.OKResponse
-		expectedResult resource.Result
-	}{
-		{
-			name: "Test account creation success",
-			serverResponse: &api.OKResponse{
-				Ok:          true,
-				Description: "Account creation successed",
-				Result: map[string]any{
-					"trackingId": "1234567890",
-					"publicKey":  "1235QERYU",
-				},
-			},
-			expectedResult: resource.Result{
-				FlagSet: []uint32{flag_account_created},
-			},
+	// Define expected interactions with the mock
+	mockDataStore.On("ReadEntry", ctx, sessionId, typ).Return([]byte("123"), fakeError)
+	expectedAccountResp := &models.AccountResponse{
+		Ok: true,
+		Result: struct {
+			CustodialId json.Number `json:"custodialId"`
+			PublicKey   string      `json:"publicKey"`
+			TrackingId  string      `json:"trackingId"`
+		}{
+			CustodialId: "12",
+			PublicKey:   "0x8E0XSCSVA",
+			TrackingId:  "d95a7e83-196c-4fd0-866fSGAGA",
 		},
 	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-
-			mockDataStore := new(mocks.MockUserDataStore)
-			mockCreateAccountService := new(mocks.MockAccountService)
-
-			// Create a Handlers instance with the mock data store
-			h := &Handlers{
-				userdataStore:  mockDataStore,
-				accountService: mockCreateAccountService,
-				flagManager:    fm.parser,
-			}
-
-			data := map[utils.DataTyp]string{
-				utils.DATA_TRACKING_ID: tt.serverResponse.Result["trackingId"].(string),
-				utils.DATA_PUBLIC_KEY:  tt.serverResponse.Result["publicKey"].(string),
-			}
-
-			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_ACCOUNT_CREATED).Return([]byte(""), notFoundErr)
-			mockCreateAccountService.On("CreateAccount").Return(tt.serverResponse, nil)
-
-			for key, value := range data {
-				mockDataStore.On("WriteEntry", ctx, sessionId, key, []byte(value)).Return(nil)
-			}
-
-			// Call the method you want to test
-			res, err := h.CreateAccount(ctx, "create_account", []byte("some-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)
-		})
+	mockCreateAccountService.On("CreateAccount").Return(expectedAccountResp, nil)
+	data := map[utils.DataTyp]string{
+		utils.DATA_TRACKING_ID:  expectedAccountResp.Result.TrackingId,
+		utils.DATA_PUBLIC_KEY:   expectedAccountResp.Result.PublicKey,
+		utils.DATA_CUSTODIAL_ID: expectedAccountResp.Result.CustodialId.String(),
 	}
+
+	for key, value := range data {
+		mockDataStore.On("WriteEntry", ctx, sessionId, key, []byte(value)).Return(nil)
+	}
+
+	// Create a Handlers instance with the mock data store
+	h := &Handlers{
+		userdataStore:  mockDataStore,
+		accountService: mockCreateAccountService,
+		flagManager:    fm.parser,
+	}
+
+	// Call the method you want to test
+	res, err := h.CreateAccount(ctx, "create_account", []byte("some-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, expectedResult, "Expected result should be equal to the actual result")
+
+	// Assert that expectations were met
+	mockDataStore.AssertExpectations(t)
 }

 func TestWithPersister(t *testing.T) {
@@ -219,7 +171,7 @@ func TestSaveFamilyname(t *testing.T) {
 	mockStore.AssertExpectations(t)
 }

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

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

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

 			if err != nil {
 				t.Error(err)
@@ -482,12 +434,44 @@ func TestCheckIdentifier(t *testing.T) {
 	}
 }

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

 	// Define test data
-	sessionId := "254712345678"
+	sessionId := "session123"
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
+	publicKey := "0xcasgatweksalw1018221"
+
+	// Set up the expected behavior of the mock
+	mockStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return([]byte(publicKey), nil)

 	// Create the Handlers instance with the mock store
 	h := &Handlers{
@@ -495,37 +479,34 @@ func TestGetSender(t *testing.T) {
 	}

 	// Call the method
-	res, _ := h.GetSender(ctx, "get_sender", []byte(""))
+	res, _ := h.GetSender(ctx, "max_amount", []byte("check_balance"))
+
+	//Assert that the public key from readentry operation  is what was set as the result content.
+	assert.Equal(t, publicKey, res.Content)

-	//Assert that the sessionId is what was set as the result content.
-	assert.Equal(t, sessionId, res.Content)
 }

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

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

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

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

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

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

 }

@@ -556,10 +537,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())
 	}
@@ -954,7 +937,7 @@ func TestVerifyYob(t *testing.T) {
 	}
 }

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

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

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

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

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

 			// Assert that no errors occurred
 			assert.NoError(t, err)
@@ -1032,115 +1012,53 @@ func TestVerifyCreatePin(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
-		serverResponse *api.OKResponse
-		response       *models.TrackStatusResponse
+		status         string
 		expectedResult resource.Result
 	}{
 		{
-			name:  "Test when account is on the Sarafu network",
-			input: []byte("TrackingId1234"),
-			serverResponse: &api.OKResponse{
-				Ok:          true,
-				Description: "Account creation succeeded",
-				Result: map[string]any{
-					"active": true,
-				},
-			},
-			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},
-			},
-		},
-		{
-			name:  "Test when the account is not  yet on the sarafu network",
-			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",
-					},
-				},
-			},
-			serverResponse: &api.OKResponse{
-				Ok:          true,
-				Description: "Account creation succeeded",
-				Result: map[string]any{
-					"active": false,
-				},
-			},
-			expectedResult: resource.Result{
-				FlagSet:   []uint32{flag_account_pending},
-				FlagReset: []uint32{flag_api_error, 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)

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

-			mockCreateAccountService.On("CheckAccountStatus", string(tt.input)).Return(tt.response, nil)
-			mockCreateAccountService.On("TrackAccountStatus", string(tt.input)).Return(tt.serverResponse, nil)
-			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_ACCOUNT_STATUS, []byte(status)).Return(nil).Maybe()
+			mockCreateAccountService.On("CheckAccountStatus", string(tt.input)).Return(tt.status, nil)
+			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_ACCOUNT_STATUS, []byte(tt.status)).Return(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)
@@ -1269,7 +1187,7 @@ func TestResetInvalidAmount(t *testing.T) {
 }

 func TestInitiateTransaction(t *testing.T) {
-	sessionId := "254712345678"
+	sessionId := "session123"

 	fm, err := NewFlagManager(flagsPath)

@@ -1292,29 +1210,30 @@ func TestInitiateTransaction(t *testing.T) {
 	tests := []struct {
 		name           string
 		input          []byte
+		PublicKey      []byte
 		Recipient      []byte
 		Amount         []byte
-		ActiveSym      []byte
 		status         string
 		expectedResult resource.Result
 	}{
 		{
-			name:      "Test initiate transaction",
-			Amount:    []byte("0.002"),
-			ActiveSym: []byte("SRF"),
+			name:      "Test amount reset",
+			PublicKey: []byte("0x1241527192"),
+			Amount:    []byte("0.002CELO"),
 			Recipient: []byte("0x12415ass27192"),
 			expectedResult: resource.Result{
 				FlagReset: []uint32{account_authorized_flag},
-				Content:   "Your request has been sent. 0x12415ass27192 will receive 0.002 SRF from 254712345678.",
+				Content:   "Your request has been sent. 0x12415ass27192 will receive 0.002CELO from 0x1241527192.",
 			},
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			// Define expected interactions with the mock
+			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return(tt.PublicKey, nil)
 			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_AMOUNT).Return(tt.Amount, nil)
 			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_RECIPIENT).Return(tt.Recipient, nil)
-			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_ACTIVE_SYM).Return(tt.ActiveSym, nil)
+			//mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_AMOUNT, []byte("")).Return(nil)

 			// Call the method under test
 			res, _ := h.InitiateTransaction(ctx, "transaction_reset_amount", tt.input)
@@ -1327,8 +1246,10 @@ func TestInitiateTransaction(t *testing.T) {

 			// Assert that expectations were met
 			mockDataStore.AssertExpectations(t)
+
 		})
 	}
+
 }

 func TestQuit(t *testing.T) {
@@ -1437,6 +1358,66 @@ func TestIsValidPIN(t *testing.T) {
 	}
 }

+func TestQuitWithBalance(t *testing.T) {
+	fm, err := NewFlagManager(flagsPath)
+
+	if err != nil {
+		t.Logf(err.Error())
+	}
+	flag_account_authorized, _ := fm.parser.GetFlag("flag_account_authorized")
+
+	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 quit with balance",
+			balance:   "0.02CELO",
+			publicKey: []byte("0xrqeqrequuq"),
+			expectedResult: resource.Result{
+				FlagReset: []uint32{flag_account_authorized},
+				Content:   fmt.Sprintf("Your account balance is %s", "0.02CELO"),
+			},
+		},
+	}
+
+	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)
+
+			// 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)

@@ -1459,31 +1440,34 @@ func TestValidateAmount(t *testing.T) {
 	tests := []struct {
 		name           string
 		input          []byte
-		activeBal      []byte
+		publicKey      []byte
 		balance        string
 		expectedResult resource.Result
 	}{
 		{
 			name:      "Test with valid amount",
-			input:     []byte("4.10"),
-			activeBal: []byte("5"),
+			input:     []byte("0.001"),
+			balance:   "0.003 CELO",
+			publicKey: []byte("0xrqeqrequuq"),
 			expectedResult: resource.Result{
-				Content: "4.10",
+				Content: "0.001",
 			},
 		},
 		{
-			name:      "Test with amount larger than active balance",
-			input:     []byte("5.02"),
-			activeBal: []byte("5"),
+			name:      "Test with amount larger than balance",
+			input:     []byte("0.02"),
+			balance:   "0.003 CELO",
+			publicKey: []byte("0xrqeqrequuq"),
 			expectedResult: resource.Result{
 				FlagSet: []uint32{flag_invalid_amount},
-				Content: "5.02",
+				Content: "0.02",
 			},
 		},
 		{
-			name:    "Test with invalid amount format",
-			input:   []byte("0.02ms"),
-			activeBal: []byte("5"),
+			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",
@@ -1493,23 +1477,23 @@ func TestValidateAmount(t *testing.T) {

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

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

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

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

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

-			// Assert all expectations were met
+			// Assert that expectations were met
 			mockDataStore.AssertExpectations(t)
+
 		})
 	}
 }
@@ -1573,54 +1557,33 @@ func TestValidateRecipient(t *testing.T) {
 }

 func TestCheckBalance(t *testing.T) {
-	tests := []struct {
-		name           string
-		sessionId      string
-		publicKey      string
-		activeSym      string
-		activeBal      string
-		expectedResult resource.Result
-		expectError    bool
-	}{
-		{
-			name:           "User with active sym",
-			sessionId:      "session456",
-			publicKey:      "0X98765432109",
-			activeSym:      "ETH",
-			activeBal:      "1.5",
-			expectedResult: resource.Result{Content: "Balance: 1.5 ETH\n"},
-			expectError:    false,
-		},
+
+	mockDataStore := new(mocks.MockUserDataStore)
+	sessionId := "session123"
+	publicKey := "0X13242618721"
+	balance := "0.003 CELO"
+
+	expectedResult := resource.Result{
+		Content: "0.003 CELO",
 	}

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

-			h := &Handlers{
-				userdataStore:  mockDataStore,
-				accountService: mockAccountService,
-			}
+	ctx := context.WithValue(context.Background(), "SessionId", sessionId)

-			// Mock for user with active sym
-			mockDataStore.On("ReadEntry", ctx, tt.sessionId, utils.DATA_ACTIVE_SYM).Return([]byte(tt.activeSym), nil)
-			mockDataStore.On("ReadEntry", ctx, tt.sessionId, utils.DATA_ACTIVE_BAL).Return([]byte(tt.activeBal), nil)
-
-			res, err := h.CheckBalance(ctx, "check_balance", []byte(""))
-
-			if tt.expectError {
-				assert.Error(t, err)
-			} else {
-				assert.NoError(t, err)
-				assert.Equal(t, tt.expectedResult, res, "Result should match expected output")
-			}
-
-			mockDataStore.AssertExpectations(t)
-			mockAccountService.AssertExpectations(t)
-		})
+	h := &Handlers{
+		userdataStore:  mockDataStore,
+		accountService: mockCreateAccountService,
+		//flagManager:    fm.parser,
 	}
+	//mock call operations
+	mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return([]byte(publicKey), nil)
+	mockCreateAccountService.On("CheckBalance", string(publicKey)).Return(balance, nil)
+
+	res, _ := h.CheckBalance(ctx, "check_balance", []byte("123456"))
+
+	assert.Equal(t, res, expectedResult, "Result should contain flag(s) that have been reset")
+
 }

 func TestGetProfile(t *testing.T) {
@@ -1629,50 +1592,23 @@ func TestGetProfile(t *testing.T) {

 	mockDataStore := new(mocks.MockUserDataStore)
 	mockCreateAccountService := new(mocks.MockAccountService)
-	mockState := state.NewState(16)

 	h := &Handlers{
 		userdataStore:  mockDataStore,
 		accountService: mockCreateAccountService,
-		st:             mockState,
 	}
+	ctx := context.WithValue(context.Background(), "SessionId", sessionId)

 	tests := []struct {
-		name         string
-		languageCode string
-		keys         []utils.DataTyp
-		profileInfo  []string
-		result       resource.Result
+		name        string
+		keys        []utils.DataTyp
+		profileInfo []string
+		result      resource.Result
 	}{
 		{
-			name:         "Test with full profile information in eng",
-			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"},
-			languageCode: "eng",
-			result: resource.Result{
-				Content: fmt.Sprintf(
-					"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
-					"John Doee", "Male", "48", "Kilifi", "Bananas",
-				),
-			},
-		},
-		{
-			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"},
-			languageCode: "swa",
-			result: resource.Result{
-				Content: fmt.Sprintf(
-					"Jina: %s\nJinsia: %s\nUmri: %s\nEneo: %s\nUnauza: %s\n",
-					"John Doee", "Male", "48", "Kilifi", "Bananas",
-				),
-			},
-		},
-		{
-			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"},
-			languageCode: "nor",
+			name:        "Test with full profile information",
+			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"},
 			result: resource.Result{
 				Content: fmt.Sprintf(
 					"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
@@ -1683,14 +1619,9 @@ 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)
 			}
-
 			res, _ := h.GetProfileInfo(ctx, "get_profile_info", []byte(""))

 			// Assert that expectations were met
@@ -1762,6 +1693,42 @@ func TestVerifyNewPin(t *testing.T) {

 }

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

@@ -1809,120 +1776,5 @@ func TestConfirmPin(t *testing.T) {

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

 	"git.defalsify.org/vise.git/engine"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/testutil/mocks/httpmocks"
+	"git.grassecon.net/urdt/ussd/internal/mocks/httpmocks"
 )

 // invalidRequestType is a custom type to test invalid request scenarios
--- a/internal/testutil/mocks/dbmock.go
+++ b/internal/testutil/mocks/dbmock.go
--- a/internal/testutil/mocks/httpmocks/enginemock.go
+++ b/internal/testutil/mocks/httpmocks/enginemock.go
--- a/internal/testutil/mocks/httpmocks/requesthandlermock.go
+++ b/internal/testutil/mocks/httpmocks/requesthandlermock.go
--- a/internal/testutil/mocks/httpmocks/requestparsermock.go
+++ b/internal/testutil/mocks/httpmocks/requestparsermock.go
--- a/internal/testutil/mocks/httpmocks/writermock.go
+++ b/internal/testutil/mocks/httpmocks/writermock.go
--- a/internal/mocks/servicemock.go
+++ b/internal/mocks/servicemock.go
@@ -0,0 +1,26 @@
+package mocks
+
+import (
+	"git.grassecon.net/urdt/ussd/internal/models"
+	"github.com/stretchr/testify/mock"
+)
+
+// MockAccountService implements AccountServiceInterface for testing
+type MockAccountService struct {
+	mock.Mock
+}
+
+func (m *MockAccountService) CreateAccount() (*models.AccountResponse, error) {
+	args := m.Called()
+	return args.Get(0).(*models.AccountResponse), args.Error(1)
+}
+
+func (m *MockAccountService) CheckBalance(publicKey string) (string, error) {
+	args := m.Called(publicKey)
+	return args.String(0), args.Error(1)
+}
+
+func (m *MockAccountService) CheckAccountStatus(trackingId string) (string, error) {
+	args := m.Called(trackingId)
+	return args.String(0), args.Error(1)
+}
--- a/internal/testutil/mocks/userdbmock.go
+++ b/internal/testutil/mocks/userdbmock.go
--- a/internal/models/accountresponse.go
+++ b/internal/models/accountresponse.go
@@ -1,10 +1,15 @@
 package models

+import (
+	"encoding/json"
+
+)
+
 type AccountResponse struct {
-	Ok          bool   `json:"ok"`
-	Description string `json:"description"` // Include the description field
-	Result      struct {
-		PublicKey  string `json:"publicKey"`
-		TrackingId string `json:"trackingId"`
+	Ok     bool `json:"ok"`
+	Result struct {
+		CustodialId json.Number `json:"custodialId"`
+		PublicKey   string      `json:"publicKey"`
+		TrackingId  string      `json:"trackingId"`
 	} `json:"result"`
-}
+}
--- a/internal/models/tokenresponse.go
+++ b/internal/models/tokenresponse.go
@@ -1,18 +0,0 @@
-package models
-
-type ApiResponse struct {
-	OK          bool   `json:"ok"`
-	Description string `json:"description"`
-	Result      Result `json:"result"`
-}
-
-type Result struct {
-	Holdings []Holding `json:"holdings"`
-}
-
-type Holding struct {
-	ContractAddress string `json:"contractAddress"`
-	TokenSymbol     string `json:"tokenSymbol"`
-	TokenDecimals   string `json:"tokenDecimals"`
-	Balance         string `json:"balance"`
-}
--- a/internal/models/trackstatusresponse.go
+++ b/internal/models/trackstatusresponse.go
@@ -4,13 +4,7 @@ import (
 	"encoding/json"
 	"time"
 )
-type Transaction struct {
-	CreatedAt     time.Time   `json:"createdAt"`
-	Status        string      `json:"status"`
-	TransferValue json.Number `json:"transferValue"`
-	TxHash        string      `json:"txHash"`
-	TxType        string      `json:"txType"`
-}
+

 type TrackStatusResponse struct {
 	Ok     bool `json:"ok"`
@@ -23,4 +17,4 @@ type TrackStatusResponse struct {
 			TxType        string      `json:"txType"`
 		}
 	} `json:"result"`
-}
+}
--- a/internal/models/vouchersresponse.go
+++ b/internal/models/vouchersresponse.go
@@ -1,15 +0,0 @@
-package models
-
-// VoucherHoldingResponse represents a single voucher holding
-type VoucherHoldingResponse struct {
-	Ok          bool   `json:"ok"`
-	Description string `json:"description"`
-	Result      struct {
-		Holdings []struct {
-			ContractAddress string `json:"contractAddress"`
-			TokenSymbol     string `json:"tokenSymbol"`
-			TokenDecimals   string `json:"tokenDecimals"`
-			Balance         string `json:"balance"`
-		} `json:"holdings"`
-	} `json:"result"`
-}
--- a/internal/storage/db.go
+++ b/internal/storage/db.go
@@ -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/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/storage/storageservice.go
+++ b/internal/storage/storageservice.go
@@ -8,16 +8,14 @@ import (

 	"git.defalsify.org/vise.git/db"
 	fsdb "git.defalsify.org/vise.git/db/fs"
-	"git.defalsify.org/vise.git/db/postgres"
-	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/urdt/ussd/initializers"
+	"git.defalsify.org/vise.git/logging"
 )

 var (
 	logg = logging.NewVanilla().WithDomain("storage")
-)
+)	

 type StorageService interface {
 	GetPersister(ctx context.Context) (*persist.Persister, error)
@@ -26,86 +24,40 @@ type StorageService interface {
 	EnsureDbDir() error
 }

-type MenuStorageService struct {
-	dbDir         string
-	resourceDir   string
+type MenuStorageService struct{
+	dbDir string
+	resourceDir string
 	resourceStore db.Db
-	stateStore    db.Db
+	stateStore db.Db
 	userDataStore db.Db
 }

-func buildConnStr() string {
-	host := initializers.GetEnv("DB_HOST", "localhost")
-	user := initializers.GetEnv("DB_USER", "postgres")
-	password := initializers.GetEnv("DB_PASSWORD", "")
-	dbName := initializers.GetEnv("DB_NAME", "")
-	port := initializers.GetEnv("DB_PORT", "5432")
-
-	return fmt.Sprintf(
-		"postgres://%s:%s@%s:%s/%s",
-		user, password, host, port, dbName,
-	)
-}
-
 func NewMenuStorageService(dbDir string, resourceDir string) *MenuStorageService {
 	return &MenuStorageService{
-		dbDir:       dbDir,
+		dbDir: dbDir,
 		resourceDir: resourceDir,
 	}
 }

-func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, existingDb db.Db, fileName string) (db.Db, error) {
-	database, ok := ctx.Value("Database").(string)
-	if !ok {
-		return nil, fmt.Errorf("failed to select the database")
-	}
-
-	if existingDb != nil {
-		return existingDb, nil
-	}
-
-	var newDb db.Db
-	var err error
-
-	if database == "postgres" {
-		newDb = postgres.NewPgDb()
-		connStr := buildConnStr()
-		err = newDb.Connect(ctx, connStr)
-	} else {
-		newDb = NewThreadGdbmDb()
-		storeFile := path.Join(ms.dbDir, fileName)
-		err = newDb.Connect(ctx, storeFile)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return newDb, nil
-}
-
 func (ms *MenuStorageService) GetPersister(ctx context.Context) (*persist.Persister, error) {
-	stateStore, err := ms.GetStateStore(ctx)
+	ms.stateStore = NewThreadGdbmDb()
+	storeFile := path.Join(ms.dbDir, "state.gdbm")
+	err := ms.stateStore.Connect(ctx, storeFile)
 	if err != nil {
 		return nil, err
 	}
-
-	pr := persist.NewPersister(stateStore)
-	logg.TraceCtxf(ctx, "menu storage service", "persist", pr, "store", stateStore)
+	pr := persist.NewPersister(ms.stateStore)
+	logg.TraceCtxf(ctx, "menu storage service", "persist", pr, "store", ms.stateStore)
 	return pr, nil
 }

 func (ms *MenuStorageService) GetUserdataDb(ctx context.Context) (db.Db, error) {
-	if ms.userDataStore != nil {
-		return ms.userDataStore, nil
-	}
-
-	userDataStore, err := ms.getOrCreateDb(ctx, ms.userDataStore, "userdata.gdbm")
+	ms.userDataStore = NewThreadGdbmDb()
+	storeFile := path.Join(ms.dbDir, "userdata.gdbm")
+	err := ms.userDataStore.Connect(ctx, storeFile)
 	if err != nil {
 		return nil, err
 	}
-
-	ms.userDataStore = userDataStore
 	return ms.userDataStore, nil
 }

@@ -121,15 +73,14 @@ func (ms *MenuStorageService) GetResource(ctx context.Context) (resource.Resourc

 func (ms *MenuStorageService) GetStateStore(ctx context.Context) (db.Db, error) {
 	if ms.stateStore != nil {
-		return ms.stateStore, nil
+		panic("set up store when already exists")
 	}
-
-	stateStore, err := ms.getOrCreateDb(ctx, ms.stateStore, "state.gdbm")
+	ms.stateStore = NewThreadGdbmDb()
+	storeFile := path.Join(ms.dbDir, "state.gdbm")
+	err := ms.stateStore.Connect(ctx, storeFile)
 	if err != nil {
 		return nil, err
 	}
-
-	ms.stateStore = stateStore
 	return ms.stateStore, nil
 }

--- a/internal/testutil/TestEngine.go
+++ b/internal/testutil/TestEngine.go
@@ -13,8 +13,6 @@ import (
 	"git.grassecon.net/urdt/ussd/internal/handlers"
 	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/storage"
-	"git.grassecon.net/urdt/ussd/internal/testutil/testservice"
-	"git.grassecon.net/urdt/ussd/internal/testutil/testtag"
 	testdataloader "github.com/peteole/testdata-loader"
 )

@@ -27,7 +25,6 @@ var (
 func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
-	ctx = context.WithValue(ctx, "Database", "gdbm")
 	pfp := path.Join(scriptDir, "pp.csv")

 	var eventChannel = make(chan bool)
@@ -36,7 +33,7 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 		Root:       "root",
 		SessionId:  sessionId,
 		OutputSize: uint32(160),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
 	}

 	dbDir := ".test_state"
@@ -82,12 +79,12 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 		os.Exit(1)
 	}

-	if testtag.AccountService == nil {
-		testtag.AccountService = &server.AccountService{}
+	if AccountService == nil {
+		AccountService = &server.AccountService{}
 	}

-	switch testtag.AccountService.(type) {
-	case *testservice.TestAccountService:
+	switch AccountService.(type) {
+	case *server.TestAccountService:
 		go func() {
 			eventChannel <- false
 		}()
@@ -100,7 +97,7 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 		panic("Unknown account service type")
 	}

-	hl, err := lhs.GetHandler(testtag.AccountService)
+	hl, err := lhs.GetHandler(AccountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -120,5 +117,7 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 		}
 		logg.Infof("testengine storage closed")
 	}
+
+	//en = en.WithDebug(nil)
 	return en, cleanFn, eventChannel
 }
--- a/internal/testutil/mocks/servicemock.go
+++ b/internal/testutil/mocks/servicemock.go
@@ -1,40 +0,0 @@
-package mocks
-
-import (
-	"context"
-
-	"git.grassecon.net/urdt/ussd/internal/models"
-	"github.com/grassrootseconomics/eth-custodial/pkg/api"
-	"github.com/stretchr/testify/mock"
-)
-
-// MockAccountService implements AccountServiceInterface for testing
-type MockAccountService struct {
-	mock.Mock
-}
-
-func (m *MockAccountService) CreateAccount(ctx context.Context) (*api.OKResponse, error) {
-	args := m.Called()
-	return args.Get(0).(*api.OKResponse), args.Error(1)
-}
-
-func (m *MockAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error) {
-	args := m.Called(publicKey)
-	return args.Get(0).(*models.BalanceResponse), args.Error(1)
-}
-
-func (m *MockAccountService) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error) {
-	args := m.Called(trackingId)
-	return args.Get(0).(*models.TrackStatusResponse), args.Error(1)
-}
-
-func (m *MockAccountService) TrackAccountStatus(ctx context.Context,publicKey string) (*api.OKResponse, error) {
-	args := m.Called(publicKey)
-	return args.Get(0).(*api.OKResponse), args.Error(1)
-}
-
-
-func (m *MockAccountService) FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error) {
-	args := m.Called(publicKey)
-	return args.Get(0).(*models.VoucherHoldingResponse), args.Error(1)
-}
--- a/internal/testutil/tag_offline.go
+++ b/internal/testutil/tag_offline.go
@@ -0,0 +1,12 @@
+//go:build !online
+// +build !online
+
+package testutil
+
+import (
+	"git.grassecon.net/urdt/ussd/internal/handlers/server"
+)
+
+var (
+	AccountService server.AccountServiceInterface = &server.TestAccountService{}
+)
--- a/internal/testutil/testtag/onlinetest.go
+++ b/internal/testutil/testtag/onlinetest.go
@@ -1,6 +1,7 @@
+//go:build online
 // +build online

-package testtag
+package testutil

 import "git.grassecon.net/urdt/ussd/internal/handlers/server"

--- a/internal/testutil/testservice/TestAccountService.go
+++ b/internal/testutil/testservice/TestAccountService.go
@@ -1,101 +0,0 @@
-package testservice
-
-import (
-	"context"
-	"encoding/json"
-	"time"
-
-	"git.grassecon.net/urdt/ussd/internal/models"
-	"github.com/grassrootseconomics/eth-custodial/pkg/api"
-)
-
-type TestAccountService struct {
-}
-
-func (tas *TestAccountService) CreateAccount(ctx context.Context) (*api.OKResponse, error) {
-	return &api.OKResponse{
-		Ok:          true,
-		Description: "Account creation succeeded",
-		Result: map[string]any{
-			"trackingId": "075ccc86-f6ef-4d33-97d5-e91cfb37aa0d",
-			"publicKey":  "0x623EFAFa8868df4B934dd12a8B26CB3Dd75A7AdD",
-		},
-	}, nil
-}
-
-func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error) {
-	balanceResponse := &models.BalanceResponse{
-		Ok: true,
-		Result: struct {
-			Balance string      `json:"balance"`
-			Nonce   json.Number `json:"nonce"`
-		}{
-			Balance: "0.003 CELO",
-			Nonce:   json.Number("0"),
-		},
-	}
-
-	return balanceResponse, nil
-}
-
-func (tas *TestAccountService) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error) {
-	trackResponse := &models.TrackStatusResponse{
-		Ok: true,
-		Result: struct {
-			Transaction struct {
-				CreatedAt     time.Time   "json:\"createdAt\""
-				Status        string      "json:\"status\""
-				TransferValue json.Number "json:\"transferValue\""
-				TxHash        string      "json:\"txHash\""
-				TxType        string      "json:\"txType\""
-			}
-		}{
-			Transaction: models.Transaction{
-				CreatedAt:     time.Now(),
-				Status:        "SUCCESS",
-				TransferValue: json.Number("0.5"),
-				TxHash:        "0x123abc456def",
-				TxType:        "transfer",
-			},
-		},
-	}
-	return trackResponse, nil
-}
-
-func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error) {
-	return &api.OKResponse{
-		Ok:          true,
-		Description: "Account creation succeeded",
-		Result: map[string]any{
-			"active": true,
-		},
-	}, nil
-}
-
-func (tas *TestAccountService) FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error) {
-	return &models.VoucherHoldingResponse{
-		Ok: true,
-		Result: struct {
-			Holdings []struct {
-				ContractAddress string `json:"contractAddress"`
-				TokenSymbol     string `json:"tokenSymbol"`
-				TokenDecimals   string `json:"tokenDecimals"`
-				Balance         string `json:"balance"`
-			} `json:"holdings"`
-		}{
-			Holdings: []struct {
-				ContractAddress string `json:"contractAddress"`
-				TokenSymbol     string `json:"tokenSymbol"`
-				TokenDecimals   string `json:"tokenDecimals"`
-				Balance         string `json:"balance"`
-			}{
-				{
-					ContractAddress: "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
-					TokenSymbol:     "SRF",
-					TokenDecimals:   "6",
-					Balance:         "2745987",
-				},
-			},
-		},
-	}, nil
-}
--- a/internal/testutil/testtag/offlinetest.go
+++ b/internal/testutil/testtag/offlinetest.go
@@ -1,12 +0,0 @@
-// +build !online
-
-package testtag
-
-import (
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
-	accountservice "git.grassecon.net/urdt/ussd/internal/testutil/testservice"
-)
-
-var (
-	AccountService server.AccountServiceInterface = &accountservice.TestAccountService{}
-)
--- a/internal/utils/db.go
+++ b/internal/utils/db.go
@@ -23,11 +23,6 @@ const (
 	DATA_RECIPIENT
 	DATA_AMOUNT
 	DATA_TEMPORARY_PIN
-	DATA_VOUCHER_LIST
-	DATA_TEMPORARY_SYM
-	DATA_ACTIVE_SYM
-	DATA_TEMPORARY_BAL
-	DATA_ACTIVE_BAL
 )

 func typToBytes(typ DataTyp) []byte {
--- a/sample_tokens.json
+++ b/sample_tokens.json
@@ -1,44 +0,0 @@
-{
-    "ok": true,
-    "description": "Token holdings with current balances",
-    "result": {
-      "holdings": [
-        {
-          "contractAddress": "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
-          "tokenSymbol": "FSPTST",
-          "tokenDecimals": "6",
-          "balance": "8869964242"
-        },
-        {
-          "contractAddress": "0x724F2910D790B54A39a7638282a45B1D83564fFA",
-          "tokenSymbol": "GEO",
-          "tokenDecimals": "6",
-          "balance": "9884"
-        },
-        {
-          "contractAddress": "0x2105a206B7bec31E2F90acF7385cc8F7F5f9D273",
-          "tokenSymbol": "MFNK",
-          "tokenDecimals": "6",
-          "balance": "19788697"
-        },
-        {
-          "contractAddress": "0x63DE2Ac8D1008351Cc69Fb8aCb94Ba47728a7E83",
-          "tokenSymbol": "MILO",
-          "tokenDecimals": "6",
-          "balance": "75"
-        },
-        {
-          "contractAddress": "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
-          "tokenSymbol": "SOHAIL",
-          "tokenDecimals": "6",
-          "balance": "27874115"
-        },
-        {
-          "contractAddress": "0x45d747172e77d55575c197CbA9451bC2CD8F4958",
-          "tokenSymbol": "SRF",
-          "tokenDecimals": "6",
-          "balance": "2745987"
-        }
-      ]
-    }
-  }
--- a/services/registration/account_creation.vis
+++ b/services/registration/account_creation.vis
@@ -1,4 +1,4 @@
-RELOAD verify_create_pin
+RELOAD verify_pin
 CATCH create_pin_mismatch flag_pin_mismatch 1
 LOAD quit 0
 HALT
--- a/services/registration/amount.vis
+++ b/services/registration/amount.vis
@@ -1,15 +1,13 @@
 LOAD reset_transaction_amount 0
 LOAD max_amount 10
-RELOAD max_amount
 MAP max_amount
 MOUT back 0
 HALT
 LOAD validate_amount 64
 RELOAD validate_amount
-CATCH api_failure  flag_api_call_error  1
 CATCH invalid_amount flag_invalid_amount 1
 INCMP _ 0
 LOAD get_recipient 12
 LOAD get_sender 64
-LOAD get_amount 32
+LOAD get_amount 12
 INCMP transaction_pin *
--- a/services/registration/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/confirm_create_pin.vis
+++ b/services/registration/confirm_create_pin.vis
@@ -1,4 +1,4 @@
-LOAD save_temporary_pin 6
+LOAD save_pin 0
 HALT
-LOAD verify_create_pin 8
+LOAD verify_pin 8
 INCMP account_creation *
--- a/services/registration/confirm_pin_change
+++ b/services/registration/confirm_pin_change
@@ -1 +1 @@
-Confirm your new PIN:
+Confirm your new PIN:
--- a/services/registration/confirm_pin_change.vis
+++ b/services/registration/confirm_pin_change.vis
@@ -2,6 +2,5 @@ CATCH invalid_pin flag_valid_pin 0
 MOUT back 0
 HALT
 INCMP _ 0
-INCMP * pin_reset_success
-
+INCMP pin_reset_success *

--- a/services/registration/create_pin.vis
+++ b/services/registration/create_pin.vis
@@ -2,8 +2,8 @@ LOAD create_account 0
 CATCH account_creation_failed flag_account_creation_failed 1
 MOUT exit 0
 HALT
-LOAD save_temporary_pin 6
-RELOAD save_temporary_pin
+LOAD save_pin 0
+RELOAD save_pin
 CATCH . flag_incorrect_pin 1
 INCMP quit 0
 INCMP confirm_create_pin *
--- a/services/registration/enter_familyname.vis
+++ b/services/registration/enter_familyname.vis
@@ -1,8 +1,9 @@
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH profile_update_success flag_allow_update 1
+LOAD save_familyname 0
+RELOAD save_familyname
 MOUT back 0
 HALT
-LOAD save_familyname 0
 RELOAD save_familyname
 INCMP _ 0
 INCMP pin_entry *
--- a/services/registration/enter_location.vis
+++ b/services/registration/enter_location.vis
@@ -1,8 +1,8 @@
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH profile_update_success flag_allow_update 1
+LOAD save_location 0
 MOUT back 0
 HALT
-LOAD save_location 0
 RELOAD save_location
 INCMP _ 0
 INCMP pin_entry *
--- a/services/registration/enter_name.vis
+++ b/services/registration/enter_name.vis
@@ -1,8 +1,12 @@
 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
-LOAD save_firstname 0
 RELOAD save_firstname
 INCMP _ 0
 INCMP pin_entry *
+
+
+
--- a/services/registration/language_changed.vis
+++ b/services/registration/language_changed.vis
@@ -1,3 +1,4 @@
+RELOAD reset_account_authorized
 MOUT back 0
 MOUT quit 9
 HALT
--- a/services/registration/locale/swa/default.po
+++ b/services/registration/locale/swa/default.po
@@ -1,14 +1,12 @@
 msgid "Your account balance is %s"
 msgstr "Salio lako ni %s"

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

 msgid "Thank you for using Sarafu. Goodbye!"
 msgstr "Asante kwa kutumia huduma ya Sarafu. Kwaheri!"

+
 msgid "For more help,please call: 0757628885"
 msgstr "Kwa usaidizi zaidi,piga: 0757628885"
-
-msgid "Balance: %s\n"
-msgstr "Salio: %s\n"
--- a/services/registration/main
+++ b/services/registration/main
@@ -1 +1 @@
-{{.check_balance}}
+Balance: {{.check_balance}}
--- a/services/registration/main.vis
+++ b/services/registration/main.vis
@@ -1,10 +1,5 @@
-LOAD set_default_voucher 8
-RELOAD set_default_voucher
 LOAD check_balance 64
 RELOAD check_balance
-LOAD check_vouchers 10
-RELOAD check_vouchers
-CATCH api_failure  flag_api_call_error  1
 MAP check_balance
 MOUT send 1
 MOUT vouchers 2
@@ -13,7 +8,7 @@ MOUT help 4
 MOUT quit 9
 HALT
 INCMP send 1
-INCMP my_vouchers 2
+INCMP quit 2
 INCMP my_account 3
 INCMP help 4
 INCMP quit 9
--- a/services/registration/main_swa
+++ b/services/registration/main_swa
@@ -1 +1 @@
-{{.check_balance}}
+Salio: {{.check_balance}}
--- 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/my_vouchers
+++ b/services/registration/my_vouchers
@@ -1 +0,0 @@
-My vouchers
--- a/services/registration/my_vouchers.vis
+++ b/services/registration/my_vouchers.vis
@@ -1,8 +0,0 @@
-LOAD reset_account_authorized 16
-RELOAD reset_account_authorized
-MOUT select_voucher 1
-MOUT voucher_details 2
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP select_voucher 1
--- a/services/registration/new_pin
+++ b/services/registration/new_pin
@@ -1 +1 @@
-Enter a new four number PIN:
+Enter a new four number PIN:
--- a/services/registration/new_pin.vis
+++ b/services/registration/new_pin.vis
@@ -1,13 +1,12 @@
-LOAD authorize_account 12
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH old_pin flag_allow_update 0
+CATCH _ flag_allow_update 0
 MOUT back 0
 HALT
 INCMP _ 0
 LOAD save_temporary_pin 6
-LOAD verify_new_pin 0
 RELOAD save_temporary_pin
+LOAD verify_new_pin 8
 RELOAD verify_new_pin
-INCMP * confirm_pin_change
+CATCH incorrect_pin flag_incorrect_pin 1
+INCMP confirm_pin_change * 
+

--- a/services/registration/new_pin_swa
+++ b/services/registration/new_pin_swa
@@ -1,2 +1 @@
-Weka PIN mpya ya nne nambari: 
-
+Weka PIN mpya ya nne nambari: 
--- a/services/registration/no_voucher
+++ b/services/registration/no_voucher
@@ -1 +0,0 @@
-You need a voucher to send
--- a/services/registration/no_voucher.vis
+++ b/services/registration/no_voucher.vis
@@ -1,5 +0,0 @@
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP ^ 0
-INCMP quit 9
--- a/services/registration/no_voucher_swa
+++ b/services/registration/no_voucher_swa
@@ -1 +0,0 @@
-Unahitaji sarafu kutuma
--- a/services/registration/old_pin
+++ b/services/registration/old_pin
@@ -1 +1 @@
-Enter your old PIN
+Enter your old PIN
--- a/services/registration/old_pin.vis
+++ b/services/registration/old_pin.vis
@@ -1,7 +1,9 @@
 LOAD reset_allow_update 0
+RELOAD reset_allow_update
 MOUT back 0
 HALT
-RELOAD reset_allow_update
+LOAD authorize_account 12
+RELOAD authorize_account
+CATCH incorrect_pin flag_incorrect_pin 1
 INCMP _ 0
 INCMP new_pin *
-
--- a/services/registration/pin_management.vis
+++ b/services/registration/pin_management.vis
@@ -4,5 +4,5 @@ MOUT guard_pin 3
 MOUT back 0
 HALT
 INCMP _ 0
-INCMP old_pin  1
+INCMP old_pin 1

--- a/services/registration/pin_reset_mismatch.vis
+++ b/services/registration/pin_reset_mismatch.vis
@@ -3,4 +3,3 @@ MOUT quit 9
 HALT
 INCMP confirm_pin_change 1
 INCMP quit 9
-
--- a/services/registration/pin_reset_success
+++ b/services/registration/pin_reset_success
@@ -1 +1 @@
-Your PIN change request has been successful
+Your PIN change request has been successful
--- a/services/registration/pin_reset_success.vis
+++ b/services/registration/pin_reset_success.vis
@@ -1,10 +1,8 @@
 LOAD confirm_pin_change 0
 RELOAD confirm_pin_change
-CATCH pin_reset_mismatch  flag_pin_mismatch 1
+CATCH pin_reset_mismatch flag_pin_mismatch 1
 MOUT back 0
 MOUT quit 9
 HALT
 INCMP main 0
 INCMP quit 9
-
-
--- a/services/registration/pp.csv
+++ b/services/registration/pp.csv
@@ -14,6 +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_incorrect_voucher,24,this is set when the selected voucher is invalid
-flag,flag_api_call_error,25,this is set when communication to an external service fails
-flag,flag_no_active_voucher,26,this is set when a user does not have an active voucher
--- a/services/registration/profile_update_success
+++ b/services/registration/profile_update_success
@@ -1 +1 @@
-Profile updated successfully
+Profile updated successfully
--- 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_voucher
+++ b/services/registration/select_voucher
@@ -1,2 +0,0 @@
-Select number or symbol from your vouchers:
-{{.get_vouchers}}
--- a/services/registration/select_voucher.vis
+++ b/services/registration/select_voucher.vis
@@ -1,15 +0,0 @@
-LOAD get_vouchers 0
-MAP get_vouchers
-MOUT back 0
-MOUT quit 99
-MNEXT next 11
-MPREV prev 22
-HALT
-LOAD view_voucher 80
-RELOAD view_voucher
-CATCH . flag_incorrect_voucher 1
-INCMP _ 0
-INCMP quit 99
-INCMP > 11
-INCMP < 22
-INCMP view_voucher *
--- a/services/registration/select_voucher_menu
+++ b/services/registration/select_voucher_menu
@@ -1 +0,0 @@
-Select voucher
--- a/services/registration/select_voucher_swa
+++ b/services/registration/select_voucher_swa
@@ -1,2 +0,0 @@
-Chagua nambari au ishara kutoka kwa salio zako:
-{{.get_vouchers}}
--- a/services/registration/send.vis
+++ b/services/registration/send.vis
@@ -1,5 +1,4 @@
 LOAD transaction_reset 0
-CATCH no_voucher flag_no_active_voucher 1
 MOUT back 0
 HALT
 LOAD validate_recipient 20
--- a/services/registration/view_menu_swa
+++ b/services/registration/view_menu_swa
@@ -1 +0,0 @@
-Angalia Wasifu
--- a/services/registration/view_voucher
+++ b/services/registration/view_voucher
@@ -1,2 +0,0 @@
-Enter PIN to confirm selection:
-{{.view_voucher}}
--- a/services/registration/view_voucher.vis
+++ b/services/registration/view_voucher.vis
@@ -1,10 +0,0 @@
-MAP view_voucher
-MOUT back 0
-MOUT quit 9
-LOAD authorize_account 6
-HALT
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-INCMP _ 0
-INCMP quit 9
-INCMP voucher_set *
--- a/services/registration/view_voucher_swa
+++ b/services/registration/view_voucher_swa
@@ -1,2 +0,0 @@
-Weka PIN ili kuthibitisha chaguo:
-{{.view_voucher}}
--- a/services/registration/voucher_details_menu
+++ b/services/registration/voucher_details_menu
@@ -1 +0,0 @@
-Voucher details
--- a/services/registration/voucher_set
+++ b/services/registration/voucher_set
@@ -1 +0,0 @@
-Success! {{.set_voucher}} is now your active voucher.
--- a/services/registration/voucher_set.vis
+++ b/services/registration/voucher_set.vis
@@ -1,10 +0,0 @@
-LOAD reset_incorrect 6
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH _ flag_account_authorized 0
-LOAD set_voucher 12
-MAP set_voucher
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP ^ 0
-INCMP quit 9
--- a/services/registration/voucher_set_swa
+++ b/services/registration/voucher_set_swa
@@ -1 +0,0 @@
-Hongera! {{.set_voucher}} ni Sarafu inayotumika sasa.
--- a/menutraversal_test/group_test.json
+++ b/menutraversal_test/group_test.json
@@ -5,7 +5,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@@ -13,27 +13,27 @@
                },
                {
                    "input": "5",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
+                    "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"
+                    "expectedContent": "Enter your old PIN\n0:Back"
                },
                {
                    "input": "1234",
-                    "expectedContent": "Enter a new four number PIN:\n\n0:Back"
+                    "expectedContent": "Enter a new four number PIN:\n0:Back"
                },
                {
                    "input": "1234",
-                    "expectedContent": "Confirm your new PIN:\n\n0:Back"
+                    "expectedContent": "Confirm your new PIN:\n0:Back"
                },
                {
                    "input": "1234",
-                    "expectedContent": "Your PIN change request has been successful\n\n0:Back\n9:Quit"
+                    "expectedContent": "Your PIN change request has been successful\n0:Back\n9:Quit"
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@@ -42,7 +42,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@@ -70,99 +70,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_check_my_balance",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\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}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_check_community_balance",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\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}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@@ -171,7 +79,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@@ -191,7 +99,7 @@
                },
                {
                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
                },
                {
                    "input": "0",
@@ -203,7 +111,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@@ -212,7 +120,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@@ -232,7 +140,7 @@
                },
                {
                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
                },
                {
                    "input": "0",
@@ -244,7 +152,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
               
            ]
@@ -254,7 +162,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@@ -274,7 +182,7 @@
                },
                {
                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
                },
                {
                    "input": "0",
@@ -286,7 +194,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@@ -295,7 +203,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@@ -315,7 +223,7 @@
                },
                {
                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
                },
                {
                    "input": "0",
@@ -327,7 +235,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@@ -336,7 +244,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@@ -356,7 +264,7 @@
                },
                {
                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
                },
                {
                    "input": "0",
@@ -368,7 +276,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@@ -377,7 +285,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@@ -397,7 +305,7 @@
                },
                {
                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
                },
                {
                    "input": "0",
@@ -409,7 +317,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        },
@@ -418,7 +326,7 @@
            "steps": [
                {
                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                },
                {
                    "input": "3",
@@ -446,7 +354,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
        }
--- a/menutraversal_test/menu_traversal_test.go
+++ b/menutraversal_test/menu_traversal_test.go
@@ -1,4 +1,4 @@
-package menutraversaltest
+package main

 import (
 	"bytes"
@@ -9,8 +9,8 @@ import (
 	"regexp"
 	"testing"

+	"git.grassecon.net/urdt/ussd/driver"
 	"git.grassecon.net/urdt/ussd/internal/testutil"
-	"git.grassecon.net/urdt/ussd/internal/testutil/driver"
 	"github.com/gofrs/uuid"
 )

@@ -43,39 +43,6 @@ func extractPublicKey(response []byte) string {
 	return ""
 }

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

+func TestSendWithInvalidInputs(t *testing.T) {
+	en, fn, _ := testutil.TestEngine(sessionID)
+	defer fn()
+	ctx := context.Background()
+	sessions := testData
+	for _, session := range sessions {
+		groups := driver.FilterGroupsByName(session.Groups, "send_with_invalid_inputs")
+		for _, group := range groups {
+			for _, step := range group.Steps {
+				cont, err := en.Exec(ctx, []byte(step.Input))
+				if err != nil {
+					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
+					return
+				}
+				if !cont {
+					break
+				}
+				w := bytes.NewBuffer(nil)
+				if _, err := en.Flush(ctx, w); err != nil {
+					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
+				}
+
+				b := w.Bytes()
+
+				// Extract the dynamic public key from the output
+				publicKey := extractPublicKey(b)
+
+				// Replace placeholder {public_key} with the actual dynamic public key
+				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 TestMyAccount_Check_My_Balance(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_check_my_balance")
+		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()
+				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()
@@ -187,12 +231,6 @@ func TestMainMenuHelp(t *testing.T) {
 				}

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

 				b := w.Bytes()
-				balance := extractBalance(b)
+				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)
+				}
+			}
+		}
+	}
+}

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

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

-func TestMainMenuSend(t *testing.T) {
-	en, fn, _ := testutil.TestEngine(sessionID)
-	defer fn()
-	ctx := context.Background()
-	sessions := testData
-	for _, session := range sessions {
-		groups := driver.FilterGroupsByName(session.Groups, "send_with_invalid_inputs")
-		for _, group := range groups {
-			for _, step := range group.Steps {
-				cont, err := en.Exec(ctx, []byte(step.Input))
-				if err != nil {
-					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
-					return
-				}
-				if !cont {
-					break
-				}
-				w := bytes.NewBuffer(nil)
-				if _, err := en.Flush(ctx, w); err != nil {
-					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
-				}
-
-				b := w.Bytes()
-				balance := extractBalance(b)
-				max_amount := extractMaxAmount(b)
-				send_amount := extractSendAmount(b)
-
-				expectedContent := []byte(step.ExpectedContent)
-				expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
-				expectedContent = bytes.Replace(expectedContent, []byte("{max_amount}"), []byte(max_amount), -1)
-				expectedContent = bytes.Replace(expectedContent, []byte("{send_amount}"), []byte(send_amount), -1)
-				expectedContent = bytes.Replace(expectedContent, []byte("{session_id}"), []byte(sessionID), -1)
-
-				step.ExpectedContent = string(expectedContent)
-				match, err := step.MatchesExpectedContent(b)
-				if err != nil {
-					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
-				}
-				if !match {
-					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
-				}
-			}
-		}
-	}
-}
-
 func TestGroups(t *testing.T) {
 	groups, err := driver.LoadTestGroups(groupTestFile)
 	if err != nil {
@@ -361,13 +377,6 @@ func TestGroups(t *testing.T) {
 				t.Errorf("Test case '%s' failed during Flush: %v", tt.Name, err)
 			}
 			b := w.Bytes()
-			balance := extractBalance(b)
-
-			expectedContent := []byte(tt.ExpectedContent)
-			expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
-
-			tt.ExpectedContent = string(expectedContent)
-
 			match, err := tt.MatchesExpectedContent(b)
 			if err != nil {
 				t.Fatalf("Error compiling regex for step '%s': %v", tt.Input, err)
@@ -375,6 +384,7 @@ func TestGroups(t *testing.T) {
 			if !match {
 				t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", tt.ExpectedContent, b)
 			}
+
 		})
 	}
 }
--- a/menutraversal_test/test_setup.json
+++ b/menutraversal_test/test_setup.json
@@ -57,7 +57,7 @@
                "steps": [
                    {
                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                        "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                    },
                    {
                        "input": "1",
@@ -73,19 +73,19 @@
                    },
                    {
                        "input": "065656",
-                        "expectedContent": "{max_amount}\nEnter amount:\n0:Back"
+                        "expectedContent": "Maximum amount: 0.003 CELO\nEnter amount:\n0:Back"
                    },
                    {
-                        "input": "10000000",
-                        "expectedContent": "Amount 10000000 is invalid, please try again:\n1:retry\n9:Quit"
+                        "input": "0.1",
+                        "expectedContent": "Amount 0.1 is invalid, please try again:\n1:retry\n9:Quit"
                    },
                    {
                        "input": "1",
-                        "expectedContent": "{max_amount}\nEnter amount:\n0:Back"
+                        "expectedContent": "Maximum amount: 0.003 CELO\nEnter amount:\n0:Back"
                    },
                    {
-                        "input": "1.00",
-                        "expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
+                        "input": "0.001",
+                        "expectedContent": "065656 will receive 0.001 from {public_key}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
                    },
                    {
                        "input": "1222",
@@ -93,11 +93,11 @@
                    },
                    {
                        "input": "1",
-                        "expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
+                        "expectedContent": "065656 will receive 0.001 from {public_key}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
                    },
                    {
                        "input": "1234",
-                        "expectedContent": "Your request has been sent. 065656 will receive {send_amount} from {session_id}."
+                        "expectedContent": "Your request has been sent. 065656 will receive 0.001 from {public_key}."
                    }
                ]
            },
@@ -106,7 +106,7 @@
                "steps": [
                    {
                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                        "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                    },
                    {
                        "input": "4",
@@ -119,7 +119,7 @@
                "steps": [
                    {
                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                        "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                    },
                    {
                        "input": "9",
@@ -127,12 +127,78 @@
                    }
                ]
            },
+            {
+                "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.00 SRFYour account balance is 0.003 CELO"
+                    }
+                ]
+            },
+            {
+                "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 balance is: 0.00 SRFYour account balance is 0.003 CELO"
+                    }
+                ]
+            },
            {
                "name": "menu_my_account_my_address",
                "steps": [
                    {
                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                        "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                    },
                    {
                        "input": "3",
Author	SHA1	Message	Date
Carlosokumu	c21a48c78e	update test engine	2024-10-12 13:33:13 +03:00
Carlosokumu	70e234aa7c	pass account service as a global var	2024-10-12 13:32:34 +03:00
Carlosokumu	554cecc7f3	chore: rename entities	2024-10-12 13:31:26 +03:00
Carlosokumu	d9e922d5be	return error when regex generation fails	2024-10-12 13:30:46 +03:00
Carlosokumu	0837933b6c	move engine to testutil	2024-10-10 16:53:59 +03:00
Carlosokumu	4d5735f85f	add new line	2024-10-10 09:13:04 +03:00
Carlosokumu	85efd2ac6e	match step expected content after replacing actual data	2024-10-09 22:22:23 +03:00
Carlosokumu	8791753b2a	ignore special character in regex	2024-10-09 22:21:11 +03:00
Carlosokumu	c8a5391435	remove extra line	2024-10-09 16:47:21 +03:00
Carlosokumu	c6227acba1	use build tag to define account service	2024-10-09 16:46:22 +03:00
Carlosokumu	e30a7ad3e3	use regex exp to match expected content	2024-10-09 16:45:51 +03:00
Carlosokumu	96aec1fd67	define an event channel	2024-10-09 16:45:09 +03:00
Carlosokumu	810dd74e43	use one test driver	2024-10-09 16:44:51 +03:00
Carlosokumu	3afe35b44f	remove setup driver	2024-10-09 16:25:25 +03:00
Carlosokumu	d01af48216	pass account service as a param	2024-10-08 00:03:29 +03:00
Carlosokumu	d7bfdc62e9	setup test data drivers	2024-10-07 23:35:41 +03:00
Carlosokumu	360b51a3dc	add uuid	2024-10-07 23:33:38 +03:00
Carlosokumu	e1f3ab78f1	Delete connstr in threadgdbm global channel map on close	2024-10-07 23:33:09 +03:00
Carlosokumu	5de82fd08a	add menu traversal tests	2024-10-07 23:32:28 +03:00
Carlosokumu	2220d286b7	add test data files	2024-10-07 23:32:08 +03:00
Carlosokumu	c39c4acc86	add test engine	2024-10-07 23:31:47 +03:00
Carlosokumu	5937e7ea9d	add tag to toggle between online and offline tests	2024-10-07 23:31:30 +03:00
Carlosokumu	35acf75f6b	add mock account service	2024-10-07 23:31:00 +03:00
Carlosokumu	8313ca3509	update affected vis and template files	2024-10-07 23:29:30 +03:00
				`@@ -1 +0,0 @@`
				`Failed to connect to the custodial service.Please try again.`
				`@@ -1 +0,0 @@`
				`Success! {{.set_voucher}} is now your active voucher.`
				`@@ -1 +0,0 @@`
				`Hongera! {{.set_voucher}} ni Sarafu inayotumika sasa.`