use a single FlagReset append statement

remove unused CATCH statement for the flag_incorrect_pin
update the resetIncorrectPINAttempts to cater for edge cases with more than 3 invalid attempts
2025-05-30 05:09:27 +03:00 · 2025-05-30 05:06:29 +03:00 · 2025-05-30 05:01:58 +03:00 · 2025-05-30 04:58:55 +03:00 · 2025-05-30 04:58:20 +03:00 · 2025-05-30 04:57:32 +03:00
97 changed files with 2005 additions and 883 deletions
--- a/.env.example
+++ b/.env.example
@@ -21,3 +21,11 @@ LANGUAGES=eng, swa

 #Alias search domains
 ALIAS_SEARCH_DOMAINS=sarafu.local, sarafu.eth
+
+#Pool swap
+DEFAULT_POOL_NAME="Kenya ROLA Pool"
+DEFAULT_POOL_SYMBOL=ROLA
+DEFAULT_POOL_CONTRACT_ADDRESS=0x48a953cA5cf5298bc6f6Af3C608351f537AAcb9e
+DEFAULT_LIMITER_ADDRESS=
+DEFAULT_VOUCHER_REGISTRY=
+INCLUDE_STABLES_PARAM=false
--- a/2
+++ b/2
@@ -21,7 +21,7 @@ RUN make VISE_PATH=/build/go-vise -B
 WORKDIR /build/sarafu-vise
 RUN echo "Building on $BUILDPLATFORM, building for $TARGETPLATFORM"
 RUN go mod download
-RUN go build -tags logwarn,online -o sarafu-at -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
+RUN go build -tags logdebug,online -o sarafu-at -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go

 FROM debian:bookworm-slim

--- a/cmd/africastalking/main.go
+++ b/cmd/africastalking/main.go
@@ -44,6 +44,7 @@ func main() {
 	var err error
 	var gettextDir string
 	var langs args.LangVar
+	var logDbConnStr string

 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
@@ -55,6 +56,7 @@ func main() {
 	flag.UintVar(&port, "p", config.Port(), "http port")
 	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 	flag.Var(&langs, "language", "add symbol resolution for language")
+	flag.StringVar(&logDbConnStr, "log-c", "db-logs", "log db connection string")
 	flag.Parse()

 	config.Apply(override)
@@ -100,6 +102,11 @@ func main() {
 		fmt.Fprintf(os.Stderr, "userdatadb: %v\n", err)
 		os.Exit(1)
 	}
+	logdb, err := menuStorageService.GetLogDb(ctx, userdataStore, logDbConnStr, "user-data")
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "get log db error: %v\n", err)
+		os.Exit(1)
+	}

 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
@@ -113,6 +120,7 @@ func main() {
 		os.Exit(1)
 	}
 	lhs.SetDataStore(&userdataStore)
+	lhs.SetLogDb(&logdb)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "setdatastore: %v\n", err)
 		os.Exit(1)
--- a/cmd/async/main.go
+++ b/cmd/async/main.go
@@ -56,6 +56,7 @@ func main() {
 	var err error
 	var gettextDir string
 	var langs args.LangVar
+	var logDbConnStr string

 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
@@ -69,6 +70,7 @@ func main() {
 	flag.UintVar(&port, "p", config.Port(), "http port")
 	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 	flag.Var(&langs, "language", "add symbol resolution for language")
+	flag.StringVar(&logDbConnStr, "log-c", "db-logs", "log db connection string")
 	flag.Parse()

 	config.Apply(override)
@@ -120,6 +122,12 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
+
+	logdb, err := menuStorageService.GetLogDb(ctx, userdataStore, logDbConnStr, "user-data")
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "get log db error: %v\n", err)
+		os.Exit(1)
+	}
 	//defer userdataStore.Close(ctx)

 	dbResource, ok := rs.(*resource.DbResource)
@@ -129,6 +137,7 @@ func main() {

 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
+	lhs.SetLogDb(&logdb)

 	accountService := services.New(ctx, menuStorageService)
 	hl, err := lhs.GetHandler(accountService)
--- a/cmd/http/main.go
+++ b/cmd/http/main.go
@@ -43,6 +43,7 @@ func main() {
 	var err error
 	var gettextDir string
 	var langs args.LangVar
+	var logDbConnStr string

 	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
 	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
@@ -55,6 +56,7 @@ func main() {
 	flag.UintVar(&port, "p", config.Port(), "http port")
 	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 	flag.Var(&langs, "language", "add symbol resolution for language")
+	flag.StringVar(&logDbConnStr, "log-c", "db-logs", "log db connection string")
 	flag.Parse()

 	config.Apply(override)
@@ -103,6 +105,12 @@ func main() {
 		os.Exit(1)
 	}

+	logdb, err := menuStorageService.GetLogDb(ctx, userdataStore, logDbConnStr, "user-data")
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "get log db error: %v\n", err)
+		os.Exit(1)
+	}
+
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
 		os.Exit(1)
@@ -110,6 +118,7 @@ func main() {

 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
+	lhs.SetLogDb(&logdb)

 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -36,6 +36,7 @@ func main() {
 	var err error
 	var gettextDir string
 	var langs args.LangVar
+	var logDbConnStr string

 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
@@ -46,6 +47,7 @@ func main() {
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 	flag.Var(&langs, "language", "add symbol resolution for language")
+	flag.StringVar(&logDbConnStr, "log-c", "db-logs", "log db connection string")
 	flag.Parse()

 	config.Apply(override)
@@ -110,6 +112,12 @@ func main() {
 		os.Exit(1)
 	}

+	logdb, err := menuStorageService.GetLogDb(ctx, userdatastore, logDbConnStr, "user-data")
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "get log db error: %v\n", err)
+		os.Exit(1)
+	}
+
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
 		fmt.Fprintf(os.Stderr, "get dbresource error: %v\n", err)
@@ -118,6 +126,7 @@ func main() {

 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdatastore)
+	lhs.SetLogDb(&logdb)
 	lhs.SetPersister(pe)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "localhandler service error: %v\n", err)
--- a/config/config.go
+++ b/config/config.go
@@ -25,7 +25,7 @@ const (
 	defaultSSHHost  string = "127.0.0.1"
 	defaultSSHPort  uint   = 7122
 	defaultHTTPHost string = "127.0.0.1"
-	defaultHTTPPort uint     = 7123
+	defaultHTTPPort uint   = 7123
 	defaultDomain          = "sarafu.local"
 )

@@ -52,7 +52,6 @@ func SearchDomains() []string {
 	return ParsedDomains
 }

-
 func Language() string {
 	return viseconfig.DefaultLanguage
 }
@@ -76,3 +75,15 @@ func PortSSH() uint {
 func ATEndpoint() string {
 	return env.GetEnv("AT_ENDPOINT", "/")
 }
+
+func DefaultPoolAddress() string {
+	return env.GetEnv("DEFAULT_POOL_CONTRACT_ADDRESS", "")
+}
+
+func DefaultPoolName() string {
+	return env.GetEnv("DEFAULT_POOL_NAME", "")
+}
+
+func DefaultPoolSymbol() string {
+	return env.GetEnv("DEFAULT_POOL_SYMBOL", "")
+}
--- a/devtools/lang/main.go
+++ b/devtools/lang/main.go
@@ -15,7 +15,7 @@ import (

 const (
 	changeHeadSrc = `LOAD reset_account_authorized 0
-LOAD reset_incorrect 0
+LOAD reset_incorrect_pin 0
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
 `
--- a/go.mod
+++ b/go.mod
@@ -3,14 +3,14 @@ module git.grassecon.net/grassrootseconomics/sarafu-vise
 go 1.23.4

 require (
-	git.defalsify.org/vise.git v0.3.1
-	git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d
-	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310093912-8145b4bd004b
-	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2
+	git.defalsify.org/vise.git v0.3.2-0.20250507135825-a170e8a79da0
+	git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e
+	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250522123108-24224e553de5
+	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306
 	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694
 	github.com/alecthomas/assert/v2 v2.2.2
 	github.com/gofrs/uuid v4.4.0+incompatible
-	github.com/grassrootseconomics/ussd-data-service v1.2.0-beta
+	github.com/grassrootseconomics/ussd-data-service v1.4.7-beta
 	github.com/jackc/pgx/v5 v5.7.1
 	github.com/peteole/testdata-loader v0.3.0
 	github.com/stretchr/testify v1.9.0
@@ -19,24 +19,50 @@ require (
 )

 require (
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/StackExchange/wmi v1.2.1 // indirect
 	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/bits-and-blooms/bitset v1.14.3 // indirect
+	github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
+	github.com/consensys/bavard v0.1.13 // indirect
+	github.com/consensys/gnark-crypto v0.12.1 // indirect
+	github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
+	github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/deckarep/golang-set/v2 v2.6.0 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
+	github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
+	github.com/ethereum/go-ethereum v1.14.9 // indirect
+	github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 // indirect
 	github.com/fxamacker/cbor/v2 v2.4.0 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grassrootseconomics/eth-custodial v1.3.0-beta // indirect
+	github.com/grassrootseconomics/ethutils v1.3.1 // indirect
 	github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 // indirect
 	github.com/hexops/gotextdiff v1.0.3 // indirect
+	github.com/holiman/uint256 v1.3.1 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/joho/godotenv v1.5.1 // indirect
+	github.com/lmittmann/w3 v0.17.1 // indirect
 	github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a // indirect
+	github.com/mmcloughlin/addchain v0.4.0 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/supranational/blst v0.3.11 // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/time v0.7.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	rsc.io/tmplfunc v0.0.3 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,13 +1,35 @@
-git.defalsify.org/vise.git v0.3.1 h1:A6FhMcur09ft/JzUPGXR+KpA17fltfeBnasyvLMZmq4=
-git.defalsify.org/vise.git v0.3.1/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
-git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d h1:5mzLas+jxTUtusOKx4XvU+n2QvrV/mH17MnJRy46siQ=
-git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310093912-8145b4bd004b h1:xiTpaqWWoF5qcnarY/9ZkT6aVdnKwqztb2gzIahJn4w=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310093912-8145b4bd004b/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
-git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2 h1:YFztSsexCUgFo6M0tbngRwYdgJd3LQV3RO/Jw09u3+k=
-git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2/go.mod h1:6B6ByxXOiRY0NR7K02Bf3fEu7z+2c/6q8PFVNjC5G8w=
+git.defalsify.org/vise.git v0.3.2-0.20250425131748-8b84f59792ce h1:Uke2jQ4wG97gQKnTzxPyBGyhosrU1IWnRNFHtKVrmrk=
+git.defalsify.org/vise.git v0.3.2-0.20250425131748-8b84f59792ce/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.3.2-0.20250507135825-a170e8a79da0 h1:ByRD+b39zVOjOzOf3I1z2L6MSiMZCZT8y0P8MMAAorY=
+git.defalsify.org/vise.git v0.3.2-0.20250507135825-a170e8a79da0/go.mod h1:flN+Gu+0BX0F6trZc5VpJcO4e6mj/+HUw0Z/UqVTFhk=
+git.defalsify.org/vise.git v0.3.2-0.20250507172020-cb22240f1cb9 h1:4kjbYw25MHZe9fqSbujPzpFXrYutFfVipvLrcWYnYks=
+git.defalsify.org/vise.git v0.3.2-0.20250507172020-cb22240f1cb9/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e h1:DcC9qkNl9ny3hxQmsMK6W81+5R/j4ZwYUbvewMI/rlc=
+git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250428082711-5d221b8d565f h1:OAHCP3YR1C5h1WFnnEnLs5kn6jTxQHQYWYtQaMZJIMY=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250428082711-5d221b8d565f/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250516094326-3b85167ad84a h1:QNh0NaKtGbSeRPlTVKEAnqc0R5rnVrpDMrCHD/EaU5U=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250516094326-3b85167ad84a/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517113706-ee434dba6980 h1:FQUwTDFWduY7gCMi1U2OiFlsuAHLojWUw2hvZ4cGC2s=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517113706-ee434dba6980/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517114512-050998ff82b1 h1:0hvILlGkZnXO8o7nZth4xu77vAS4zVQ6Ae0rb5x/Idg=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517114512-050998ff82b1/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250520125035-81fbc2574c30 h1:iZVmR/4xSoxahtkMBXs/z1HUSSnr+x1m+9AxXIgTvb0=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250520125035-81fbc2574c30/go.mod h1:R7+mt27mhm4/LCutAHHv87pOsLxXEPO93KXnhP8H6W0=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250521124206-343d30a2f27c h1:c2cA5hcYnLgs7kR4fF5tp42W6VQClTukbfKoaeskZu0=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250521124206-343d30a2f27c/go.mod h1:R7+mt27mhm4/LCutAHHv87pOsLxXEPO93KXnhP8H6W0=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250521141246-6c3719e3b652 h1:MmUQRL6Fjq/jlL53h+cUbJ7WwQ+q/yNy/zT05c7bgNg=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250521141246-6c3719e3b652/go.mod h1:wKHPy1mpOCr9ahkRltwm1yi9qH/3m9xb8hMCX5C0L1o=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250522123108-24224e553de5 h1:7gVnkpybzg5lC7C8Rl4dejTbmBVpu5xfMMfda+d498U=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250522123108-24224e553de5/go.mod h1:wKHPy1mpOCr9ahkRltwm1yi9qH/3m9xb8hMCX5C0L1o=
+git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306 h1:Jo+yWysWw/N5BJQtAyEMN8ePVvAyPHv+JG4lQti+1N4=
+git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306/go.mod h1:FdLwYtzsjOIcDiW4uDgDYnB4Wdzq12uJUe0QHSSPbSo=
 git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 h1:DjJlBSz0S13acft5XZDWk7ZYnzElym0xLMYEVgyNJ+E=
 git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694/go.mod h1:DpibtYpnT3nG4Kn556hRAkdu4+CtiI/6MbnQHal51mQ=
+github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
+github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
+github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
 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=
@@ -16,21 +38,60 @@ 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/bits-and-blooms/bitset v1.14.3 h1:Gd2c8lSNf9pKXom5JtD7AaKO8o7fGQ2LtFj1436qilA=
+github.com/bits-and-blooms/bitset v1.14.3/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
+github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ=
+github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
+github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ=
+github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI=
+github.com/consensys/gnark-crypto v0.12.1 h1:lHH39WuuFgVHONRl3J0LRBtuYdQTumFSDtJF7HpyG8M=
+github.com/consensys/gnark-crypto v0.12.1/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY=
+github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c h1:uQYC5Z1mdLRPrZhHjHxufI8+2UG/i25QG92j0Er9p6I=
+github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c/go.mod h1:geZJZH3SzKCqnz5VT0q/DyIG/tvu/dZk+VIfXicupJs=
+github.com/crate-crypto/go-kzg-4844 v1.0.0 h1:TsSgHwrkTKecKJ4kadtHi4b3xHW5dCFUDFnUp1TsawI=
+github.com/crate-crypto/go-kzg-4844 v1.0.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc=
 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/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM=
+github.com/deckarep/golang-set/v2 v2.6.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
+github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
+github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=
+github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
+github.com/ethereum/go-ethereum v1.14.9 h1:J7iwXDrtUyE9FUjUYbd4c9tyzwMh6dTJsKzo9i6SrwA=
+github.com/ethereum/go-ethereum v1.14.9/go.mod h1:QeW+MtTpRdBEm2pUFoonByee8zfHv7kGp0wK0odvU1I=
+github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 h1:8NfxH2iXvJ60YRB8ChToFTUzl8awsc3cJ8CbLjGIl/A=
+github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
 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/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
+github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 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/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 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/grassrootseconomics/ethutils v1.3.1 h1:LlQO90HjJkl7ejC8fv6jP7RJUrAm1j4VMMCYfsoIrhU=
+github.com/grassrootseconomics/ethutils v1.3.1/go.mod h1:Wuv1VEZrkLIXqTSEYI3Nh9HG/ZHOUQ+U+xvWJ8QtjgQ=
 github.com/grassrootseconomics/ussd-data-service v1.2.0-beta h1:fn1gwbWIwHVEBtUC2zi5OqTlfI/5gU1SMk0fgGixIXk=
 github.com/grassrootseconomics/ussd-data-service v1.2.0-beta/go.mod h1:omfI0QtUwIdpu9gMcUqLMCG8O1XWjqJGBx1qUMiGWC0=
+github.com/grassrootseconomics/ussd-data-service v1.4.0-beta h1:4fMd/3h2ZIhRg4GdHQmRw5FfD3MpJvFNNJQo+Q27f5M=
+github.com/grassrootseconomics/ussd-data-service v1.4.0-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
+github.com/grassrootseconomics/ussd-data-service v1.4.4-beta h1:turlyo0i3OLj29mWpWNoB/3Qao8qEngT/5d1jDWTZE4=
+github.com/grassrootseconomics/ussd-data-service v1.4.4-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
+github.com/grassrootseconomics/ussd-data-service v1.4.7-beta h1:yAe1YaOBsdxW2m20jnVU4F0kLmFr+mK/gHCWEdHmE90=
+github.com/grassrootseconomics/ussd-data-service v1.4.7-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
 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/holiman/uint256 v1.3.1 h1:JfTzmih28bittyHM8z360dCjIA9dbPIBlcTI6lmctQs=
+github.com/holiman/uint256 v1.3.1/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E=
 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=
@@ -45,8 +106,13 @@ 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/lmittmann/w3 v0.17.1 h1:zdXIimmNmYfqOFur+Jqc9Yqwtq6jwnsQufbTOnSAtW4=
+github.com/lmittmann/w3 v0.17.1/go.mod h1:WVUGMbL83WYBu4Sge3SVlW3qIG4VaHe+S8+UUnwz9Eg=
 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/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY=
+github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU=
+github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
 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=
@@ -56,6 +122,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 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/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU=
+github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 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=
@@ -63,18 +131,32 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 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/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4=
+github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
+github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
+github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
+github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
+github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
 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.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
 golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
 golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
 golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
+golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 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=
@@ -83,3 +165,5 @@ gopkg.in/leonelquinteros/gotext.v1 v1.3.1/go.mod h1:X1WlGDeAFIYsW6GjgMm4VwUwZ2Xj
 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=
+rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU=
+rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA=
--- a/handlers/application/menuhandler.go
+++ b/handlers/application/menuhandler.go
--- a/handlers/application/menuhandler_test.go
+++ b/handlers/application/menuhandler_test.go
--- a/handlers/local.go
+++ b/handlers/local.go
@@ -27,6 +27,7 @@ type LocalHandlerService struct {
 	DbRs          *resource.DbResource
 	Pe            *persist.Persister
 	UserdataStore *db.Db
+	LogDb         *db.Db
 	Cfg           engine.Config
 	Rs            resource.Resource
 	first         resource.EntryFunc
@@ -57,12 +58,16 @@ func (ls *LocalHandlerService) SetDataStore(db *db.Db) {
 	ls.UserdataStore = db
 }

+func (ls *LocalHandlerService) SetLogDb(db *db.Db) {
+	ls.LogDb = db
+}
+
 func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService) (*application.MenuHandlers, error) {
 	replaceSeparatorFunc := func(input string) string {
 		return strings.ReplaceAll(input, ":", ls.Cfg.MenuSeparator)
 	}

-	appHandlers, err := application.NewMenuHandlers(ls.Parser, *ls.UserdataStore, accountService, replaceSeparatorFunc)
+	appHandlers, err := application.NewMenuHandlers(ls.Parser, *ls.UserdataStore, *ls.LogDb, accountService, replaceSeparatorFunc)
 	if err != nil {
 		return nil, err
 	}
@@ -86,7 +91,7 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("get_recipient", appHandlers.GetRecipient)
 	ls.DbRs.AddLocalFunc("get_sender", appHandlers.GetSender)
 	ls.DbRs.AddLocalFunc("get_amount", appHandlers.GetAmount)
-	ls.DbRs.AddLocalFunc("reset_incorrect", appHandlers.ResetIncorrectPin)
+	ls.DbRs.AddLocalFunc("reset_incorrect_pin", appHandlers.ResetIncorrectPin)
 	ls.DbRs.AddLocalFunc("save_firstname", appHandlers.SaveFirstname)
 	ls.DbRs.AddLocalFunc("save_familyname", appHandlers.SaveFamilyname)
 	ls.DbRs.AddLocalFunc("save_gender", appHandlers.SaveGender)
@@ -99,23 +104,18 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("verify_yob", appHandlers.VerifyYob)
 	ls.DbRs.AddLocalFunc("reset_incorrect_date_format", appHandlers.ResetIncorrectYob)
 	ls.DbRs.AddLocalFunc("initiate_transaction", appHandlers.InitiateTransaction)
-	ls.DbRs.AddLocalFunc("verify_new_pin", appHandlers.VerifyNewPin)
 	ls.DbRs.AddLocalFunc("confirm_pin_change", appHandlers.ConfirmPinChange)
 	ls.DbRs.AddLocalFunc("quit_with_help", appHandlers.QuitWithHelp)
 	ls.DbRs.AddLocalFunc("fetch_community_balance", appHandlers.FetchCommunityBalance)
-	ls.DbRs.AddLocalFunc("set_default_voucher", appHandlers.SetDefaultVoucher)
-	ls.DbRs.AddLocalFunc("check_vouchers", appHandlers.CheckVouchers)
+	ls.DbRs.AddLocalFunc("manage_vouchers", appHandlers.ManageVouchers)
 	ls.DbRs.AddLocalFunc("get_vouchers", appHandlers.GetVoucherList)
 	ls.DbRs.AddLocalFunc("view_voucher", appHandlers.ViewVoucher)
 	ls.DbRs.AddLocalFunc("set_voucher", appHandlers.SetVoucher)
 	ls.DbRs.AddLocalFunc("get_voucher_details", appHandlers.GetVoucherDetails)
-	ls.DbRs.AddLocalFunc("reset_valid_pin", appHandlers.ResetValidPin)
-	ls.DbRs.AddLocalFunc("check_pin_mismatch", appHandlers.CheckBlockedNumPinMisMatch)
 	ls.DbRs.AddLocalFunc("validate_blocked_number", appHandlers.ValidateBlockedNumber)
 	ls.DbRs.AddLocalFunc("retrieve_blocked_number", appHandlers.RetrieveBlockedNumber)
 	ls.DbRs.AddLocalFunc("reset_unregistered_number", appHandlers.ResetUnregisteredNumber)
 	ls.DbRs.AddLocalFunc("reset_others_pin", appHandlers.ResetOthersPin)
-	ls.DbRs.AddLocalFunc("save_others_temporary_pin", appHandlers.SaveOthersTemporaryPin)
 	ls.DbRs.AddLocalFunc("get_current_profile_info", appHandlers.GetCurrentProfileInfo)
 	ls.DbRs.AddLocalFunc("check_transactions", appHandlers.CheckTransactions)
 	ls.DbRs.AddLocalFunc("get_transactions", appHandlers.GetTransactionsList)
@@ -129,7 +129,11 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("get_suggested_alias", appHandlers.GetSuggestedAlias)
 	ls.DbRs.AddLocalFunc("confirm_new_alias", appHandlers.ConfirmNewAlias)
 	ls.DbRs.AddLocalFunc("check_account_created", appHandlers.CheckAccountCreated)
-
+	ls.DbRs.AddLocalFunc("reset_api_call_failure", appHandlers.ResetApiCallFailure)
+	ls.DbRs.AddLocalFunc("swap_to_list", appHandlers.LoadSwapToList)
+	ls.DbRs.AddLocalFunc("swap_max_limit", appHandlers.SwapMaxLimit)
+	ls.DbRs.AddLocalFunc("swap_preview", appHandlers.SwapPreview)
+	ls.DbRs.AddLocalFunc("initiate_swap", appHandlers.InitiateSwap)
 	ls.first = appHandlers.Init

 	return appHandlers, nil
--- a/internal/sms/sms.go
+++ b/internal/sms/sms.go
@@ -0,0 +1,96 @@
+package sms
+
+import (
+	"context"
+	"fmt"
+
+	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/grassrootseconomics/common/phone"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
+	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+)
+
+var (
+	logg = logging.NewVanilla().WithDomain("smsservice")
+)
+
+type SmsService struct {
+	Accountservice remote.AccountService
+	Userdatastore  store.UserDataStore
+}
+
+// SendUpsellSMS will send an invitation SMS to an unregistered phone number
+func (smsservice *SmsService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) error {
+	if !phone.IsValidPhoneNumber(inviterPhone) {
+		return fmt.Errorf("invalid inviter phone number %v", inviterPhone)
+	}
+
+	if !phone.IsValidPhoneNumber(inviteePhone) {
+		return fmt.Errorf("Invalid invitee phone number %v", inviteePhone)
+	}
+	_, err := smsservice.Accountservice.SendUpsellSMS(ctx, inviterPhone, inviteePhone)
+	if err != nil {
+		return fmt.Errorf("Failed to send upsell sms: %v", err)
+	}
+	return nil
+}
+
+// sendPINResetSMS will send an SMS to a user's phonenumber in the event that the associated account's PIN has been reset.
+func (smsService *SmsService) SendPINResetSMS(ctx context.Context, adminPhoneNumber, blockedPhoneNumber string) error {
+	formattedAdminPhone, err := phone.FormatPhoneNumber(adminPhoneNumber)
+	if err != nil {
+		return fmt.Errorf("failed to format admin phone number: %w", err)
+	}
+
+	formattedBlockedPhone, err := phone.FormatPhoneNumber(blockedPhoneNumber)
+	if err != nil {
+		return fmt.Errorf("failed to format blocked phone number: %w", err)
+	}
+
+	if !phone.IsValidPhoneNumber(formattedAdminPhone) {
+		return fmt.Errorf("invalid admin phone number")
+	}
+	if !phone.IsValidPhoneNumber(formattedBlockedPhone) {
+		return fmt.Errorf("invalid blocked phone number")
+	}
+
+	err = smsService.Accountservice.SendPINResetSMS(ctx, formattedAdminPhone, formattedBlockedPhone)
+	if err != nil {
+		return fmt.Errorf("failed to send pin reset sms: %v", err)
+	}
+
+	return nil
+}
+
+// SendAddressSMS will triger an SMS when a user navigates to the my address node.The SMS will be sent to the associated phonenumber.
+func (smsService *SmsService) SendAddressSMS(ctx context.Context) error {
+	store := smsService.Userdatastore
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return fmt.Errorf("missing session")
+	}
+
+	publicKey, err := store.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", storedb.DATA_PUBLIC_KEY, "error", err)
+		return err
+	}
+
+	originPhone, err := phone.FormatPhoneNumber(sessionId)
+	if err != nil {
+		logg.DebugCtxf(ctx, "Failed to format origin phonenumber", "sessionid", sessionId)
+		return nil
+	}
+
+	if !phone.IsValidPhoneNumber(originPhone) {
+		logg.InfoCtxf(ctx, "Invalid origin phone number", "origin phonenumber", originPhone)
+		return fmt.Errorf("invalid origin phone number")
+	}
+	err = smsService.Accountservice.SendAddressSMS(ctx, string(publicKey), originPhone)
+	if err != nil {
+		logg.DebugCtxf(ctx, "Failed to send address sms", "error", err)
+		return fmt.Errorf("Failed to send address sms: %v", err)
+	}
+	return nil
+}
--- a/menutraversal_test/group_test.json
+++ b/menutraversal_test/group_test.json
@@ -202,23 +202,7 @@
                },
                {
                    "input": "0700000000",
-                    "expectedContent": "Please enter new PIN for: {secondary_session_id}\n0:Back"
-                },
-                {
-                    "input": "11111",
-                    "expectedContent": "The PIN you have entered is invalid.Please try a 4 digit number instead.\n1:Retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter new PIN for: {secondary_session_id}\n0:Back"
-                },
-                {
-                    "input": "1111",
-                    "expectedContent": "Please confirm new PIN for: {secondary_session_id}\n0:Back"
-                },
-                {
-                    "input": "1111",
-                    "expectedContent": "Please enter your PIN:"
+                    "expectedContent": "{secondary_session_id} will get a PIN reset request.\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
                },
                {
                    "input": "1234",
@@ -612,7 +596,7 @@
                },
                {
                    "input": "1234",
-                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 80\nLocation: Kilifi\nYou provide: Bananas\nYour alias: \n\n0:Back\n9:Quit"
+                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 80\nLocation: Kilifi\nYou provide: Bananas\nYour alias: Not Provided\n\n0:Back\n9:Quit"
                },
                {
                    "input": "0",
--- a/services/registration/address.vis
+++ b/services/registration/address.vis
@@ -1,5 +1,4 @@
 LOAD check_identifier 0
-RELOAD check_identifier
 MAP check_identifier
 MOUT back 0
 MOUT quit 9
--- a/services/registration/amount.vis
+++ b/services/registration/amount.vis
@@ -6,7 +6,7 @@ MOUT back 0
 HALT
 LOAD validate_amount 64
 RELOAD validate_amount
-CATCH api_failure flag_api_call_error  1
+CATCH api_failure flag_api_call_error 1
 CATCH invalid_amount flag_invalid_amount 1
 INCMP _ 0
 LOAD get_recipient 0
--- a/services/registration/api_failure
+++ b/services/registration/api_failure
@@ -1 +1 @@
-Failed to connect to the custodial service.Please try again.
+Your request failed. Please try again later.
--- a/services/registration/api_failure.vis
+++ b/services/registration/api_failure.vis
@@ -1,5 +1,7 @@
+LOAD reset_api_call_failure 6
+RELOAD reset_api_call_failure
 MOUT retry 1
 MOUT quit 9
 HALT
-INCMP _ 1
+INCMP ^ 1
 INCMP quit 9
--- a/services/registration/api_failure_swa
+++ b/services/registration/api_failure_swa
@@ -0,0 +1 @@
+Ombi lako halikufaulu. Tafadhali jaribu tena baadaye.
--- a/services/registration/authorize_reset_others_pin
+++ b/services/registration/authorize_reset_others_pin
@@ -0,0 +1,2 @@
+{{.retrieve_blocked_number}} will get a PIN reset request.
+Please enter your PIN to confirm:
--- a/services/registration/authorize_reset_others_pin.vis
+++ b/services/registration/authorize_reset_others_pin.vis
@@ -0,0 +1,12 @@
+LOAD retrieve_blocked_number 0
+RELOAD retrieve_blocked_number
+MAP retrieve_blocked_number
+MOUT back 0
+MOUT quit 9
+LOAD authorize_account 6
+HALT
+RELOAD authorize_account
+CATCH incorrect_pin flag_incorrect_pin 1
+INCMP _ 0
+INCMP quit 9
+INCMP pin_reset_result *
--- a/services/registration/authorize_reset_others_pin_swa
+++ b/services/registration/authorize_reset_others_pin_swa
@@ -0,0 +1,2 @@
+{{.retrieve_blocked_number}} atapokea ombi la kuweka upya PIN.
+Tafadhali weka PIN yako kudhibitisha:
--- a/services/registration/change_language.vis
+++ b/services/registration/change_language.vis
@@ -1,5 +1,5 @@
 LOAD reset_account_authorized 0
-LOAD reset_incorrect 0
+LOAD reset_incorrect_pin 0
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
 MOUT english 1
--- a/services/registration/check_statement.vis
+++ b/services/registration/check_statement.vis
@@ -1,5 +1,6 @@
 LOAD check_transactions 0
 RELOAD check_transactions
+CATCH api_failure flag_api_call_error 1
 CATCH no_transfers flag_no_transfers 1
 LOAD authorize_account 6
 MOUT back 0
--- a/services/registration/community_balance.vis
+++ b/services/registration/community_balance.vis
@@ -1,6 +1,6 @@
-LOAD reset_incorrect 6
+LOAD reset_incorrect_pin 6
 LOAD fetch_community_balance 0
-CATCH api_failure  flag_api_call_error  1
+CATCH api_failure flag_api_call_error 1
 MAP fetch_community_balance
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
--- a/services/registration/confirm_create_pin.vis
+++ b/services/registration/confirm_create_pin.vis
@@ -1,4 +1,7 @@
-LOAD save_temporary_pin 6
+MOUT back 0
 HALT
+INCMP _ 0
 LOAD verify_create_pin 8
+RELOAD verify_create_pin
+CATCH pin_mismatch flag_pin_mismatch 1
 INCMP account_creation *
--- a/services/registration/confirm_new_alias.vis
+++ b/services/registration/confirm_new_alias.vis
@@ -8,5 +8,5 @@ HALT
 INCMP _ 0
 RELOAD authorize_account
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH invalid_pin flag_invalid_pin   1
+CATCH invalid_pin flag_invalid_pin 1
 CATCH update_alias flag_allow_update 1
--- a/services/registration/confirm_others_new_pin
+++ b/services/registration/confirm_others_new_pin
@@ -1 +0,0 @@
-Please confirm new PIN for: {{.retrieve_blocked_number}}
--- a/services/registration/confirm_others_new_pin.vis
+++ b/services/registration/confirm_others_new_pin.vis
@@ -1,14 +0,0 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-RELOAD retrieve_blocked_number
-MAP retrieve_blocked_number
-CATCH invalid_others_pin flag_valid_pin 0
-CATCH pin_reset_result flag_account_authorized 1
-LOAD save_others_temporary_pin 6
-RELOAD save_others_temporary_pin
-MOUT back 0
-HALT 
-INCMP _ 0
-LOAD check_pin_mismatch 6
-RELOAD check_pin_mismatch
-CATCH others_pin_mismatch flag_pin_mismatch 1
-INCMP pin_entry *
--- a/services/registration/confirm_others_new_pin_swa
+++ b/services/registration/confirm_others_new_pin_swa
@@ -1 +0,0 @@
-Tafadhali thibitisha PIN mpya ya: {{.retrieve_blocked_number}}
--- a/services/registration/confirm_pin_change.vis
+++ b/services/registration/confirm_pin_change.vis
@@ -1,7 +1,7 @@
-LOAD confirm_pin_change 0
 MOUT back 0
 HALT
 INCMP _ 0
+LOAD confirm_pin_change 0
 RELOAD confirm_pin_change
-CATCH pin_reset_mismatch  flag_pin_mismatch 1
-INCMP * pin_reset_success
+CATCH pin_mismatch flag_pin_mismatch 1
+INCMP pin_reset_success *
--- a/services/registration/create_pin.vis
+++ b/services/registration/create_pin.vis
@@ -2,8 +2,8 @@ LOAD create_account 0
 CATCH account_creation_failed flag_account_creation_failed 1
 MOUT exit 0
 HALT
+INCMP quit 0
 LOAD save_temporary_pin 6
 RELOAD save_temporary_pin
-CATCH . flag_incorrect_pin 1
-INCMP quit 0
+CATCH invalid_pin flag_invalid_pin 1
 INCMP confirm_create_pin *
--- a/services/registration/create_pin_mismatch.vis
+++ b/services/registration/create_pin_mismatch.vis
@@ -1,5 +0,0 @@
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP confirm_create_pin 1
-INCMP quit 9
--- a/services/registration/enter_other_number.vis
+++ b/services/registration/enter_other_number.vis
@@ -7,4 +7,4 @@ INCMP _ 0
 LOAD validate_blocked_number 6
 RELOAD validate_blocked_number
 CATCH unregistered_number flag_unregistered_number 1
-INCMP enter_others_new_pin *
+INCMP authorize_reset_others_pin *
--- a/services/registration/enter_others_new_pin
+++ b/services/registration/enter_others_new_pin
@@ -1 +0,0 @@
-Please enter new PIN for: {{.retrieve_blocked_number}}
--- a/services/registration/enter_others_new_pin.vis
+++ b/services/registration/enter_others_new_pin.vis
@@ -1,9 +0,0 @@
-LOAD retrieve_blocked_number 0
-RELOAD retrieve_blocked_number
-MAP retrieve_blocked_number
-MOUT back 0
-HALT 
-LOAD verify_new_pin 6
-RELOAD verify_new_pin
-INCMP _ 0
-INCMP * confirm_others_new_pin
--- a/services/registration/enter_others_new_pin_swa
+++ b/services/registration/enter_others_new_pin_swa
@@ -1 +0,0 @@
-Tafadhali weka PIN mpya ya: {{.retrieve_blocked_number}}
--- a/services/registration/incorrect_pin
+++ b/services/registration/incorrect_pin
@@ -1 +1 @@
-Incorrect PIN. You have: {{.reset_incorrect}} remaining attempt(s).
+Incorrect PIN. You have: {{.reset_incorrect_pin}} remaining attempt(s).
--- a/services/registration/incorrect_pin.vis
+++ b/services/registration/incorrect_pin.vis
@@ -1,6 +1,6 @@
-LOAD reset_incorrect 0
-RELOAD reset_incorrect
-MAP reset_incorrect
+LOAD reset_incorrect_pin 0
+RELOAD reset_incorrect_pin
+MAP reset_incorrect_pin
 CATCH blocked_account flag_account_blocked 1
 MOUT retry 1
 MOUT quit 9
--- a/services/registration/incorrect_pin_swa
+++ b/services/registration/incorrect_pin_swa
@@ -1 +1 @@
-PIN ulioeka sio sahihi, una majaribio: {{.reset_incorrect}} yaliyobaki
+PIN ulioeka sio sahihi, una majaribio: {{.reset_incorrect_pin}} yaliyobaki
--- a/services/registration/invalid_others_pin
+++ b/services/registration/invalid_others_pin
@@ -1 +0,0 @@
-The PIN you have entered is invalid.Please try a 4 digit number instead.
--- a/services/registration/invalid_others_pin.vis
+++ b/services/registration/invalid_others_pin.vis
@@ -1,5 +0,0 @@
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP enter_others_new_pin 1
-INCMP quit 9
--- a/services/registration/invalid_pin
+++ b/services/registration/invalid_pin
@@ -1 +1 @@
-The PIN you entered is invalid.The PIN must be a 4 digit number.
+The PIN you entered is invalid. The PIN must be a 4 digit number.
--- a/services/registration/locale/swa/default.po
+++ b/services/registration/locale/swa/default.po
@@ -31,6 +31,11 @@ msgstr "Salio la Kikundi: 0.00"
 msgid "Symbol: %s\nBalance: %s"
 msgstr "Sarafu: %s\nSalio: %s"

+msgid "Your request has been sent. You will receive an SMS when your %s %s has been swapped for %s."
+msgstr "Ombi lako limetumwa. Utapokea SMS wakati %s %s yako itakapobadilishwa kuwa %s."

 msgid "%s balance: %s\n"
-msgstr "%s salio: %s\n"
+msgstr "%s salio: %s\n"
+
+msgid "%s is not in %s. Please update your voucher and try again."
+msgstr "%s haipo kwenye %s. Tafadhali badilisha sarafu yako na ujaribu tena."
--- a/services/registration/low_swap_amount
+++ b/services/registration/low_swap_amount
@@ -0,0 +1 @@
+Available amount {{.swap_max_limit}} is too low, please try again:
--- a/services/registration/pin_reset_mismatch.vis
+++ b/services/registration/pin_reset_mismatch.vis
@@ -1,6 +1,6 @@
+MAP swap_max_limit
 MOUT retry 1
 MOUT quit 9
 HALT
 INCMP _ 1
 INCMP quit 9
-INCMP . *
--- a/services/registration/low_swap_amount_swa
+++ b/services/registration/low_swap_amount_swa
@@ -0,0 +1 @@
+Kiasi kinachopatikana {{.swap_max_limit}} ni cha chini sana, tafadhali jaribu tena:
--- a/services/registration/main.vis
+++ b/services/registration/main.vis
@@ -1,22 +1,22 @@
 LOAD clear_temporary_value 2
 RELOAD clear_temporary_value
-LOAD set_default_voucher 8
-RELOAD set_default_voucher
-LOAD check_vouchers 10
-RELOAD check_vouchers
+LOAD manage_vouchers 160
+RELOAD manage_vouchers
+CATCH api_failure flag_api_call_error 1
 LOAD check_balance 128
 RELOAD check_balance
-CATCH api_failure flag_api_call_error 1
 MAP check_balance
 MOUT send 1
-MOUT vouchers 2
-MOUT account 3
-MOUT help 4
+MOUT swap 2
+MOUT vouchers 3
+MOUT account 4
+MOUT help 5
 MOUT quit 9
 HALT
 INCMP send 1
-INCMP my_vouchers 2
-INCMP my_account 3
-INCMP help 4
+INCMP swap_to_list 2
+INCMP my_vouchers 3
+INCMP my_account 4
+INCMP help 5
 INCMP quit 9
 INCMP . *
--- a/services/registration/missing_voucher
+++ b/services/registration/missing_voucher
@@ -0,0 +1 @@
+{{.swap_to_list}}
--- a/services/registration/missing_voucher.vis
+++ b/services/registration/missing_voucher.vis
@@ -0,0 +1,6 @@
+MAP swap_to_list
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP ^ 0
+INCMP quit 9
--- a/services/registration/missing_voucher_swa
+++ b/services/registration/missing_voucher_swa
@@ -0,0 +1 @@
+{{.swap_to_list}}
--- a/services/registration/my_account.vis
+++ b/services/registration/my_account.vis
@@ -9,7 +9,7 @@ MOUT my_address 6
 MOUT my_account_alias 7
 MOUT back 0
 HALT
-INCMP main 0
+INCMP ^ 0
 INCMP edit_profile 1
 INCMP change_language 2
 INCMP balances 3
--- a/services/registration/my_account_alias.vis
+++ b/services/registration/my_account_alias.vis
@@ -5,4 +5,5 @@ HALT
 INCMP _ 0
 LOAD request_custom_alias 0
 RELOAD request_custom_alias
-INCMP  confirm_new_alias *
+CATCH api_failure flag_api_call_error 1
+INCMP confirm_new_alias *
--- a/services/registration/my_balance.vis
+++ b/services/registration/my_balance.vis
@@ -1,6 +1,6 @@
-LOAD reset_incorrect 6
+LOAD reset_incorrect_pin 6
 LOAD check_balance 0
-CATCH api_failure  flag_api_call_error  1
+CATCH api_failure flag_api_call_error 1
 MAP check_balance
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
--- a/services/registration/new_pin.vis
+++ b/services/registration/new_pin.vis
@@ -2,6 +2,5 @@ MOUT back 0
 HALT
 INCMP _ 0
 RELOAD save_temporary_pin
-RELOAD verify_new_pin
-CATCH invalid_pin flag_valid_pin 0
-INCMP * confirm_pin_change
+CATCH invalid_pin flag_invalid_pin 1
+INCMP confirm_pin_change *
--- a/services/registration/old_pin.vis
+++ b/services/registration/old_pin.vis
@@ -1,8 +1,8 @@
-RELOAD reset_incorrect
+RELOAD reset_incorrect_pin
 MOUT back 0
 HALT
 INCMP _ 0
 RELOAD authorize_account
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH invalid_pin  flag_invalid_pin 1
+CATCH invalid_pin flag_invalid_pin 1
 INCMP new_pin *
--- a/services/registration/others_pin_mismatch
+++ b/services/registration/others_pin_mismatch
@@ -1 +0,0 @@
-The PIN you have entered is not a match
--- a/services/registration/others_pin_mismatch_swa
+++ b/services/registration/others_pin_mismatch_swa
@@ -1 +0,0 @@
-PIN uliyoweka hailingani.Jaribu tena.
--- a/services/registration/pin_management.vis
+++ b/services/registration/pin_management.vis
@@ -1,9 +1,8 @@
 LOAD set_back 6
 LOAD authorize_account 16
 LOAD reset_allow_update 4
-LOAD verify_new_pin 2
 LOAD save_temporary_pin 1
-LOAD reset_incorrect 0
+LOAD reset_incorrect_pin 0
 LOAD reset_invalid_pin 6
 MOUT change_pin 1
 MOUT reset_pin 2
--- a/services/registration/create_pin_mismatch
+++ b/services/registration/create_pin_mismatch
--- a/services/registration/others_pin_mismatch.vis
+++ b/services/registration/others_pin_mismatch.vis
--- a/services/registration/create_pin_mismatch_swa
+++ b/services/registration/create_pin_mismatch_swa
--- a/services/registration/pin_reset_mismatch
+++ b/services/registration/pin_reset_mismatch
@@ -1 +0,0 @@
-The PIN is not a match. Try again
--- a/services/registration/pin_reset_mismatch_swa
+++ b/services/registration/pin_reset_mismatch_swa
@@ -1 +0,0 @@
-PIN uliyoweka hailingani.Jaribu tena.
--- a/services/registration/pin_reset_result.vis
+++ b/services/registration/pin_reset_result.vis
@@ -1,3 +1,4 @@
+CATCH _ flag_account_authorized 0
 LOAD retrieve_blocked_number 0
 MAP retrieve_blocked_number
 LOAD reset_others_pin 6
@@ -5,4 +6,4 @@ MOUT back 0
 MOUT quit 9
 HALT
 INCMP ^ 0
-INCMP quit  9
+INCMP quit 9
--- a/services/registration/pin_reset_success.vis
+++ b/services/registration/pin_reset_success.vis
@@ -1,6 +1,6 @@
 MOUT back 0
 MOUT quit 9
 HALT
-INCMP main 0
+INCMP ^ 0
 INCMP quit 9
 INCMP . *
--- a/services/registration/pp.csv
+++ b/services/registration/pp.csv
@@ -9,7 +9,7 @@ flag,flag_account_authorized,15,this is set to allow a user access guarded nodes
 flag,flag_invalid_recipient,16,this is set when the transaction recipient is invalid
 flag,flag_invalid_recipient_with_invite,17,this is set when the transaction recipient is valid but not on the platform
 flag,flag_invalid_amount,18,this is set when the given transaction amount is invalid
-flag,flag_incorrect_pin,19,this is set when the provided PIN is invalid or does not match the current account's PIN
+flag,flag_incorrect_pin,19,this is set when the provided PIN does not match the current account's PIN
 flag,flag_valid_pin,20,this is set when the given PIN is valid
 flag,flag_allow_update,21,this is set to allow a user to update their profile data
 flag,flag_single_edit,22,this is set to allow a user to edit a single profile item such as year of birth
@@ -31,3 +31,7 @@ flag,flag_back_set,37,this is set when it is a back navigation
 flag,flag_account_blocked,38,this is set when an account has been blocked after the allowed incorrect PIN attempts have been exceeded
 flag,flag_invalid_pin,39,this is set when the given PIN is invalid(is  less than or more than 4 digits)
 flag,flag_alias_set,40,this is set when an account alias has been assigned to a user
+flag,flag_account_pin_reset,41,this is set on an account when an admin triggers a PIN reset for themflag,flag_incorrect_pool,39,this is set when the user selects an invalid pool
+flag,flag_incorrect_pool,42,this is set when the user selects an invalid pool
+flag,flag_low_swap_amount,43,this is set when the swap max limit is less than 0.1
+
--- a/services/registration/root.vis
+++ b/services/registration/root.vis
@@ -2,13 +2,14 @@ LOAD check_blocked_status 1
 RELOAD check_blocked_status
 LOAD check_account_created 2
 RELOAD check_account_created
+CATCH self_reset_pin flag_account_pin_reset 1
 CATCH blocked_account flag_account_blocked 1
 CATCH select_language flag_language_set 0
 CATCH terms flag_account_created 0
+CATCH create_pin flag_pin_set 0
 LOAD check_account_status 0
 RELOAD check_account_status
-CATCH api_failure flag_api_call_error  1
+CATCH api_failure flag_api_call_error 1
 CATCH account_pending flag_account_pending 1
-CATCH create_pin flag_pin_set 0
 CATCH main flag_account_success 1
 HALT
--- a/services/registration/select_voucher.vis
+++ b/services/registration/select_voucher.vis
@@ -3,14 +3,14 @@ LOAD get_vouchers 0
 MAP get_vouchers
 MOUT back 0
 MOUT quit 99
-MNEXT next 11
-MPREV prev 22
+MNEXT next 88
+MPREV prev 98
 HALT
+INCMP > 88
+INCMP < 98
+INCMP _ 0
+INCMP quit 99
 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/self_reset_pin
+++ b/services/registration/self_reset_pin
@@ -0,0 +1,2 @@
+A PIN reset has been done on your account.
+Please enter a new four number PIN:
--- a/services/registration/self_reset_pin.vis
+++ b/services/registration/self_reset_pin.vis
@@ -0,0 +1,6 @@
+LOAD reset_invalid_pin 6
+HALT
+LOAD save_temporary_pin 1
+RELOAD save_temporary_pin
+CATCH invalid_pin flag_invalid_pin 1
+INCMP confirm_pin_change * 
--- a/services/registration/self_reset_pin_swa
+++ b/services/registration/self_reset_pin_swa
@@ -0,0 +1,2 @@
+Uwekaji upya wa PIN umefanyika kwenye akaunti yako.
+Tafadhali weka PIN mpya ya nambari nne:
--- a/services/registration/send.vis
+++ b/services/registration/send.vis
@@ -5,6 +5,7 @@ MOUT back 0
 HALT
 LOAD validate_recipient 50
 RELOAD validate_recipient
+CATCH api_failure flag_api_call_error  1
 CATCH invalid_recipient flag_invalid_recipient 1
 CATCH invite_recipient flag_invalid_recipient_with_invite 1
 INCMP _ 0
--- a/services/registration/swap_initiated.vis
+++ b/services/registration/swap_initiated.vis
@@ -0,0 +1,4 @@
+LOAD reset_incorrect_pin 6
+CATCH _ flag_account_authorized 0
+LOAD initiate_swap 0
+HALT
--- a/services/registration/swap_limit
+++ b/services/registration/swap_limit
@@ -0,0 +1 @@
+{{.swap_max_limit}}
--- a/services/registration/swap_limit.vis
+++ b/services/registration/swap_limit.vis
@@ -0,0 +1,5 @@
+MAP swap_max_limit
+MOUT back 0
+HALT
+INCMP _ 0
+INCMP swap_preview *
--- a/services/registration/swap_limit_swa
+++ b/services/registration/swap_limit_swa
@@ -0,0 +1 @@
+{{.swap_max_limit}}
--- a/services/registration/swap_menu
+++ b/services/registration/swap_menu
@@ -0,0 +1 @@
+Swap
--- a/services/registration/swap_preview
+++ b/services/registration/swap_preview
@@ -0,0 +1,3 @@
+{{.swap_preview}}
+
+Please enter your PIN to confirm:
--- a/services/registration/swap_preview.vis
+++ b/services/registration/swap_preview.vis
@@ -0,0 +1,12 @@
+LOAD swap_preview 0
+MAP swap_preview
+CATCH api_failure flag_api_call_error 1
+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 swap_initiated *
--- a/services/registration/swap_preview_swa
+++ b/services/registration/swap_preview_swa
@@ -0,0 +1,3 @@
+{{.swap_preview}}
+
+Tafadhali weka PIN yako kudhibitisha:
--- a/services/registration/swap_to_list
+++ b/services/registration/swap_to_list
@@ -0,0 +1,2 @@
+Select number or symbol to swap TO:
+{{.swap_to_list}}
--- a/services/registration/swap_to_list.vis
+++ b/services/registration/swap_to_list.vis
@@ -0,0 +1,14 @@
+CATCH no_voucher flag_no_active_voucher 1
+LOAD swap_to_list 0
+RELOAD swap_to_list
+MAP swap_to_list
+CATCH missing_voucher flag_incorrect_voucher 1
+MOUT back 0
+HALT
+LOAD swap_max_limit 64
+RELOAD swap_max_limit
+CATCH api_failure flag_api_call_error 1
+CATCH . flag_incorrect_voucher 1
+CATCH low_swap_amount flag_low_swap_amount 1
+INCMP _ 0
+INCMP swap_limit *
--- a/services/registration/swap_to_list_swa
+++ b/services/registration/swap_to_list_swa
@@ -0,0 +1,2 @@
+Chagua nambari au ishara ya sarafu kubadilisha KWENDA:
+{{.swap_to_list}}
--- a/services/registration/transaction_initiated.vis
+++ b/services/registration/transaction_initiated.vis
@@ -1,5 +1,4 @@
-LOAD reset_incorrect 6
-CATCH incorrect_pin flag_incorrect_pin 1
+LOAD reset_incorrect_pin 6
 CATCH _ flag_account_authorized 0
 RELOAD get_amount
 MAP get_amount
--- a/services/registration/view_profile.vis
+++ b/services/registration/view_profile.vis
@@ -1,6 +1,6 @@
 LOAD get_profile_info 0
 MAP get_profile_info 
-LOAD reset_incorrect 6
+LOAD reset_incorrect_pin 6
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
 MOUT back 0
--- a/services/registration/voucher_details.vis
+++ b/services/registration/voucher_details.vis
@@ -1,5 +1,7 @@
 CATCH no_voucher flag_no_active_voucher 1
 LOAD get_voucher_details 0
+RELOAD get_voucher_details
+CATCH api_failure flag_api_call_error  1
 MAP get_voucher_details
 MOUT back 0
 HALT
--- a/services/registration/voucher_set.vis
+++ b/services/registration/voucher_set.vis
@@ -1,4 +1,4 @@
-LOAD reset_incorrect 6
+LOAD reset_incorrect_pin 6
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH _ flag_account_authorized 0
 LOAD set_voucher 12
--- a/store/db/db.go
+++ b/store/db/db.go
@@ -65,6 +65,26 @@ const (
 	DATA_ACCOUNT_ALIAS
 	//currently suggested alias by the api awaiting user's confirmation as accepted account alias
 	DATA_SUGGESTED_ALIAS
+	//Key used to store a value of 1 for a user to reset their own PIN once they access the menu. 
+	DATA_SELF_PIN_RESET
+	// Holds the active pool contract address for the swap
+	DATA_ACTIVE_POOL_ADDRESS
+	// Currently active swap from symbol for the swap
+	DATA_ACTIVE_SWAP_FROM_SYM
+	// Currently active swap from decimal count for the swap
+	DATA_ACTIVE_SWAP_FROM_DECIMAL
+	// Holds the active swap from contract address for the swap
+	DATA_ACTIVE_SWAP_FROM_ADDRESS
+	// Currently active swap from to for the swap
+	DATA_ACTIVE_SWAP_TO_SYM
+	// Currently active swap to decimal count for the swap
+	DATA_ACTIVE_SWAP_TO_DECIMAL
+	// Holds the active pool contract address for the swap
+	DATA_ACTIVE_SWAP_TO_ADDRESS
+	// Holds the max swap amount for the swap
+	DATA_ACTIVE_SWAP_MAX_AMOUNT
+	// Holds the active swap amount for the swap
+	DATA_ACTIVE_SWAP_AMOUNT
 )

 const (
@@ -103,6 +123,31 @@ const (
 	DATA_TRANSACTIONS = 1024 + iota
 )

+const (
+	// List of voucher symbols in the top pools context.
+	DATA_POOL_NAMES = 2048 + iota
+	// List of symbols in the top pools context.
+	DATA_POOL_SYMBOLS
+	// List of contact addresses in the top pools context
+	DATA_POOL_ADDRESSES
+	// List of swap from voucher symbols in the user context.
+	DATA_POOL_FROM_SYMBOLS
+	// List of swap from balances for vouchers valid in the pools context.
+	DATA_POOL_FROM_BALANCES
+	// List of swap from decimal counts for vouchers valid in the pools context.
+	DATA_POOL_FROM_DECIMALS
+	// List of swap from EVM addresses for vouchers valid in the pools context.
+	DATA_POOL_FROM_ADDRESSES
+	// List of swap to voucher symbols in the user context.
+	DATA_POOL_TO_SYMBOLS
+	// List of swap to balances for vouchers valid in the pools context.
+	DATA_POOL_TO_BALANCES
+	// List of swap to decimal counts for vouchers valid in the pools context.
+	DATA_POOL_TO_DECIMALS
+	// List of swap to EVM addresses for vouchers valid in the pools context.
+	DATA_POOL_TO_ADDRESSES
+)
+
 var (
 	logg = logging.NewVanilla().WithDomain("urdt-common")
 )
--- a/store/log_db.go
+++ b/store/log_db.go
@@ -0,0 +1,27 @@
+package store
+
+import (
+	"context"
+
+	visedb "git.defalsify.org/vise.git/db"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+)
+
+type LogDb struct {
+	visedb.Db
+}
+
+func (db *LogDb) WriteLogEntry(ctx context.Context, sessionId string, typ db.DataTyp, v []byte) error {
+	db.SetPrefix(visedb.DATATYPE_USERDATA)
+	db.SetSession(sessionId)
+	k := storedb.ToBytes(typ)
+	return db.Put(ctx, k, v)
+}
+
+func (db *LogDb) ReadLogEntry(ctx context.Context, sessionId string, typ db.DataTyp) ([]byte, error) {
+	db.SetPrefix(visedb.DATATYPE_USERDATA)
+	db.SetSession(sessionId)
+	k := storedb.ToBytes(typ)
+	return db.Get(ctx, k)
+}
--- a/store/pools.go
+++ b/store/pools.go
@@ -0,0 +1,93 @@
+package store
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+)
+
+// PoolsMetadata helps organize data fields
+type PoolsMetadata struct {
+	PoolNames             string
+	PoolSymbols           string
+	PoolContractAdrresses string
+}
+
+// ProcessPools converts pools into formatted strings
+func ProcessPools(pools []dataserviceapi.PoolDetails) PoolsMetadata {
+	var data PoolsMetadata
+	var poolNames, poolSymbols, poolContractAdrresses []string
+
+	for i, p := range pools {
+		poolNames = append(poolNames, fmt.Sprintf("%d:%s", i+1, p.PoolName))
+		poolSymbols = append(poolSymbols, fmt.Sprintf("%d:%s", i+1, p.PoolSymbol))
+		poolContractAdrresses = append(poolContractAdrresses, fmt.Sprintf("%d:%s", i+1, p.PoolContractAdrress))
+	}
+
+	data.PoolNames = strings.Join(poolNames, "\n")
+	data.PoolSymbols = strings.Join(poolSymbols, "\n")
+	data.PoolContractAdrresses = strings.Join(poolContractAdrresses, "\n")
+
+	return data
+}
+
+// GetPoolData retrieves and matches pool data
+// if no match is found, it fetches the API with the symbol
+func GetPoolData(ctx context.Context, store DataStore, sessionId string, input string) (*dataserviceapi.PoolDetails, error) {
+	keys := []storedb.DataTyp{
+		storedb.DATA_POOL_NAMES,
+		storedb.DATA_POOL_SYMBOLS,
+		storedb.DATA_POOL_ADDRESSES,
+	}
+	data := make(map[storedb.DataTyp]string)
+
+	for _, key := range keys {
+		value, err := store.ReadEntry(ctx, sessionId, key)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get data key %x: %v", key, err)
+		}
+		data[key] = string(value)
+	}
+
+	name, symbol, address := MatchPool(input,
+		data[storedb.DATA_POOL_NAMES],
+		data[storedb.DATA_POOL_SYMBOLS],
+		data[storedb.DATA_POOL_ADDRESSES],
+	)
+
+	if symbol == "" {
+		return nil, nil
+	}
+
+	return &dataserviceapi.PoolDetails{
+		PoolName:            string(name),
+		PoolSymbol:          string(symbol),
+		PoolContractAdrress: string(address),
+	}, nil
+}
+
+// MatchPool finds the matching pool name, symbol and pool contract address based on the input.
+func MatchPool(input, names, symbols, addresses string) (name, symbol, address string) {
+	nameList := strings.Split(names, "\n")
+	symList := strings.Split(symbols, "\n")
+	addrList := strings.Split(addresses, "\n")
+
+	for i, sym := range symList {
+		parts := strings.SplitN(sym, ":", 2)
+
+		if input == parts[0] || strings.EqualFold(input, parts[1]) {
+			symbol = parts[1]
+			if i < len(nameList) {
+				name = strings.SplitN(nameList[i], ":", 2)[1]
+			}
+			if i < len(addrList) {
+				address = strings.SplitN(addrList[i], ":", 2)[1]
+			}
+			break
+		}
+	}
+	return
+}
--- a/store/swap.go
+++ b/store/swap.go
@@ -0,0 +1,199 @@
+package store
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"reflect"
+	"strconv"
+
+	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+)
+
+type SwapData struct {
+	PublicKey             string
+	ActivePoolAddress     string
+	ActiveSwapFromSym     string
+	ActiveSwapFromDecimal string
+	ActiveSwapFromAddress string
+	ActiveSwapToSym       string
+	ActiveSwapToAddress   string
+}
+
+type SwapPreviewData struct {
+	TemporaryValue        string
+	PublicKey             string
+	ActiveSwapMaxAmount   string
+	ActiveSwapFromDecimal string
+	ActivePoolAddress     string
+	ActiveSwapFromAddress string
+	ActiveSwapFromSym     string
+	ActiveSwapToAddress   string
+	ActiveSwapToSym       string
+	ActiveSwapToDecimal   string
+}
+
+func ReadSwapData(ctx context.Context, store DataStore, sessionId string) (SwapData, error) {
+	data := SwapData{}
+	fieldToKey := map[string]storedb.DataTyp{
+		"PublicKey":             storedb.DATA_PUBLIC_KEY,
+		"ActivePoolAddress":     storedb.DATA_ACTIVE_POOL_ADDRESS,
+		"ActiveSwapFromSym":     storedb.DATA_ACTIVE_SYM,
+		"ActiveSwapFromDecimal": storedb.DATA_ACTIVE_DECIMAL,
+		"ActiveSwapFromAddress": storedb.DATA_ACTIVE_ADDRESS,
+		"ActiveSwapToSym":       storedb.DATA_ACTIVE_SWAP_TO_SYM,
+		"ActiveSwapToAddress":   storedb.DATA_ACTIVE_SWAP_TO_ADDRESS,
+	}
+
+	v := reflect.ValueOf(&data).Elem()
+	for fieldName, key := range fieldToKey {
+		field := v.FieldByName(fieldName)
+		if !field.IsValid() || !field.CanSet() {
+			return data, errors.New("invalid struct field: " + fieldName)
+		}
+
+		value, err := ReadStringEntry(ctx, store, sessionId, key)
+		if err != nil {
+			return data, err
+		}
+		field.SetString(value)
+	}
+
+	return data, nil
+}
+
+func ReadSwapPreviewData(ctx context.Context, store DataStore, sessionId string) (SwapPreviewData, error) {
+	data := SwapPreviewData{}
+	fieldToKey := map[string]storedb.DataTyp{
+		"TemporaryValue":        storedb.DATA_TEMPORARY_VALUE,
+		"PublicKey":             storedb.DATA_PUBLIC_KEY,
+		"ActiveSwapMaxAmount":   storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT,
+		"ActiveSwapFromDecimal": storedb.DATA_ACTIVE_DECIMAL,
+		"ActivePoolAddress":     storedb.DATA_ACTIVE_POOL_ADDRESS,
+		"ActiveSwapFromAddress": storedb.DATA_ACTIVE_ADDRESS,
+		"ActiveSwapFromSym":     storedb.DATA_ACTIVE_SYM,
+		"ActiveSwapToAddress":   storedb.DATA_ACTIVE_SWAP_TO_ADDRESS,
+		"ActiveSwapToSym":       storedb.DATA_ACTIVE_SWAP_TO_SYM,
+		"ActiveSwapToDecimal":   storedb.DATA_ACTIVE_SWAP_TO_DECIMAL,
+	}
+
+	v := reflect.ValueOf(&data).Elem()
+	for fieldName, key := range fieldToKey {
+		field := v.FieldByName(fieldName)
+		if !field.IsValid() || !field.CanSet() {
+			return data, errors.New("invalid struct field: " + fieldName)
+		}
+
+		value, err := ReadStringEntry(ctx, store, sessionId, key)
+		if err != nil {
+			return data, err
+		}
+		field.SetString(value)
+	}
+
+	return data, nil
+}
+
+// GetSwapFromVoucherData retrieves and matches swap from voucher data
+func GetSwapFromVoucherData(ctx context.Context, store DataStore, sessionId string, input string) (*dataserviceapi.TokenHoldings, error) {
+	keys := []storedb.DataTyp{
+		storedb.DATA_POOL_FROM_SYMBOLS,
+		storedb.DATA_POOL_FROM_BALANCES,
+		storedb.DATA_POOL_FROM_DECIMALS,
+		storedb.DATA_POOL_FROM_ADDRESSES,
+	}
+	data := make(map[storedb.DataTyp]string)
+
+	for _, key := range keys {
+		value, err := store.ReadEntry(ctx, sessionId, key)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get data key %x: %v", key, err)
+		}
+		data[key] = string(value)
+	}
+
+	symbol, balance, decimal, address := MatchVoucher(input,
+		data[storedb.DATA_POOL_FROM_SYMBOLS],
+		data[storedb.DATA_POOL_FROM_BALANCES],
+		data[storedb.DATA_POOL_FROM_DECIMALS],
+		data[storedb.DATA_POOL_FROM_ADDRESSES],
+	)
+
+	if symbol == "" {
+		return nil, nil
+	}
+
+	return &dataserviceapi.TokenHoldings{
+		TokenSymbol:     string(symbol),
+		Balance:         string(balance),
+		TokenDecimals:   string(decimal),
+		ContractAddress: string(address),
+	}, nil
+}
+
+// GetSwapToVoucherData retrieves and matches token data
+func GetSwapToVoucherData(ctx context.Context, store DataStore, sessionId string, input string) (*dataserviceapi.TokenDetails, error) {
+	keys := []storedb.DataTyp{
+		storedb.DATA_POOL_TO_SYMBOLS,
+		storedb.DATA_POOL_TO_BALANCES,
+		storedb.DATA_POOL_TO_DECIMALS,
+		storedb.DATA_POOL_TO_ADDRESSES,
+	}
+	data := make(map[storedb.DataTyp]string)
+
+	for _, key := range keys {
+		value, err := store.ReadEntry(ctx, sessionId, key)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get data key %x: %v", key, err)
+		}
+		data[key] = string(value)
+	}
+
+	symbol, _, decimal, address := MatchVoucher(input,
+		data[storedb.DATA_POOL_TO_SYMBOLS],
+		data[storedb.DATA_POOL_TO_BALANCES],
+		data[storedb.DATA_POOL_TO_DECIMALS],
+		data[storedb.DATA_POOL_TO_ADDRESSES],
+	)
+
+	if symbol == "" {
+		return nil, nil
+	}
+
+	decimalInt, err := strconv.ParseUint(decimal, 0, 64)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "Failed to parse decimal to Uint:", "sessionId", sessionId, "decimal", decimal, "error", err)
+		return nil, nil
+	}
+
+	return &dataserviceapi.TokenDetails{
+		TokenSymbol:   string(symbol),
+		TokenDecimals: uint8(decimalInt),
+		TokenAddress:  string(address),
+	}, nil
+}
+
+// UpdateSwapToVoucherData updates the active swap to voucher data in the DataStore.
+func UpdateSwapToVoucherData(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenDetails) error {
+	logg.TraceCtxf(ctx, "UpdateSwapToVoucherData", "data", data)
+
+	// Convert TokenDecimals (uint8) to string
+	tokenDecimalsStr := strconv.FormatUint(uint64(data.TokenDecimals), 10)
+
+	// Active swap to voucher data entries
+	activeEntries := map[storedb.DataTyp][]byte{
+		storedb.DATA_ACTIVE_SWAP_TO_SYM:     []byte(data.TokenSymbol),
+		storedb.DATA_ACTIVE_SWAP_TO_DECIMAL: []byte(tokenDecimalsStr),
+		storedb.DATA_ACTIVE_SWAP_TO_ADDRESS: []byte(data.TokenAddress),
+	}
+
+	// Write active data
+	for key, value := range activeEntries {
+		if err := store.WriteEntry(ctx, sessionId, key, value); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
--- a/store/swap_test.go
+++ b/store/swap_test.go
@@ -0,0 +1,146 @@
+package store
+
+import (
+	"testing"
+
+	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	"github.com/alecthomas/assert/v2"
+)
+
+func TestReadSwapData(t *testing.T) {
+	sessionId := "session123"
+	publicKey := "0X13242618721"
+	ctx, store := InitializeTestDb(t)
+
+	// Test swap data
+	swapData := map[storedb.DataTyp]string{
+		storedb.DATA_PUBLIC_KEY:               publicKey,
+		storedb.DATA_ACTIVE_POOL_ADDRESS:      "0x48a953cA5cf5298bc6f6Af3C608351f537AAcb9e",
+		storedb.DATA_ACTIVE_SWAP_FROM_SYM:     "AMANI",
+		storedb.DATA_ACTIVE_SWAP_FROM_DECIMAL: "6",
+		storedb.DATA_ACTIVE_SWAP_FROM_ADDRESS: "0xc7B78Ac9ACB9E025C8234621FC515bC58179dEAe",
+		storedb.DATA_ACTIVE_SWAP_TO_SYM:       "cUSD",
+		storedb.DATA_ACTIVE_SWAP_TO_ADDRESS:   "0x765DE816845861e75A25fCA122bb6898B8B1282a",
+	}
+
+	// Store the data
+	for key, value := range swapData {
+		if err := store.WriteEntry(ctx, sessionId, key, []byte(value)); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	expectedResult := SwapData{
+		PublicKey:             "0X13242618721",
+		ActivePoolAddress:     "0x48a953cA5cf5298bc6f6Af3C608351f537AAcb9e",
+		ActiveSwapFromSym:     "AMANI",
+		ActiveSwapFromDecimal: "6",
+		ActiveSwapFromAddress: "0xc7B78Ac9ACB9E025C8234621FC515bC58179dEAe",
+		ActiveSwapToSym:       "cUSD",
+		ActiveSwapToAddress:   "0x765DE816845861e75A25fCA122bb6898B8B1282a",
+	}
+
+	data, err := ReadSwapData(ctx, store, sessionId)
+
+	assert.NoError(t, err)
+	assert.Equal(t, expectedResult, data)
+}
+
+func TestReadSwapPreviewData(t *testing.T) {
+	sessionId := "session123"
+	publicKey := "0X13242618721"
+	ctx, store := InitializeTestDb(t)
+
+	// Test swap preview data
+	swapPreviewData := map[storedb.DataTyp]string{
+		storedb.DATA_PUBLIC_KEY:               publicKey,
+		storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT:   "1339482",
+		storedb.DATA_ACTIVE_SWAP_FROM_DECIMAL: "6",
+		storedb.DATA_ACTIVE_POOL_ADDRESS:      "0x48a953cA5cf5298bc6f6Af3C608351f537AAcb9e",
+		storedb.DATA_ACTIVE_SWAP_FROM_ADDRESS: "0xc7B78Ac9ACB9E025C8234621FC515bC58179dEAe",
+		storedb.DATA_ACTIVE_SWAP_FROM_SYM:     "AMANI",
+		storedb.DATA_ACTIVE_SWAP_TO_ADDRESS:   "0x765DE816845861e75A25fCA122bb6898B8B1282a",
+		storedb.DATA_ACTIVE_SWAP_TO_SYM:       "cUSD",
+		storedb.DATA_ACTIVE_SWAP_TO_DECIMAL:   "18",
+	}
+
+	// Store the data
+	for key, value := range swapPreviewData {
+		if err := store.WriteEntry(ctx, sessionId, key, []byte(value)); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	expectedResult := SwapPreviewData{
+		PublicKey:             "0X13242618721",
+		ActiveSwapMaxAmount:   "1339482",
+		ActiveSwapFromDecimal: "6",
+		ActivePoolAddress:     "0x48a953cA5cf5298bc6f6Af3C608351f537AAcb9e",
+		ActiveSwapFromAddress: "0xc7B78Ac9ACB9E025C8234621FC515bC58179dEAe",
+		ActiveSwapFromSym:     "AMANI",
+		ActiveSwapToAddress:   "0x765DE816845861e75A25fCA122bb6898B8B1282a",
+		ActiveSwapToSym:       "cUSD",
+		ActiveSwapToDecimal:   "18",
+	}
+
+	data, err := ReadSwapPreviewData(ctx, store, sessionId)
+
+	assert.NoError(t, err)
+	assert.Equal(t, expectedResult, data)
+}
+
+func TestGetSwapFromVoucherData(t *testing.T) {
+	sessionId := "session123"
+	ctx, store := InitializeTestDb(t)
+
+	// Test pool swap data
+	mockData := map[storedb.DataTyp][]byte{
+		storedb.DATA_POOL_FROM_SYMBOLS:   []byte("1:AMANI\n2:AMUA"),
+		storedb.DATA_POOL_FROM_BALANCES:  []byte("1:\n2:"),
+		storedb.DATA_POOL_FROM_DECIMALS:  []byte("1:6\n2:4"),
+		storedb.DATA_POOL_FROM_ADDRESSES: []byte("1:0xc7B78Ac9ACB9E025C8234621FC515bC58179dEAe\n2:0xF0C3C7581b8b96B59a97daEc8Bd48247cE078674"),
+	}
+
+	// Put the data
+	for key, value := range mockData {
+		if err := store.WriteEntry(ctx, sessionId, key, []byte(value)); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	result, err := GetSwapFromVoucherData(ctx, store, sessionId, "1")
+
+	assert.NoError(t, err)
+	assert.Equal(t, "AMANI", result.TokenSymbol)
+	assert.Equal(t, "", result.Balance)
+	assert.Equal(t, "6", result.TokenDecimals)
+	assert.Equal(t, "0xc7B78Ac9ACB9E025C8234621FC515bC58179dEAe", result.ContractAddress)
+}
+
+func TestGetSwapToVoucherData(t *testing.T) {
+	sessionId := "session123"
+	ctx, store := InitializeTestDb(t)
+
+	// Test pool swap data
+	mockData := map[storedb.DataTyp][]byte{
+		storedb.DATA_POOL_TO_SYMBOLS:   []byte("1:cUSD\n2:AMUA"),
+		storedb.DATA_POOL_TO_BALANCES:  []byte("1:\n2:"),
+		storedb.DATA_POOL_TO_DECIMALS:  []byte("1:6\n2:4"),
+		storedb.DATA_POOL_TO_ADDRESSES: []byte("1:0xc7B78Ac9ACB9E025C8234621\n2:0xF0C3C7581b8b96B59a97daEc8Bd48247cE078674"),
+	}
+
+	// Put the data
+	for key, value := range mockData {
+		if err := store.WriteEntry(ctx, sessionId, key, []byte(value)); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	result, err := GetSwapToVoucherData(ctx, store, sessionId, "1")
+
+	assert.NoError(t, err)
+	assert.Equal(t, "cUSD", result.TokenSymbol)
+	assert.Equal(t, "", result.Balance)
+	assert.Equal(t, "6", result.TokenDecimals)
+	assert.Equal(t, "0xc7B78Ac9ACB9E025C8234621", result.ContractAddress)
+}
--- a/store/tokens.go
+++ b/store/tokens.go
@@ -64,7 +64,7 @@ func ReadTransactionData(ctx context.Context, store DataStore, sessionId string)
 			return data, errors.New("invalid struct field: " + fieldName)
 		}

-		value, err := readStringEntry(ctx, store, sessionId, key)
+		value, err := ReadStringEntry(ctx, store, sessionId, key)
 		if err != nil {
 			return data, err
 		}
@@ -74,7 +74,7 @@ func ReadTransactionData(ctx context.Context, store DataStore, sessionId string)
 	return data, nil
 }

-func readStringEntry(ctx context.Context, store DataStore, sessionId string, key storedb.DataTyp) (string, error) {
+func ReadStringEntry(ctx context.Context, store DataStore, sessionId string, key storedb.DataTyp) (string, error) {
 	entry, err := store.ReadEntry(ctx, sessionId, key)
 	if err != nil {
 		return "", err
--- a/store/vouchers.go
+++ b/store/vouchers.go
@@ -47,6 +47,24 @@ func ProcessVouchers(holdings []dataserviceapi.TokenHoldings) VoucherMetadata {
 	return data
 }

+// ProcessTokens converts swappable tokens into formatted strings
+func ProcessTokens(holdings []dataserviceapi.TokenDetails) VoucherMetadata {
+	var data VoucherMetadata
+	var symbols, decimals, addresses []string
+
+	for i, h := range holdings {
+		symbols = append(symbols, fmt.Sprintf("%d:%s", i+1, h.TokenSymbol))
+		decimals = append(decimals, fmt.Sprintf("%d:%d", i+1, h.TokenDecimals))
+		addresses = append(addresses, fmt.Sprintf("%d:%s", i+1, h.TokenAddress))
+	}
+
+	data.Symbols = strings.Join(symbols, "\n")
+	data.Decimals = strings.Join(decimals, "\n")
+	data.Addresses = strings.Join(addresses, "\n")
+
+	return data
+}
+
 func ScaleDownBalance(balance, decimals string) string {
 	// Convert balance and decimals to big.Float
 	bal := new(big.Float)
--- a/testutil/engine.go
+++ b/testutil/engine.go
@@ -113,6 +113,12 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool, *persist.Pe
 		os.Exit(1)
 	}

+	logdb, err := menuStorageService.GetLogDb(ctx, userDataStore, "test-db-logs", "user-data")
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "get log db error: %v\n", err)
+		os.Exit(1)
+	}
+
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
 		fmt.Fprintf(os.Stderr, "dbresource cast error")
@@ -121,6 +127,7 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool, *persist.Pe

 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userDataStore)
+	lhs.SetLogDb(&logdb)
 	lhs.SetPersister(pe)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
@@ -154,6 +161,7 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool, *persist.Pe

 	en := lhs.GetEngine(lhs.Cfg, rs, pe)
 	cleanFn := func() {
+		logdb.Close(ctx)
 		err := en.Finish(ctx)
 		if err != nil {
 			logg.Errorf(err.Error())
Author	SHA1	Message	Date
alfred-mk	a96802f10f	use a single FlagReset append statement	2025-05-30 05:09:27 +03:00
alfred-mk	3075070e14	remove unused CATCH statement for the flag_incorrect_pin	2025-05-30 05:06:29 +03:00
alfred-mk	9891a51f90	update the resetIncorrectPINAttempts to cater for edge cases with more than 3 invalid attempts	2025-05-30 05:01:58 +03:00
alfred-mk	7f9da1ec10	remove unused CATCH statement	2025-05-30 04:58:55 +03:00
alfred-mk	6a4b59cedf	update the Authorize test	2025-05-30 04:58:20 +03:00
alfred-mk	4f02924cbd	refactor the Authorize function to prevent double PIN requests	2025-05-30 04:57:32 +03:00
alfred-mk	b30e15caa5	remove additional RELOAD Some checks failed release / docker (push) Has been cancelled Details	2025-05-29 10:01:48 +03:00
alfred-mk	71b4eff35e	add a catch for api failures	2025-05-29 10:00:44 +03:00
alfred-mk	20954d287b	store the DATA_POOL_TO_BALANCES	2025-05-29 09:59:41 +03:00
alfred-mk	fac703576f	updated the go-vise package to commit hash a170e8a79da067e30b3c28a999a4d87fdd07ebaf Some checks failed release / docker (push) Has been cancelled Details	2025-05-23 15:30:48 +03:00
alfred-mk	df8e0b4d4a	remove misplaced CATCH statement	2025-05-23 15:28:40 +03:00
alfred-mk	b4bacfdc03	use the updated sarafu-api package with correct PoolSwapURL Some checks failed release / docker (push) Has been cancelled Details	2025-05-22 15:34:04 +03:00
alfred-mk	8dc203d111	use the TemporaryValue to store the user's swap amount input Some checks failed release / docker (push) Has been cancelled Details	2025-05-22 15:18:52 +03:00
alfred-mk	dcadea8737	Convert TokenDecimals (uint8) to string before storing it	2025-05-22 15:09:46 +03:00
alfred-mk	71496d0015	change position of the catch statements Some checks failed release / docker (push) Has been cancelled Details	2025-05-22 12:41:49 +03:00
alfred-mk	d9fc5440c5	prevent access to the swap menu if one does not have a voucher	2025-05-22 12:24:10 +03:00
alfred-mk	0495472530	match the reset_incorrect_pin symbol to the function name	2025-05-22 12:13:50 +03:00
alfred-mk	fd43060021	update the api failure template Some checks failed release / docker (push) Has been cancelled Details	2025-05-21 18:52:05 +03:00
alfred-mk	cf6e105fb9	catch the api call error flag	2025-05-21 18:51:41 +03:00
alfred-mk	91b57fece2	use the ProcessTokens function and remove the unused DATA_POOL_TO_BALANCES	2025-05-21 18:51:10 +03:00
alfred-mk	043c79384c	correctly process TokenDetails	2025-05-21 18:39:45 +03:00
alfred-mk	1cc1d00ffe	added a function to ProcessTokens from the GetPoolSwappableVouchers	2025-05-21 18:19:23 +03:00
alfred-mk	d7987bf460	use the updated ussd-data-service and sarafu-api with TokenDetails	2025-05-21 18:18:15 +03:00
alfred-mk	21da4b976b	use the updated sarafu-api that removes the publicKey from the GetPoolSwappableVouchers Some checks failed release / docker (push) Has been cancelled Details	2025-05-21 15:45:17 +03:00
alfred-mk	169d85e2cb	added the INCLUDE_STABLES_PARAM env variable	2025-05-21 15:39:19 +03:00
alfred-mk	3ab76b3d22	use updated sarafu-api with corrected JSON mapping for checkTokenInPool and getSwapFromTokenMaxLimit Some checks failed release / docker (push) Has been cancelled Details	2025-05-20 15:53:12 +03:00
alfred-mk	b428e2e22d	add log for the CheckTokenInPool Some checks failed release / docker (push) Has been cancelled Details	2025-05-20 14:02:41 +03:00
Alfred Kamanda	1d23a0cc4b	Merge pull request 'default-env-pool' (#76 ) from default-env-pool into master Some checks failed release / docker (push) Has been cancelled Details Reviewed-on: #76	2025-05-20 12:18:30 +02:00
alfred-mk	d3ad3b2db6	update the template and remove hardcoded values	2025-05-20 10:26:28 +03:00
alfred-mk	5d8fee470a	use the default pool variables	2025-05-20 10:26:01 +03:00
alfred-mk	cf237c592a	add the pool variables to the config	2025-05-20 10:25:27 +03:00
alfred-mk	2d8333b89a	add the new env variables	2025-05-20 10:19:46 +03:00
alfred-mk	c8146ea211	alfred/pool-swap (#33 ) Some checks failed release / docker (push) Has been cancelled Details Pool swap functionality Resolves issue #24 Reviewed-on: #33 Co-authored-by: alfred-mk <alfredmwaik@gmail.com> Co-committed-by: alfred-mk <alfredmwaik@gmail.com>	2025-05-19 15:44:50 +02:00
alfred-mk	d03c0c4c0e	vouchers-input-selection (#75 ) Some checks failed release / docker (push) Has been cancelled Details - Update the NEXT and PREV input selectors on the vouchers list - Have the INCMPs before LOAD/RELOADs to prevent navigation inputs being passed to handler functions Reviewed-on: #75 Reviewed-by: Mohamed Sohail <kamikazechaser@noreply.localhost> Co-authored-by: alfred-mk <alfredmwaik@gmail.com> Co-committed-by: alfred-mk <alfredmwaik@gmail.com>	2025-05-19 15:42:43 +02:00
alfred-mk	e914d059e2	upgraded vise to refresh error logline for more context Some checks failed release / docker (push) Has been cancelled Details	2025-05-07 20:26:54 +03:00
alfred-mk	7b1676bb37	fixes: recipient address and phone number (#74 ) Some checks failed release / docker (push) Has been cancelled Details - Add functionality to checksum addresses...resolves #66 - Remove white spaces from the recipient input...resolves #70 Reviewed-on: #74 Reviewed-by: Mohamed Sohail <kamikazechaser@noreply.localhost> Co-authored-by: alfred-mk <alfredmwaik@gmail.com> Co-committed-by: alfred-mk <alfredmwaik@gmail.com>	2025-05-07 11:45:38 +02:00
carlos	db5d55d8e3	Merge pull request 'route-api-errors' (#46 ) from route-api-errors into master Reviewed-on: #46	2025-04-29 13:55:54 +02:00
Carlosokumu	06cab56427	fix failing tests: menuhandlers missing the logdb	2025-04-29 13:25:31 +03:00
Carlosokumu	d0c181bca2	Merge branch 'master' into route-api-errors	2025-04-29 12:58:46 +03:00
Alfred Kamanda	e379129b3d	Merge pull request 'logdb' (#56 ) from logdb into master Some checks failed release / docker (push) Has been cancelled Details Reviewed-on: #56	2025-04-29 09:15:50 +02:00
Carlosokumu	29d35d1ec4	add write of the temporary and confirmed account pins to the log db	2025-04-28 15:49:40 +03:00
alfred-mk	687447e73e	added the logdb to the testutil engine	2025-04-28 15:09:38 +03:00
alfred-mk	ec1ddefeb3	updated packages for sarafu-api and vise	2025-04-28 12:50:36 +03:00
alfred-mk	4166c9aed5	Merge branch 'master' into logdb	2025-04-28 12:38:27 +03:00
alfred-mk	78e82edfb5	added the logdn to the menuhandler tests	2025-04-28 12:26:06 +03:00
Carlosokumu	a5c4866b23	add required logdb to menuhandler	2025-04-28 11:50:25 +03:00
Carlosokumu	b52239e6be	use direct key data type	2025-04-28 11:50:10 +03:00
Carlosokumu	5f02df64d7	upgrade visedriver dep	2025-04-28 11:40:28 +03:00
alfred-mk	0ba65fc48c	use the updated phone and alias regexes from common	2025-04-28 11:39:37 +03:00
alfred-mk	ce8cc8e0fd	use latest commit from sarafu-api	2025-04-28 11:38:45 +03:00
Carlosokumu	1499e4a29a	check recipient before sending an sms	2025-04-28 11:38:44 +03:00
Carlosokumu	5f24ff3b1b	feat: send invites when a recipient is not resolved	2025-04-28 11:38:44 +03:00
Carlosokumu	6cdee7b58b	update sarafu-api dep	2025-04-28 11:38:43 +03:00
alfred-mk	af5537abfc	updated the description of DATA_SELF_PIN_RESET	2025-04-28 11:37:45 +03:00
alfred-mk	a6e569afb1	remove the verify_new_pin functionality that managed the unused flag_valid_pin	2025-04-28 11:37:44 +03:00
alfred-mk	446514d8ce	remove unused function reset_valid_pin	2025-04-28 11:37:44 +03:00
alfred-mk	131d106f38	use a single confirm_pin_change node	2025-04-28 11:37:43 +03:00
alfred-mk	4d62f0222e	use the same check for flag_invalid_pin to move to the invalid_pin node	2025-04-28 11:37:43 +03:00
alfred-mk	37cc3e1bc1	cleanup: remove extra space in all .vis files	2025-04-28 11:37:42 +03:00
alfred-mk	491e97d8af	cleanup: remove extra space	2025-04-28 11:37:42 +03:00
alfred-mk	d4fefe3c39	update the order for the INCMP statement	2025-04-28 11:37:41 +03:00
alfred-mk	e8ff468c7b	update the reset flags in TestCheckBlockedStatus	2025-04-28 11:37:41 +03:00
alfred-mk	965f343230	update the reset flags in TestConfirmPinChange	2025-04-28 11:37:40 +03:00
alfred-mk	3426d31a9e	use the correct flag_invalid_pin in TestSaveTemporaryPin	2025-04-28 11:37:40 +03:00
alfred-mk	8b2b667307	updated the expected content for the alias in view profile	2025-04-28 11:37:39 +03:00
alfred-mk	c206fa1329	updated the menu flow for the admin reset others PIN in test	2025-04-28 11:37:39 +03:00
alfred-mk	ad395c4b1a	remove code related to admins resetting a user's actual PIN	2025-04-28 11:37:38 +03:00
alfred-mk	af7e6cc603	add a space	2025-04-28 11:37:38 +03:00
alfred-mk	f90a188acc	updated the flags set and reset in SaveTemporaryPin and VerifyCreatePin	2025-04-28 11:37:37 +03:00
alfred-mk	7a542d1f1c	updated the description of the flag_incorrect_pin	2025-04-28 11:37:37 +03:00
alfred-mk	7d800d68a0	have the catch for create_pin above to catch accounts that do not have a PIN before the status on chain is checked	2025-04-28 11:37:36 +03:00
alfred-mk	850458b5d8	use a single pin_mismatch node for a confirmed PIN that does not match the original PIN	2025-04-28 11:37:36 +03:00
alfred-mk	ef8e3d5c35	allow the user to quit and move to invalid_pin node if the given input is invalid	2025-04-28 11:37:35 +03:00
alfred-mk	982eebf374	move to the top node when one selects back	2025-04-28 11:37:35 +03:00
alfred-mk	228d936a0e	use the confirm_self_pin_reset to confirm the new PIN	2025-04-28 11:37:34 +03:00
alfred-mk	7c4d37b5b8	use the self_reset_pin node to reset PINs for accounts with a flag_account_pin_reset	2025-04-28 11:37:33 +03:00
alfred-mk	e6e8bb6671	set the DATA_SELF_PIN_RESET as 0 and reset the flag_account_pin_reset	2025-04-28 11:37:33 +03:00
alfred-mk	6385735b89	move back to the previous node if the admin user is not authorized	2025-04-28 11:34:27 +03:00
alfred-mk	70815aabd1	request the admin to authorize the PIN reset	2025-04-28 11:34:27 +03:00
alfred-mk	919899c704	move to the authorize_reset_others_pin if the given number is valid and registered	2025-04-28 11:34:26 +03:00
alfred-mk	9a2ad99d07	updated the ResetOthersPin and ValidateBlockedNumber for the updated reset other's PIN functionality	2025-04-28 11:34:26 +03:00
alfred-mk	2f4959e191	use the DATA_SELF_PIN_RESET to set the flag_account_pin_reset	2025-04-28 11:34:25 +03:00
alfred-mk	1b2f3bb046	added a DATA_SELF_PIN_RESET to track when a user's PIN is reset by an admin	2025-04-28 11:34:24 +03:00
carlos	19a2b28367	Merge pull request 'extra-sms' (#64 ) from extra-sms into master Reviewed-on: #64	2025-04-28 10:33:25 +02:00
alfred-mk	25d124c58d	use updated go-vise that removes rollback on missing key	2025-04-25 17:10:46 +03:00
alfred-mk	5b34ef28eb	added the logDb to async and http	2025-04-25 09:33:08 +03:00
Carlosokumu	0370a3def4	use dedicated smsservice for triggering extra sms	2025-04-18 12:13:24 +03:00
Carlosokumu	7c0651d218	use dedicated sms package for triggering sms	2025-04-18 12:12:33 +03:00
Carlosokumu	a38ac06a3d	trigger an address sms in the check_identifier handler	2025-04-18 10:56:41 +03:00
Carlosokumu	ac2a3721b2	remove dedicated address sms trigger	2025-04-18 10:55:02 +03:00
Carlosokumu	7ea3cb6b51	remove reload for check identifier to prevent double address sms trigger	2025-04-18 10:54:23 +03:00
Carlosokumu	0274133d48	add handler to send an address sms	2025-04-17 23:32:05 +03:00
Carlosokumu	5ff2e794ff	feat: implement address and pin reset sms	2025-04-17 23:31:48 +03:00
Carlosokumu	08deeca500	register handler to trigger address sms	2025-04-17 23:31:22 +03:00
Carlosokumu	cea920c1f5	dep: upgrade sarafu-api dep to include address and pin reset sms	2025-04-17 23:30:54 +03:00
Alfred Kamanda	ade236747c	Merge pull request 'use the updated phone and alias regexes from common' (#63 ) from update-recipient-validator into master Reviewed-on: #63	2025-04-17 16:53:42 +02:00
alfred-mk	e1a3729e3b	use the updated phone and alias regexes from common	2025-04-17 14:31:18 +03:00
Carlosokumu	f127fd7c0f	initialize log db ,attach it to the menuhandler	2025-04-14 11:34:37 +03:00
alfred-mk	42177aadeb	use latest commit from sarafu-api Some checks failed release / docker (push) Has been cancelled Details	2025-04-11 11:10:48 +03:00
Alfred Kamanda	fa9f1a72ef	Merge pull request 'self pin reset' (#49 ) from self-pin-reset-node into master Reviewed-on: #49	2025-04-11 09:26:11 +02:00
alfred-mk	4ffb32f14a	Merge branch 'master' into self-pin-reset-node	2025-04-11 10:25:35 +03:00
Alfred Kamanda	c41277db87	Merge pull request 'sms-upsell' (#55 ) from sms-upsell into master Reviewed-on: #55	2025-04-11 09:24:35 +02:00
alfred-mk	56cda36aa7	updated the description of DATA_SELF_PIN_RESET	2025-04-10 13:55:00 +03:00
alfred-mk	c9170ca45a	Merge branch 'master' into self-pin-reset-node	2025-04-09 23:43:10 +03:00
alfred-mk	57a1645c03	remove the verify_new_pin functionality that managed the unused flag_valid_pin	2025-04-09 23:40:03 +03:00
alfred-mk	7d9c3b66a9	remove unused function reset_valid_pin	2025-04-09 19:29:40 +03:00
alfred-mk	aec1f4c4c1	use a single confirm_pin_change node	2025-04-09 19:23:46 +03:00
alfred-mk	d680387ef1	use the same check for flag_invalid_pin to move to the invalid_pin node	2025-04-09 19:21:35 +03:00
alfred-mk	0337c66f96	cleanup: remove extra space in all .vis files	2025-04-09 18:17:59 +03:00
alfred-mk	6070792fe4	cleanup: remove extra space	2025-04-09 18:14:10 +03:00
alfred-mk	69ae494b2c	update the order for the INCMP statement	2025-04-09 18:10:51 +03:00
alfred-mk	b89abf3487	update the reset flags in TestCheckBlockedStatus	2025-04-09 18:06:24 +03:00
alfred-mk	4ef8c47f8b	update the reset flags in TestConfirmPinChange	2025-04-09 18:01:40 +03:00
alfred-mk	1076a9578e	use the correct flag_invalid_pin in TestSaveTemporaryPin	2025-04-09 17:57:54 +03:00
alfred-mk	a27d44e561	updated the expected content for the alias in view profile	2025-04-09 17:52:58 +03:00
alfred-mk	35a2732fe2	updated the menu flow for the admin reset others PIN in test	2025-04-09 17:52:18 +03:00
alfred-mk	834f2ce629	remove code related to admins resetting a user's actual PIN	2025-04-09 17:39:41 +03:00
alfred-mk	26353bdf6e	add a space	2025-04-09 17:34:24 +03:00
alfred-mk	1f6bf2bbed	updated the flags set and reset in SaveTemporaryPin and VerifyCreatePin	2025-04-09 16:59:48 +03:00
alfred-mk	0c1d9ab582	updated the description of the flag_incorrect_pin	2025-04-09 16:58:13 +03:00
alfred-mk	29d94bb2e5	have the catch for create_pin above to catch accounts that do not have a PIN before the status on chain is checked	2025-04-09 16:57:22 +03:00
alfred-mk	067c496244	use a single pin_mismatch node for a confirmed PIN that does not match the original PIN	2025-04-09 16:55:46 +03:00
alfred-mk	f8c258a3b4	allow the user to quit and move to invalid_pin node if the given input is invalid	2025-04-09 16:49:04 +03:00
alfred-mk	aec96ce9ba	move to the top node when one selects back	2025-04-09 15:19:23 +03:00
alfred-mk	71ef950fff	use the confirm_self_pin_reset to confirm the new PIN	2025-04-09 15:12:51 +03:00
alfred-mk	477f3a307a	use the self_reset_pin node to reset PINs for accounts with a flag_account_pin_reset	2025-04-09 15:11:51 +03:00
alfred-mk	33c376c971	set the DATA_SELF_PIN_RESET as 0 and reset the flag_account_pin_reset	2025-04-09 15:10:12 +03:00
Carlosokumu	79bf09f3d1	add logdb to menuhandler and associated write operations	2025-04-09 14:55:35 +03:00
Carlosokumu	f4804546d9	add log db struct with associated methods	2025-04-09 14:52:57 +03:00
Carlosokumu	3fff03a164	update visedriver dep	2025-04-09 14:50:28 +03:00
Carlosokumu	094866c129	add a logdb field to lhs and setter function	2025-04-09 14:49:41 +03:00
alfred-mk	514f6ae05b	move back to the previous node if the admin user is not authorized	2025-04-08 16:26:21 +03:00
alfred-mk	8a6659a98b	request the admin to authorize the PIN reset	2025-04-08 16:25:50 +03:00
alfred-mk	d094af9c51	move to the authorize_reset_others_pin if the given number is valid and registered	2025-04-08 16:25:11 +03:00
alfred-mk	f96f9c11e6	updated the ResetOthersPin and ValidateBlockedNumber for the updated reset other's PIN functionality	2025-04-08 16:23:21 +03:00
Carlosokumu	1d8b0ef951	Merge branch 'master' into sms-upsell	2025-04-07 11:45:29 +03:00
Carlosokumu	fb2dc003b8	check recipient before sending an sms	2025-04-07 11:38:52 +03:00
alfred-mk	a11ca2a618	reset the flag_language_set and flag_account_created flags if the publicKey does not exist on the db Some checks failed release / docker (push) Has been cancelled Details	2025-04-04 12:05:04 +03:00
Mohammed Sohail	4268cc0589	build: logdebug mode Some checks failed release / docker (push) Has been cancelled Details	2025-04-03 15:45:41 +03:00
alfred-mk	ae0672c7da	updated the vise version to pop the cache on a new session Some checks failed release / docker (push) Has been cancelled Details	2025-04-02 18:34:04 +03:00
alfred-mk	2c671bc0d4	use the DATA_SELF_PIN_RESET to set the flag_account_pin_reset	2025-04-02 18:29:04 +03:00
alfred-mk	c5673b339b	added a DATA_SELF_PIN_RESET to track when a user's PIN is reset by an admin	2025-04-02 18:24:34 +03:00
Carlosokumu	58242c8d55	fix failing test: TestManageVouchers	2025-04-02 10:53:36 +03:00
Carlosokumu	cab90ed89a	set and reset flag_api_error flag	2025-04-02 10:48:04 +03:00
Carlosokumu	73c3486400	catch api call failure when manage vouchers is called	2025-04-02 10:47:33 +03:00
Carlosokumu	3c84fb5ae7	Merge branch 'master' into route-api-errors	2025-04-02 10:38:47 +03:00
lash	c3567313af	Merge pull request 'manage vouchers in single function' (#42 ) from manage-vouchers-in-single-function into master Reviewed-on: #42	2025-04-01 21:26:28 +02:00
lash	f82b413e34	Merge branch 'master' into manage-vouchers-in-single-function	2025-04-01 21:26:16 +02:00
Carlosokumu	695bfed349	feat: send invites when a recipient is not resolved	2025-04-01 16:30:08 +03:00
Carlosokumu	8bf48cb081	update sarafu-api dep	2025-04-01 16:25:59 +03:00
Carlosokumu	04880b58a8	fix failing test	2025-04-01 12:49:10 +03:00
Carlosokumu	0458ac9498	fix failing test	2025-04-01 12:38:57 +03:00
Carlosokumu	a7e8c184f5	add some spacing	2025-04-01 11:59:31 +03:00
Carlosokumu	3615348efd	add swahili template	2025-04-01 11:57:59 +03:00
Carlosokumu	d0be79d817	set account creation failed flag	2025-04-01 11:30:00 +03:00
alfred-mk	ea0fc4491d	removed debug related logs	2025-04-01 11:12:38 +03:00
Carlosokumu	7883063e53	feat: set and reset api call failure flags	2025-03-31 15:42:27 +03:00
Carlosokumu	f562ce8adf	check for api call failure when setting the dafault voucher	2025-03-31 15:41:49 +03:00
Carlosokumu	cd2f4328a8	check for api call failure when checking transactions	2025-03-31 15:41:19 +03:00
Carlosokumu	95b9a6e486	catch api call failure when fetching voucher details	2025-03-28 16:09:53 +03:00
Carlosokumu	9674a04cbc	add handler to reset api call failure flag,set flag when requesting an alias fails	2025-03-28 15:51:56 +03:00
Carlosokumu	6c46c097fb	add explicit api call failure flag reset	2025-03-28 15:47:34 +03:00
Carlosokumu	c814c4ae5c	register handler to reset api call failure flag	2025-03-28 15:46:57 +03:00
Carlosokumu	bbecec0310	catch api call error when requesting an alias	2025-03-28 15:46:21 +03:00
Carlosokumu	eaa89c29df	Merge branch 'master' into route-api-errors	2025-03-28 15:22:40 +03:00
Carlosokumu	e832f46d22	return to top on retry	2025-03-26 14:40:54 +03:00
Carlosokumu	039117f40e	add api call failure catch	2025-03-26 14:40:32 +03:00
Carlosokumu	3532f72fbd	remove unneccessary catch	2025-03-26 14:39:37 +03:00
Carlosokumu	04c7e20457	set api call error flag to failing api calls	2025-03-26 14:38:47 +03:00
alfred-mk	0914217769	increase the size limit for the manage_vouchers	2025-03-26 14:33:23 +03:00
alfred-mk	ea117b7222	replace SetDefaultVoucher and CheckVouchers with ManageVouchers	2025-03-26 14:28:43 +03:00
alfred-mk	39e1c84a45	added TestManageVouchers for ManageVouchers	2025-03-26 14:27:17 +03:00
alfred-mk	20ee4dfb24	replace SetDefaultVoucher and CheckVouchers with ManageVouchers	2025-03-26 14:26:31 +03:00
				`@@ -0,0 +1 @@`
				`Ombi lako halikufaulu. Tafadhali jaribu tena baadaye.`
				`@@ -1 +0,0 @@`
				`Please confirm new PIN for: {{.retrieve_blocked_number}}`
				`@@ -1 +0,0 @@`
				`Tafadhali thibitisha PIN mpya ya: {{.retrieve_blocked_number}}`
				`@@ -1 +0,0 @@`
				`Please enter new PIN for: {{.retrieve_blocked_number}}`
				`@@ -1 +0,0 @@`
				`Tafadhali weka PIN mpya ya: {{.retrieve_blocked_number}}`
				`@@ -1 +0,0 @@`
				`The PIN you have entered is invalid.Please try a 4 digit number instead.`
				`@@ -0,0 +1 @@`
				`Available amount {{.swap_max_limit}} is too low, please try again:`
				`@@ -0,0 +1 @@`
				`Kiasi kinachopatikana {{.swap_max_limit}} ni cha chini sana, tafadhali jaribu tena:`