reset the flag_language_set and flag_account_created flags if the publicKey does not exist on the db

Reviewed-on: #42

Dockerfile

@@ -21,8 +21,7 @@ RUN make VISE_PATH=/build/go-vise -B
 WORKDIR /build/sarafu-vise
 RUN echo "Building on $BUILDPLATFORM, building for $TARGETPLATFORM"
 RUN go mod download
-RUN go build -tags logtrace,online -o sarafu-at -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
-RUN go build -tags logtrace,online -o sarafu-ssh -ldflags="-X main.build=${BUILD} -s -w" cmd/ssh/main.go
+RUN go build -tags logdebug,online -o sarafu-at -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
 
 FROM debian:bookworm-slim
 
@@ -37,7 +36,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 WORKDIR /service
 
 COPY --from=build /build/sarafu-vise/sarafu-at .
-COPY --from=build /build/sarafu-vise/sarafu-ssh .
 COPY --from=build /build/sarafu-vise/LICENSE .
 COPY --from=build /build/sarafu-vise/README.md .
 COPY --from=build /build/sarafu-vise/services ./services
@@ -45,6 +43,5 @@ COPY --from=build /build/sarafu-vise/.env.example .
 RUN mv .env.example .env
 
 EXPOSE 7123
-EXPOSE 7122
 
 CMD ["./sarafu-at"]

go.mod

@@ -3,14 +3,14 @@ module git.grassecon.net/grassrootseconomics/sarafu-vise
 go 1.23.4
 
 require (
-	git.defalsify.org/vise.git v0.2.3-0.20250205173834-d1f6647211ac
+	git.defalsify.org/vise.git v0.3.2-0.20250401123711-d481b04a6805
 	git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d
-	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250313071411-ba43610ff00b
-	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.1.0.20250204132347-1eb0b1555244
+	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.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.4.0-beta
+	github.com/grassrootseconomics/ussd-data-service v1.2.0-beta
 	github.com/jackc/pgx/v5 v5.7.1
 	github.com/peteole/testdata-loader v0.3.0
 	github.com/stretchr/testify v1.9.0

go.sum

@@ -1,31 +1,13 @@
-git.defalsify.org/vise.git v0.2.3-0.20250205173834-d1f6647211ac h1:f/E0ZTclVfMEnD/3Alrzzbg+dOm138zGydV42jT0JPw=
-git.defalsify.org/vise.git v0.2.3-0.20250205173834-d1f6647211ac/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.3.1 h1:A6FhMcur09ft/JzUPGXR+KpA17fltfeBnasyvLMZmq4=
+git.defalsify.org/vise.git v0.3.1/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.3.2-0.20250401123711-d481b04a6805 h1:FnT39aqXcP5YWhwPDBABopSjCu2SlbPFoOVitSpAVxU=
+git.defalsify.org/vise.git v0.3.2-0.20250401123711-d481b04a6805/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
 git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d h1:5mzLas+jxTUtusOKx4XvU+n2QvrV/mH17MnJRy46siQ=
 git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250206112944-31eb30de0f69 h1:cbBpm9uNJak58MpFpNXJuvgCmz+A8kquXr9har4expg=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250206112944-31eb30de0f69/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250224114958-1f3ac220d126 h1:fXL9uXt8yiu5ImJnwiHoLsq8T2TJ6+8qa97pCt+gHxA=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250224114958-1f3ac220d126/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250306151434-35f24b518375 h1:VilYLeBFXxOSgs+AD9B1+Mu+VJZHiSWACY5xF1x3xBE=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250306151434-35f24b518375/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250307051649-4783e2dcb319 h1:Qg6ttFJ4zjF67PERvLcXJ4/bXUTdCaRJ96RFRmQZ4xc=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250307051649-4783e2dcb319/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310110330-a04f7ee66c35 h1:JeRpSf+/NTFTl3lhiSkHO54NIoK6KrXmyqawfiuKc0Y=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310110330-a04f7ee66c35/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310111703-e3b6c25792c2 h1:QhiSpx3ndgQeR/CAynLdiOR+wNEJJDFWMKE2CHmp8n8=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310111703-e3b6c25792c2/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310133937-ba8d2a19c2ed h1:r5w89jInk9wwJZ4kMmE8ENPV7chxORJWIfxsPmnAQwY=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310133937-ba8d2a19c2ed/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310141205-3b39b86d0987 h1:HXFD3Pabi1H4tuKVZUjyqsYoI8JrhJrH0NXeVuB2buo=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250310141205-3b39b86d0987/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250311124651-3244c717cbee h1:YONuCBfzDlpeXsQMWRiBrRlSC0YHWUNuC5Sit43Ncww=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250311124651-3244c717cbee/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250313070549-3c2889ac72f0 h1:AMa2VmeRrmHz87+RtH9sJGTGnlYXqkhJG1tX/vgQAx0=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250313070549-3c2889ac72f0/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250313071411-ba43610ff00b h1:+j02QfOVYvPteaIpL/3KQ6taQnoI7TFkcH23iBUhoZg=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250313071411-ba43610ff00b/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
-git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.1.0.20250204132347-1eb0b1555244 h1:BXotWSKg04U97sf/xeWJuUTSVgKk2aEK+5BtBrnafXQ=
-git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.1.0.20250204132347-1eb0b1555244/go.mod h1:6B6ByxXOiRY0NR7K02Bf3fEu7z+2c/6q8PFVNjC5G8w=
+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.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 h1:DjJlBSz0S13acft5XZDWk7ZYnzElym0xLMYEVgyNJ+E=
 git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694/go.mod h1:DpibtYpnT3nG4Kn556hRAkdu4+CtiI/6MbnQHal51mQ=
 github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
@@ -47,8 +29,6 @@ github.com/grassrootseconomics/eth-custodial v1.3.0-beta h1:twrMBhl89GqDUL9PlkzQ
 github.com/grassrootseconomics/eth-custodial v1.3.0-beta/go.mod h1:7uhRcdnJplX4t6GKCEFkbeDhhjlcaGJeJqevbcvGLZo=
 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/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=

handlers/application/menuhandler.go

@@ -1,11 +1,14 @@
 package application
 
 import (
+	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"path"
 	"strconv"
 	"strings"
+	"unicode"
 
 	"gopkg.in/leonelquinteros/gotext.v1"
 
@@ -193,6 +196,7 @@ func (h *MenuHandlers) createAccountNoExist(ctx context.Context, sessionId strin
 	data := map[storedb.DataTyp]string{
 		storedb.DATA_TRACKING_ID:   trackingId,
 		storedb.DATA_PUBLIC_KEY:    publicKey,
+		storedb.DATA_ACCOUNT_ALIAS: "",
 	}
 	store := h.userdataStore
 	for key, value := range data {
@@ -239,6 +243,35 @@ func (h *MenuHandlers) CreateAccount(ctx context.Context, sym string, input []by
 	return res, nil
 }
 
+func (h *MenuHandlers) CheckAccountCreated(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	flag_language_set, _ := h.flagManager.GetFlag("flag_language_set")
+	flag_account_created, _ := h.flagManager.GetFlag("flag_account_created")
+
+	store := h.userdataStore
+
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	_, err := store.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
+	if err != nil {
+		if db.IsNotFound(err) {
+			// reset major flags
+			res.FlagReset = append(res.FlagReset, flag_language_set)
+			res.FlagReset = append(res.FlagReset, flag_account_created)
+
+			return res, nil
+		}
+
+		return res, nil
+	}
+
+	res.FlagSet = append(res.FlagSet, flag_account_created)
+	return res, nil
+}
+
 // ResetValidPin resets the flag_valid_pin flag.
 func (h *MenuHandlers) ResetValidPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
@@ -453,6 +486,14 @@ func (h *MenuHandlers) CheckBlockedNumPinMisMatch(ctx context.Context, sym strin
 	return res, nil
 }
 
+// ResetInvalidPIN resets the invalid PIN flag
+func (h *MenuHandlers) ResetInvalidPIN(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	flag_invalid_pin, _ := h.flagManager.GetFlag("flag_invalid_pin")
+	res.FlagReset = append(res.FlagReset, flag_invalid_pin)
+	return res, nil
+}
+
 // ConfirmPinChange validates user's new PIN. If input matches the temporary PIN, saves it as the new account PIN.
 func (h *MenuHandlers) ConfirmPinChange(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
@@ -707,10 +748,6 @@ func (h *MenuHandlers) SaveFirstname(ctx context.Context, sym string, input []by
 			logg.ErrorCtxf(ctx, "failed to write firstName entry with", "key", storedb.DATA_FIRST_NAME, "value", temporaryFirstName, "error", err)
 			return res, err
 		}
-		err := h.constructAccountAlias(ctx)
-		if err != nil {
-			return res, err
-		}
 		res.FlagSet = append(res.FlagSet, flag_firstname_set)
 	} else {
 		if firstNameSet {
@@ -1104,6 +1141,22 @@ func (h *MenuHandlers) GetCurrentProfileInfo(ctx context.Context, sym string, in
 		}
 		res.FlagSet = append(res.FlagSet, flag_offerings_set)
 		res.Content = string(profileInfo)
+	case storedb.DATA_ACCOUNT_ALIAS:
+		profileInfo, err = store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS)
+		if err != nil {
+			if db.IsNotFound(err) {
+				res.Content = defaultValue
+				break
+			}
+			logg.ErrorCtxf(ctx, "Failed to read account alias entry with", "key", "error", storedb.DATA_ACCOUNT_ALIAS, err)
+			return res, err
+		}
+		alias := string(profileInfo)
+		if alias == "" {
+			res.Content = defaultValue
+		} else {
+			res.Content = alias
+		}
 	default:
 		break
 	}
@@ -1147,8 +1200,10 @@ func (h *MenuHandlers) GetProfileInfo(ctx context.Context, sym string, input []b
 	offerings := getEntryOrDefault(store.ReadEntry(ctx, sessionId, storedb.DATA_OFFERINGS))
 	alias := getEntryOrDefault(store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS))
 
-	if alias != defaultValue {
+	if alias != defaultValue && alias != "" {
 		alias = strings.Split(alias, ".")[0]
+	} else {
+		alias = defaultValue
 	}
 
 	// Construct the full name
@@ -1233,10 +1288,6 @@ func (h *MenuHandlers) UpdateAllProfileItems(ctx context.Context, sym string, in
 	if err != nil {
 		return res, err
 	}
-	err = h.constructAccountAlias(ctx)
-	if err != nil {
-		return res, err
-	}
 	return res, nil
 }
 
@@ -1275,6 +1326,7 @@ func (h *MenuHandlers) Authorize(ctx context.Context, sym string, input []byte)
 	flag_incorrect_pin, _ := h.flagManager.GetFlag("flag_incorrect_pin")
 	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
 	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
+	flag_invalid_pin, _ := h.flagManager.GetFlag("flag_invalid_pin")
 
 	store := h.userdataStore
 	AccountPin, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_PIN)
@@ -1311,6 +1363,9 @@ func (h *MenuHandlers) Authorize(ctx context.Context, sym string, input []byte)
 			return res, nil
 		}
 	} else {
+		if string(input) != "0" {
+			res.FlagSet = append(res.FlagSet, flag_invalid_pin)
+		}
 		return res, nil
 	}
 	return res, nil
@@ -1411,53 +1466,83 @@ func (h *MenuHandlers) ShowBlockedAccount(ctx context.Context, sym string, input
 	return res, nil
 }
 
+// loadUserContent loads the main user content in the main menu: the alias,balance associated with active voucher
+func loadUserContent(ctx context.Context, activeSym string, balance string, alias string) (string, error) {
+	var content string
+
+	code := codeFromCtx(ctx)
+	l := gotext.NewLocale(translationDir, code)
+	l.AddDomain("default")
+
+	balFloat, err := strconv.ParseFloat(balance, 64)
+	if err != nil {
+		//Only exclude ErrSyntax error to avoid returning an error if the active bal is not available yet
+		if !errors.Is(err, strconv.ErrSyntax) {
+			logg.ErrorCtxf(ctx, "failed to parse activeBal as float", "value", balance, "error", err)
+			return "", err
+		}
+		balFloat = 0.00
+	}
+	// Format to 2 decimal places
+	balStr := fmt.Sprintf("%.2f %s", balFloat, activeSym)
+	if alias != "" {
+		content = l.Get("%s balance: %s\n", alias, balStr)
+	} else {
+		content = l.Get("Balance: %s\n", balStr)
+	}
+	return content, nil
+}
+
 // CheckBalance retrieves the balance of the active voucher and sets
 // the balance as the result content.
 func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	var err error
+	var (
+		res     resource.Result
+		err     error
+		alias   string
+		content string
+	)
 
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
 
-	code := codeFromCtx(ctx)
-	l := gotext.NewLocale(translationDir, code)
-	l.AddDomain("default")
-
 	store := h.userdataStore
 
 	// get the active sym and active balance
 	activeSym, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
 	if err != nil {
-		if db.IsNotFound(err) {
-			balance := "0.00"
-			res.Content = l.Get("Balance: %s\n", balance)
-			return res, nil
-		}
-
+		logg.InfoCtxf(ctx, "could not find the activeSym in checkBalance:", "err", err)
+		if !db.IsNotFound(err) {
 			logg.ErrorCtxf(ctx, "failed to read activeSym entry with", "key", storedb.DATA_ACTIVE_SYM, "error", err)
 			return res, err
 		}
+	}
 
 	activeBal, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_BAL)
 	if err != nil {
+		if !db.IsNotFound(err) {
 			logg.ErrorCtxf(ctx, "failed to read activeBal entry with", "key", storedb.DATA_ACTIVE_BAL, "error", err)
 			return res, err
 		}
-
-	// Convert activeBal from []byte to float64
-	balFloat, err := strconv.ParseFloat(string(activeBal), 64)
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to parse activeBal as float", "value", string(activeBal), "error", err)
-		return res, err
 	}
 
-	// Format to 2 decimal places
-	balStr := fmt.Sprintf("%.2f %s", balFloat, activeSym)
+	accAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS)
+	if err != nil {
+		if !db.IsNotFound(err) {
+			logg.ErrorCtxf(ctx, "failed to read account alias entry with", "key", storedb.DATA_ACCOUNT_ALIAS, "error", err)
+			return res, err
+		}
+	} else {
+		alias = strings.Split(string(accAlias), ".")[0]
+	}
 
-	res.Content = l.Get("Balance: %s\n", balStr)
+	content, err = loadUserContent(ctx, string(activeSym), string(activeBal), alias)
+	if err != nil {
+		return res, err
+	}
+	res.Content = content
 
 	return res, nil
 }
@@ -1561,6 +1646,7 @@ func (h *MenuHandlers) ValidateRecipient(ctx context.Context, sym string, input
 				//Perform a search for each search domain,break on first match
 				for _, domain := range config.SearchDomains() {
 					fqdn := fmt.Sprintf("%s.%s", recipient, domain)
+					logg.InfoCtxf(ctx, "Resolving with fqdn alias", "alias", fqdn)
 					AliasAddress, err = h.accountService.CheckAliasAddress(ctx, fqdn)
 					if err == nil {
 						AliasAddressResult = AliasAddress.Address
@@ -1867,11 +1953,12 @@ func (h *MenuHandlers) InitiateTransaction(ctx context.Context, sym string, inpu
 	return res, nil
 }
 
-// SetDefaultVoucher retrieves the current vouchers
-// and sets the first as the default voucher, if no active voucher is set.
-func (h *MenuHandlers) SetDefaultVoucher(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+// ManageVouchers retrieves the token holdings from the API using the "PublicKey" and
+// 1. sets the first as the default voucher if no active voucher is set.
+// 2. Stores list of vouchers
+// 3. updates the balance of the active voucher
+func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
-	var err error
 	userStore := h.userdataStore
 
 	sessionId, ok := ctx.Value("SessionId").(string)
@@ -1881,31 +1968,31 @@ func (h *MenuHandlers) SetDefaultVoucher(ctx context.Context, sym string, input
 
 	flag_no_active_voucher, _ := h.flagManager.GetFlag("flag_no_active_voucher")
 
-	// check if the user has an active sym
-	_, err = userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
-
-	if err != nil {
-		if db.IsNotFound(err) {
 	publicKey, err := userStore.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)
+		logg.ErrorCtxf(ctx, "failed to read publicKey entry", "key", storedb.DATA_PUBLIC_KEY, "error", err)
 		return res, err
 	}
 
-			// Fetch vouchers from the API using the public key
+	// Fetch vouchers from API
 	vouchersResp, err := h.accountService.FetchVouchers(ctx, string(publicKey))
 	if err != nil {
 		res.FlagSet = append(res.FlagSet, flag_no_active_voucher)
 		return res, nil
 	}
 
-			// Return if there is no voucher
 	if len(vouchersResp) == 0 {
 		res.FlagSet = append(res.FlagSet, flag_no_active_voucher)
 		return res, nil
 	}
 
-			// Use only the first voucher
+	res.FlagReset = append(res.FlagReset, flag_no_active_voucher)
+
+	// Check if user has an active voucher with proper error handling
+	activeSym, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
+	if err != nil {
+		if db.IsNotFound(err) {
+			// No active voucher, set the first one as default
 			firstVoucher := vouchersResp[0]
 			defaultSym := firstVoucher.TokenSymbol
 			defaultBal := firstVoucher.Balance
@@ -1915,69 +2002,27 @@ func (h *MenuHandlers) SetDefaultVoucher(ctx context.Context, sym string, input
 			// Scale down the balance
 			scaledBalance := store.ScaleDownBalance(defaultBal, defaultDec)
 
-			// TODO: implement atomic transaction
-			// set the active symbol
-			err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM, []byte(defaultSym))
-			if err != nil {
-				logg.ErrorCtxf(ctx, "failed to write defaultSym entry with", "key", storedb.DATA_ACTIVE_SYM, "value", defaultSym, "error", err)
-				return res, err
-			}
-			// set the active balance
-			err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_BAL, []byte(scaledBalance))
-			if err != nil {
-				logg.ErrorCtxf(ctx, "failed to write defaultBal entry with", "key", storedb.DATA_ACTIVE_BAL, "value", scaledBalance, "error", err)
-				return res, err
-			}
-			// set the active decimals
-			err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_DECIMAL, []byte(defaultDec))
-			if err != nil {
-				logg.ErrorCtxf(ctx, "failed to write defaultDec entry with", "key", storedb.DATA_ACTIVE_DECIMAL, "value", defaultDec, "error", err)
-				return res, err
-			}
-			// set the active contract address
-			err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_ADDRESS, []byte(defaultAddr))
-			if err != nil {
-				logg.ErrorCtxf(ctx, "failed to write defaultAddr entry with", "key", storedb.DATA_ACTIVE_ADDRESS, "value", defaultAddr, "error", err)
-				return res, err
+			firstVoucherMap := map[storedb.DataTyp]string{
+				storedb.DATA_ACTIVE_SYM:     defaultSym,
+				storedb.DATA_ACTIVE_BAL:     scaledBalance,
+				storedb.DATA_ACTIVE_DECIMAL: defaultDec,
+				storedb.DATA_ACTIVE_ADDRESS: defaultAddr,
 			}
 
-			return res, nil
+			for key, value := range firstVoucherMap {
+				if err := userStore.WriteEntry(ctx, sessionId, key, []byte(value)); err != nil {
+					logg.ErrorCtxf(ctx, "Failed to write active voucher data", "key", key, "error", err)
+					return res, err
+				}
 			}
 
+			logg.InfoCtxf(ctx, "Default voucher set", "symbol", defaultSym, "balance", defaultBal, "decimals", defaultDec, "address", defaultAddr)
+		} else {
 			logg.ErrorCtxf(ctx, "failed to read activeSym entry with", "key", storedb.DATA_ACTIVE_SYM, "error", err)
 			return res, err
 		}
-
-	res.FlagReset = append(res.FlagReset, flag_no_active_voucher)
-
-	return res, nil
-}
-
-// CheckVouchers retrieves the token holdings from the API using the "PublicKey" and stores
-// them to gdbm.
-func (h *MenuHandlers) CheckVouchers(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	userStore := h.userdataStore
-	publicKey, err := userStore.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 res, err
-	}
-
-	// Fetch vouchers from the API using the public key
-	vouchersResp, err := h.accountService.FetchVouchers(ctx, string(publicKey))
-	if err != nil {
-		return res, nil
-	}
-
-	// check the current active sym and update the data
-	activeSym, _ := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
-	if activeSym != nil {
+	} else {
+		// Update active voucher balance
 		activeSymStr := string(activeSym)
 
 		// Find the matching voucher data
@@ -2007,9 +2052,8 @@ func (h *MenuHandlers) CheckVouchers(ctx context.Context, sym string, input []by
 		}
 	}
 
-	data := store.ProcessVouchers(vouchersResp)
-
 	// Store all voucher data
+	data := store.ProcessVouchers(vouchersResp)
 	dataMap := map[storedb.DataTyp]string{
 		storedb.DATA_VOUCHER_SYMBOLS:   data.Symbols,
 		storedb.DATA_VOUCHER_BALANCES:  data.Balances,
@@ -2017,9 +2061,11 @@ func (h *MenuHandlers) CheckVouchers(ctx context.Context, sym string, input []by
 		storedb.DATA_VOUCHER_ADDRESSES: data.Addresses,
 	}
 
+	// Write data entries
 	for key, value := range dataMap {
-		if err := h.prefixDb.Put(ctx, []byte(storedb.ToBytes(key)), []byte(value)); err != nil {
-			return res, nil
+		if err := userStore.WriteEntry(ctx, sessionId, key, []byte(value)); err != nil {
+			logg.ErrorCtxf(ctx, "Failed to write data entry for sessionId: %s", sessionId, "key", key, "error", err)
+			continue
 		}
 	}
 
@@ -2029,16 +2075,25 @@ func (h *MenuHandlers) CheckVouchers(ctx context.Context, sym string, input []by
 // GetVoucherList fetches the list of vouchers and formats them.
 func (h *MenuHandlers) GetVoucherList(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	userStore := h.userdataStore
 
 	// Read vouchers from the store
-	voucherData, err := h.prefixDb.Get(ctx, storedb.ToBytes(storedb.DATA_VOUCHER_SYMBOLS))
+	voucherData, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_VOUCHER_SYMBOLS)
+	logg.InfoCtxf(ctx, "reading GetVoucherList entries for sessionId: %s", sessionId, "key", storedb.DATA_VOUCHER_SYMBOLS, "voucherData", voucherData)
 	if err != nil {
-		logg.ErrorCtxf(ctx, "Failed to read the voucherData from prefixDb", "error", err)
+		logg.ErrorCtxf(ctx, "failed to read voucherData entires with", "key", storedb.DATA_VOUCHER_SYMBOLS, "error", err)
 		return res, err
 	}
 
 	formattedData := h.ReplaceSeparatorFunc(string(voucherData))
 
+	logg.InfoCtxf(ctx, "final output for sessionId: %s", sessionId, "key", storedb.DATA_VOUCHER_SYMBOLS, "formattedData", formattedData)
+
 	res.Content = string(formattedData)
 
 	return res, nil
@@ -2065,7 +2120,7 @@ func (h *MenuHandlers) ViewVoucher(ctx context.Context, sym string, input []byte
 		return res, nil
 	}
 
-	metadata, err := store.GetVoucherData(ctx, h.prefixDb, inputStr)
+	metadata, err := store.GetVoucherData(ctx, h.userdataStore, sessionId, inputStr)
 	if err != nil {
 		return res, fmt.Errorf("failed to retrieve voucher data: %v", err)
 	}
@@ -2394,6 +2449,110 @@ func (h *MenuHandlers) constructAccountAlias(ctx context.Context) error {
 	return nil
 }
 
+// RequestCustomAlias requests an ENS based alias name based on a user's input,then saves it as temporary value
+func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+	if string(input) == "0" {
+		return res, nil
+	}
+
+	store := h.userdataStore
+	aliasHint, err := store.ReadEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE)
+	if err != nil {
+		if db.IsNotFound(err) {
+			return res, nil
+		}
+		return res, err
+	}
+	//Ensures that the call doesn't happen twice for the same alias hint
+	if !bytes.Equal(aliasHint, input) {
+		err = store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(string(input)))
+		if err != nil {
+			return res, err
+		}
+		pubKey, err := store.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
+		if err != nil {
+			if db.IsNotFound(err) {
+				return res, nil
+			}
+		}
+		sanitizedInput := sanitizeAliasHint(string(input))
+		aliasResult, err := h.accountService.RequestAlias(ctx, string(pubKey), sanitizedInput)
+		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to retrieve alias", "alias", string(aliasHint), "error_alias_request", err)
+			return res, fmt.Errorf("Failed to retrieve alias: %s", err.Error())
+		}
+		alias := aliasResult.Alias
+		logg.InfoCtxf(ctx, "Suggested alias ", "alias", alias)
+
+		//Store the returned alias,wait for user to confirm it as new account alias
+		err = store.WriteEntry(ctx, sessionId, storedb.DATA_SUGGESTED_ALIAS, []byte(alias))
+		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to write account alias", "key", storedb.DATA_TEMPORARY_VALUE, "value", alias, "error", err)
+			return res, err
+		}
+	}
+	return res, nil
+}
+
+func sanitizeAliasHint(input string) string {
+	for i, r := range input {
+		// Check if the character is a special character (non-alphanumeric)
+		if !unicode.IsLetter(r) && !unicode.IsNumber(r) {
+			return input[:i]
+		}
+	}
+	// If no special character is found, return the whole input
+	return input
+}
+
+// GetSuggestedAlias loads and displays the suggested alias name from the temporary value
+func (h *MenuHandlers) GetSuggestedAlias(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	store := h.userdataStore
+
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+	suggestedAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_SUGGESTED_ALIAS)
+	if err != nil {
+		return res, nil
+	}
+	res.Content = string(suggestedAlias)
+	return res, nil
+}
+
+// ConfirmNewAlias  reads  the suggested alias from the [DATA_SUGGECTED_ALIAS] key and confirms it  as the new account alias.
+func (h *MenuHandlers) ConfirmNewAlias(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	store := h.userdataStore
+
+	flag_alias_set, _ := h.flagManager.GetFlag("flag_alias_set")
+
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+	newAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_SUGGESTED_ALIAS)
+	if err != nil {
+		return res, nil
+	}
+	logg.InfoCtxf(ctx, "Confirming new alias", "alias", string(newAlias))
+	err = store.WriteEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS, []byte(string(newAlias)))
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to clear DATA_ACCOUNT_ALIAS_VALUE entry with", "key", storedb.DATA_ACCOUNT_ALIAS, "value", "empty", "error", err)
+		return res, err
+	}
+
+	res.FlagSet = append(res.FlagSet, flag_alias_set)
+	return res, nil
+}
+
 // ClearTemporaryValue empties the DATA_TEMPORARY_VALUE at the main menu to prevent
 // previously stored data from being accessed
 func (h *MenuHandlers) ClearTemporaryValue(ctx context.Context, sym string, input []byte) (resource.Result, error) {
@@ -2412,436 +2571,3 @@ func (h *MenuHandlers) ClearTemporaryValue(ctx context.Context, sym string, inpu
 	}
 	return res, nil
 }
-
-// GetPools fetches a list of 5 top pools
-func (h *MenuHandlers) GetPools(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	flag_api_error, _ := h.flagManager.GetFlag("flag_api_error")
-
-	// call the api to get a list of top 5 pools sorted by swaps
-	topPools, err := h.accountService.FetchTopPools(ctx)
-	if err != nil {
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		logg.ErrorCtxf(ctx, "failed on FetchTransactions", "error", err)
-		return res, err
-	}
-
-	// Return if there are no pools
-	if len(topPools) == 0 {
-		return res, nil
-	}
-
-	data := store.ProcessPools(topPools)
-
-	// Store all Pool data
-	dataMap := map[storedb.DataTyp]string{
-		storedb.DATA_POOL_NAMES:     data.PoolNames,
-		storedb.DATA_POOL_SYMBOLS:   data.PoolSymbols,
-		storedb.DATA_POOL_ADDRESSES: data.PoolContractAdrresses,
-	}
-
-	for key, value := range dataMap {
-		if err := h.prefixDb.Put(ctx, []byte(storedb.ToBytes(key)), []byte(value)); err != nil {
-			return res, nil
-		}
-	}
-
-	res.Content = h.ReplaceSeparatorFunc(data.PoolSymbols)
-
-	return res, nil
-}
-
-// LoadSwapFromList gets all the possible tokens a user can select to swap from
-func (h *MenuHandlers) LoadSwapFromList(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	userStore := h.userdataStore
-	publicKey, err := userStore.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 res, err
-	}
-
-	flag_incorrect_pool, _ := h.flagManager.GetFlag("flag_incorrect_pool")
-	flag_api_error, _ := h.flagManager.GetFlag("flag_api_error")
-
-	inputStr := string(input)
-	if inputStr == "0" {
-		res.FlagReset = append(res.FlagReset, flag_incorrect_pool)
-		return res, nil
-	}
-
-	poolData, err := store.GetPoolData(ctx, h.prefixDb, inputStr)
-	if err != nil {
-		return res, fmt.Errorf("failed to retrieve pool data: %v", err)
-	}
-
-	if poolData == nil {
-		// no match found. Call the API
-		poolResp := dataserviceapi.PoolDetails{
-			PoolName:            "DevTest",
-			PoolSymbol:          "DEVT",
-			PoolContractAdrress: "0x145F87d6198dEDD45C614FFD8b70E9a2fCCc5cc9",
-			LimiterAddress:      "",
-			VoucherRegistry:     "",
-		}
-
-		if (poolResp == dataserviceapi.PoolDetails{}) {
-			// If the API does not return the data, set the flag
-			res.FlagSet = append(res.FlagSet, flag_incorrect_pool)
-			return res, nil
-		}
-
-		poolData = &poolResp
-	}
-
-	activePoolAddress := poolData.PoolContractAdrress
-
-	// set the active pool contract address
-	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_POOL_ADDRESS, []byte(activePoolAddress))
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to write active PoolContractAdrress entry with", "key", storedb.DATA_ACTIVE_POOL_ADDRESS, "value", activePoolAddress, "error", err)
-		return res, err
-	}
-
-	res.FlagReset = append(res.FlagReset, flag_incorrect_pool)
-
-	// call the api using the activePoolAddress and publicKey to get a list of SwapfromSymbolsData
-	swapFromList, err := h.accountService.GetPoolSwappableFromVouchers(ctx, activePoolAddress, string(publicKey))
-	if err != nil {
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		logg.ErrorCtxf(ctx, "failed on FetchTransactions", "error", err)
-		return res, err
-	}
-
-	// Return if there are no vouchers
-	if len(swapFromList) == 0 {
-		res.FlagSet = append(res.FlagSet, flag_incorrect_pool)
-		return res, nil
-	}
-
-	data := store.ProcessVouchers(swapFromList)
-
-	// Store all from list voucher data
-	dataMap := map[storedb.DataTyp]string{
-		storedb.DATA_POOL_FROM_SYMBOLS:   data.Symbols,
-		storedb.DATA_POOL_FROM_BALANCES:  data.Balances,
-		storedb.DATA_POOL_FROM_DECIMALS:  data.Decimals,
-		storedb.DATA_POOL_FROM_ADDRESSES: data.Addresses,
-	}
-
-	for key, value := range dataMap {
-		if err := h.prefixDb.Put(ctx, []byte(storedb.ToBytes(key)), []byte(value)); err != nil {
-			return res, nil
-		}
-	}
-
-	res.Content = h.ReplaceSeparatorFunc(data.Symbols)
-
-	return res, nil
-}
-
-// LoadSwapFromList returns a list of possible vouchers to swap to
-func (h *MenuHandlers) LoadSwapToList(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	userStore := h.userdataStore
-	publicKey, err := userStore.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 res, err
-	}
-
-	flag_incorrect_voucher, _ := h.flagManager.GetFlag("flag_incorrect_voucher")
-	flag_api_error, _ := h.flagManager.GetFlag("flag_api_error")
-
-	inputStr := string(input)
-	if inputStr == "0" {
-		return res, nil
-	}
-
-	metadata, err := store.GetSwapFromVoucherData(ctx, h.prefixDb, inputStr)
-	if err != nil {
-		return res, fmt.Errorf("failed to retrieve swap from voucher data: %v", err)
-	}
-
-	if metadata == nil {
-		res.FlagSet = append(res.FlagSet, flag_incorrect_voucher)
-		return res, nil
-	}
-
-	// Store the active swap from data
-	if err := store.UpdateSwapFromVoucherData(ctx, userStore, sessionId, metadata); err != nil {
-		logg.ErrorCtxf(ctx, "failed on UpdateSwapFromVoucherData", "error", err)
-		return res, err
-	}
-
-	res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
-
-	activePoolAddress, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_POOL_ADDRESS)
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read activePoolAddress entry with", "key", storedb.DATA_ACTIVE_POOL_ADDRESS, "error", err)
-		return res, err
-	}
-
-	// call the api using the activePoolAddress and publicKey to get a list of SwapToSymbolsData
-	swapToList, err := h.accountService.GetPoolSwappableVouchers(ctx, string(activePoolAddress), string(publicKey))
-	if err != nil {
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		logg.ErrorCtxf(ctx, "failed on FetchTransactions", "error", err)
-		return res, err
-	}
-
-	// Return if there are no vouchers
-	if len(swapToList) == 0 {
-		return res, nil
-	}
-
-	data := store.ProcessVouchers(swapToList)
-
-	// Store all to list voucher data
-	dataMap := map[storedb.DataTyp]string{
-		storedb.DATA_POOL_TO_SYMBOLS:   data.Symbols,
-		storedb.DATA_POOL_TO_BALANCES:  data.Balances,
-		storedb.DATA_POOL_TO_DECIMALS:  data.Decimals,
-		storedb.DATA_POOL_TO_ADDRESSES: data.Addresses,
-	}
-
-	for key, value := range dataMap {
-		if err := h.prefixDb.Put(ctx, []byte(storedb.ToBytes(key)), []byte(value)); err != nil {
-			return res, nil
-		}
-	}
-
-	res.Content = h.ReplaceSeparatorFunc(data.Symbols)
-
-	return res, nil
-}
-
-// SwapMaxLimit returns the max FROM token
-// check if max/tokenDecimals > 0.1 for UX purposes and to prevent swapping of dust values
-func (h *MenuHandlers) SwapMaxLimit(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	flag_incorrect_voucher, _ := h.flagManager.GetFlag("flag_incorrect_voucher")
-	flag_api_error, _ := h.flagManager.GetFlag("flag_api_error")
-	flag_low_swap_amount, _ := h.flagManager.GetFlag("flag_low_swap_amount")
-
-	res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
-	res.FlagReset = append(res.FlagSet, flag_low_swap_amount)
-
-	inputStr := string(input)
-	if inputStr == "0" {
-		return res, nil
-	}
-
-	metadata, err := store.GetSwapToVoucherData(ctx, h.prefixDb, inputStr)
-	if err != nil {
-		return res, fmt.Errorf("failed to retrieve swap to voucher data: %v", err)
-	}
-	if metadata == nil {
-		res.FlagSet = append(res.FlagSet, flag_incorrect_voucher)
-		return res, nil
-	}
-
-	userStore := h.userdataStore
-
-	// Store the active swap_to data
-	if err := store.UpdateSwapToVoucherData(ctx, userStore, sessionId, metadata); err != nil {
-		logg.ErrorCtxf(ctx, "failed on UpdateSwapToVoucherData", "error", err)
-		return res, err
-	}
-
-	swapData, err := store.ReadSwapData(ctx, userStore, sessionId)
-	if err != nil {
-		return res, err
-	}
-
-	// call the api using the ActivePoolAddress, ActiveSwapFromAddress, ActiveSwapToAddress and PublicKey to get the swap max limit
-	r, err := h.accountService.GetSwapFromTokenMaxLimit(ctx, swapData.ActivePoolAddress, swapData.ActiveSwapFromAddress, swapData.ActiveSwapToAddress, swapData.PublicKey)
-	if err != nil {
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		logg.ErrorCtxf(ctx, "failed on FetchTransactions", "error", err)
-		return res, err
-	}
-
-	// Scale down the amount
-	maxAmountStr := store.ScaleDownBalance(r.Max, swapData.ActiveSwapFromDecimal)
-	if err != nil {
-		return res, err
-	}
-
-	maxAmountFloat, err := strconv.ParseFloat(maxAmountStr, 64)
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to parse maxAmountStr as float", "value", maxAmountStr, "error", err)
-		return res, err
-	}
-
-	// Format to 2 decimal places
-	maxStr := fmt.Sprintf("%.2f", maxAmountFloat)
-
-	if maxAmountFloat < 0.1 {
-		// return with low amount flag
-		res.Content = maxStr
-		res.FlagSet = append(res.FlagSet, flag_low_swap_amount)
-		return res, nil
-	}
-
-	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT, []byte(maxStr))
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to write swap max amount entry with", "key", storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT, "value", maxStr, "error", err)
-		return res, err
-	}
-
-	res.Content = fmt.Sprintf(
-		"Maximum: %s\n\nEnter amount of %s to swap for %s:",
-		maxStr, swapData.ActiveSwapFromSym, swapData.ActiveSwapToSym,
-	)
-
-	return res, nil
-}
-
-// SwapPreview displays the swap preview and estimates
-func (h *MenuHandlers) SwapPreview(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	inputStr := string(input)
-	if inputStr == "0" {
-		return res, nil
-	}
-
-	flag_invalid_amount, _ := h.flagManager.GetFlag("flag_invalid_amount")
-
-	code := codeFromCtx(ctx)
-	l := gotext.NewLocale(translationDir, code)
-	l.AddDomain("default")
-
-	userStore := h.userdataStore
-
-	swapData, err := store.ReadSwapPreviewData(ctx, userStore, sessionId)
-	if err != nil {
-		return res, err
-	}
-
-	maxValue, err := strconv.ParseFloat(swapData.ActiveSwapMaxAmount, 64)
-	if err != nil {
-		logg.ErrorCtxf(ctx, "Failed to convert the swapMaxAmount to a float", "error", err)
-		return res, err
-	}
-
-	inputAmount, err := strconv.ParseFloat(inputStr, 64)
-	if err != nil || inputAmount > maxValue {
-		res.FlagSet = append(res.FlagSet, flag_invalid_amount)
-		res.Content = inputStr
-		return res, nil
-	}
-
-	finalAmountStr, err := store.ParseAndScaleAmount(inputStr, swapData.ActiveSwapFromDecimal)
-	if err != nil {
-		return res, err
-	}
-
-	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_SWAP_AMOUNT, []byte(finalAmountStr))
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to write swap amount entry with", "key", storedb.DATA_ACTIVE_SWAP_AMOUNT, "value", finalAmountStr, "error", err)
-		return res, err
-	}
-
-	// call the API to get the quote
-	r, err := h.accountService.GetPoolSwapQuote(ctx, finalAmountStr, swapData.PublicKey, swapData.ActiveSwapFromAddress, swapData.ActivePoolAddress, swapData.ActiveSwapToAddress)
-	if err != nil {
-		flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		res.Content = l.Get("Your request failed. Please try again later.")
-		logg.ErrorCtxf(ctx, "failed on poolSwap", "error", err)
-		return res, nil
-	}
-
-	// Scale down the quoted amount
-	quoteAmountStr := store.ScaleDownBalance(r.OutValue, swapData.ActiveSwapToDecimal)
-	qouteAmount, err := strconv.ParseFloat(quoteAmountStr, 64)
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to parse quoteAmountStr as float", "value", quoteAmountStr, "error", err)
-		return res, err
-	}
-
-	// Format to 2 decimal places
-	qouteStr := fmt.Sprintf("%.2f", qouteAmount)
-
-	res.Content = fmt.Sprintf(
-		"You will swap:\n%s %s for %s %s:",
-		inputStr, swapData.ActiveSwapFromSym, qouteStr, swapData.ActiveSwapToSym,
-	)
-
-	return res, nil
-}
-
-// InitiateSwap calls the poolSwap and returns a confirmation based on the result.
-func (h *MenuHandlers) InitiateSwap(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	var err error
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-
-	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
-
-	code := codeFromCtx(ctx)
-	l := gotext.NewLocale(translationDir, code)
-	l.AddDomain("default")
-
-	userStore := h.userdataStore
-
-	swapData, err := store.ReadSwapPreviewData(ctx, userStore, sessionId)
-	if err != nil {
-		return res, err
-	}
-
-	swapAmount, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SWAP_AMOUNT)
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read swapAmount entry with", "key", storedb.DATA_ACTIVE_SWAP_AMOUNT, "error", err)
-		return res, err
-	}
-
-	swapAmountStr := string(swapAmount)
-
-	// Call the poolSwap API
-	r, err := h.accountService.PoolSwap(ctx, swapAmountStr, swapData.PublicKey, swapData.ActiveSwapFromAddress, swapData.ActivePoolAddress, swapData.ActiveSwapToAddress)
-	if err != nil {
-		flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		res.Content = l.Get("Your request failed. Please try again later.")
-		logg.ErrorCtxf(ctx, "failed on poolSwap", "error", err)
-		return res, nil
-	}
-
-	trackingId := r.TrackingId
-	logg.InfoCtxf(ctx, "poolSwap", "trackingId", trackingId)
-
-	res.Content = l.Get(
-		"Your request has been sent. You will receive an SMS when your %s %s has been swapped for %s.",
-		swapAmountStr,
-		swapData.ActiveSwapFromSym,
-		swapData.ActiveSwapToSym,
-	)
-
-	res.FlagReset = append(res.FlagReset, flag_account_authorized)
-	return res, nil
-}

handlers/application/menuhandler_test.go

@@ -1037,6 +1037,7 @@ func TestAuthorize(t *testing.T) {
 	flag_incorrect_pin, _ := fm.GetFlag("flag_incorrect_pin")
 	flag_account_authorized, _ := fm.GetFlag("flag_account_authorized")
 	flag_allow_update, _ := fm.GetFlag("flag_allow_update")
+	flag_invalid_pin, _ := fm.GetFlag("flag_invalid_pin")
 
 	// Set 1234 is the correct account pin
 	accountPIN := "1234"
@@ -1072,7 +1073,9 @@ func TestAuthorize(t *testing.T) {
 		{
 			name:  "Test with pin that is not a 4 digit",
 			input: []byte("1235aqds"),
-			expectedResult: resource.Result{},
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_invalid_pin},
+			},
 		},
 	}
 
@@ -1987,36 +1990,46 @@ func TestFetchCommunityBalance(t *testing.T) {
 	}
 }
 
-func TestSetDefaultVoucher(t *testing.T) {
+func TestManageVouchers(t *testing.T) {
 	sessionId := "session123"
+	publicKey := "0X13242618721"
+
 	ctx, store := InitializeTestStore(t)
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
 	fm, err := NewFlagManager(flagsPath)
 	if err != nil {
-		t.Logf(err.Error())
+		t.Fatal(err)
 	}
 	flag_no_active_voucher, err := fm.GetFlag("flag_no_active_voucher")
 	if err != nil {
-		t.Logf(err.Error())
+		t.Fatal(err)
 	}
 
-	publicKey := "0X13242618721"
+	err = store.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(publicKey))
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	tests := []struct {
 		name                   string
 		vouchersResp           []dataserviceapi.TokenHoldings
+		storedActiveVoucher    string
+		expectedVoucherSymbols []byte
+		expectedUpdatedAddress []byte
 		expectedResult         resource.Result
 	}{
 		{
-			name:         "Test no vouchers available",
+			name:                   "No vouchers available",
 			vouchersResp:           []dataserviceapi.TokenHoldings{},
+			expectedVoucherSymbols: []byte(""),
+			expectedUpdatedAddress: []byte(""),
 			expectedResult: resource.Result{
 				FlagSet: []uint32{flag_no_active_voucher},
 			},
 		},
 		{
-			name: "Test set default voucher when no active voucher is set",
+			name: "Set default voucher when no active voucher is set",
 			vouchersResp: []dataserviceapi.TokenHoldings{
 				{
 					ContractAddress: "0x123",
@@ -2025,7 +2038,24 @@ func TestSetDefaultVoucher(t *testing.T) {
 					Balance:         "100",
 				},
 			},
-			expectedResult: resource.Result{},
+			expectedVoucherSymbols: []byte("1:TOKEN1"),
+			expectedUpdatedAddress: []byte("0x123"),
+			expectedResult: resource.Result{
+				FlagReset: []uint32{flag_no_active_voucher},
+			},
+		},
+		{
+			name: "Check and update active voucher balance",
+			vouchersResp: []dataserviceapi.TokenHoldings{
+				{ContractAddress: "0xd4c288865Ce", TokenSymbol: "SRF", TokenDecimals: "6", Balance: "100"},
+				{ContractAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200"},
+			},
+			storedActiveVoucher:    "SRF",
+			expectedVoucherSymbols: []byte("1:SRF\n2:MILO"),
+			expectedUpdatedAddress: []byte("0xd4c288865Ce"),
+			expectedResult: resource.Result{
+				FlagReset: []uint32{flag_no_active_voucher},
+			},
 		},
 	}
 
@@ -2039,51 +2069,11 @@ func TestSetDefaultVoucher(t *testing.T) {
 				flagManager:    fm,
 			}
 
-			err := store.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(publicKey))
-			if err != nil {
-				t.Fatal(err)
-			}
-
 			mockAccountService.On("FetchVouchers", string(publicKey)).Return(tt.vouchersResp, nil)
 
-			res, err := h.SetDefaultVoucher(ctx, "set_default_voucher", []byte("some-input"))
-
-			assert.NoError(t, err)
-
-			assert.Equal(t, res, tt.expectedResult, "Expected result should be equal to the actual result")
-
-			mockAccountService.AssertExpectations(t)
-		})
-	}
-}
-
-func TestCheckVouchers(t *testing.T) {
-	mockAccountService := new(mocks.MockAccountService)
-	sessionId := "session123"
-	publicKey := "0X13242618721"
-
-	ctx, store := InitializeTestStore(t)
-	ctx = context.WithValue(ctx, "SessionId", sessionId)
-	spdb := InitializeTestSubPrefixDb(t, ctx)
-
-	h := &MenuHandlers{
-		userdataStore:  store,
-		accountService: mockAccountService,
-		prefixDb:       spdb,
-	}
-
-	err := store.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(publicKey))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	mockVouchersResponse := []dataserviceapi.TokenHoldings{
-		{ContractAddress: "0xd4c288865Ce", TokenSymbol: "SRF", TokenDecimals: "6", Balance: "100"},
-		{ContractAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200"},
-	}
-
-	// store the default voucher data
-	err = store.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM, []byte("SRF"))
+			// Store active voucher if needed
+			if tt.storedActiveVoucher != "" {
+				err := store.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM, []byte(tt.storedActiveVoucher))
 				if err != nil {
 					t.Fatal(err)
 				}
@@ -2091,52 +2081,45 @@ func TestCheckVouchers(t *testing.T) {
 				if err != nil {
 					t.Fatal(err)
 				}
+			}
 
-	expectedSym := []byte("1:SRF\n2:MILO")
-	expectedUpdatedAddress := []byte("0xd4c288865Ce")
-
-	mockAccountService.On("FetchVouchers", string(publicKey)).Return(mockVouchersResponse, nil)
-
-	_, err = h.CheckVouchers(ctx, "check_vouchers", []byte(""))
+			res, err := h.ManageVouchers(ctx, "manage_vouchers", []byte(""))
 			assert.NoError(t, err)
+			assert.Equal(t, tt.expectedResult, res)
 
-	// Read voucher sym data from the store
-	voucherData, err := spdb.Get(ctx, storedb.ToBytes(storedb.DATA_VOUCHER_SYMBOLS))
-	if err != nil {
-		t.Fatal(err)
-	}
+			if tt.storedActiveVoucher != "" {
+				// Validate stored voucher symbols
+				voucherData, err := store.ReadEntry(ctx, sessionId, storedb.DATA_VOUCHER_SYMBOLS)
+				assert.NoError(t, err)
+				assert.Equal(t, tt.expectedVoucherSymbols, voucherData)
 
-	// Read active contract address from the store
+				// Validate stored active contract address
 				updatedAddress, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_ADDRESS)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// assert that the data is stored correctly
-	assert.Equal(t, expectedSym, voucherData)
-	// assert that the address is updated
-	assert.Equal(t, expectedUpdatedAddress, updatedAddress)
+				assert.NoError(t, err)
+				assert.Equal(t, tt.expectedUpdatedAddress, updatedAddress)
 
 				mockAccountService.AssertExpectations(t)
+			}
+		})
+	}
 }
 
 func TestGetVoucherList(t *testing.T) {
 	sessionId := "session123"
 
-	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
-
-	spdb := InitializeTestSubPrefixDb(t, ctx)
+	ctx, store := InitializeTestStore(t)
+	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
 	// Initialize MenuHandlers
 	h := &MenuHandlers{
-		prefixDb:             spdb,
+		userdataStore:        store,
 		ReplaceSeparatorFunc: mockReplaceSeparator,
 	}
 
 	mockSyms := []byte("1:SRF\n2:MILO")
 
 	// Put voucher sym data from the store
-	err := spdb.Put(ctx, storedb.ToBytes(storedb.DATA_VOUCHER_SYMBOLS), mockSyms)
+	err := store.WriteEntry(ctx, sessionId, storedb.DATA_VOUCHER_SYMBOLS, mockSyms)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -2156,15 +2139,11 @@ func TestViewVoucher(t *testing.T) {
 	}
 	ctx, store := InitializeTestStore(t)
 	sessionId := "session123"
-
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
-	spdb := InitializeTestSubPrefixDb(t, ctx)
-
 	h := &MenuHandlers{
 		userdataStore: store,
 		flagManager:   fm,
-		prefixDb:      spdb,
 	}
 
 	// Define mock voucher data
@@ -2177,7 +2156,7 @@ func TestViewVoucher(t *testing.T) {
 
 	// Put the data
 	for key, value := range mockData {
-		err = spdb.Put(ctx, []byte(storedb.ToBytes(key)), []byte(value))
+		err := store.WriteEntry(ctx, sessionId, key, []byte(value))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -3473,15 +3452,6 @@ func TestUpdateAllProfileItems(t *testing.T) {
 	err = store.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(publicKey))
 	require.NoError(t, err)
 
-	aliasInput := fmt.Sprintf("%s%s", profileItems[0], profileItems[1])
-
-	// Mock the account alias response
-	mockAccountService.On(
-		"RequestAlias",
-		publicKey,
-		aliasInput,
-	).Return(&models.RequestAliasResult{Alias: "JohnDoe"}, nil)
-
 	// Call the function under test
 	res, err := h.UpdateAllProfileItems(ctx, "symbol", nil)
 	assert.NoError(t, err)
@@ -3493,10 +3463,6 @@ func TestUpdateAllProfileItems(t *testing.T) {
 		assert.Equal(t, profileItems[i], string(storedValue))
 	}
 
-	// Validate alias storage
-	storedAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS)
-	assert.NoError(t, err)
-	assert.Equal(t, "JohnDoe", string(storedAlias))
 	assert.Equal(t, expectedResult, res)
 }
 

handlers/event/token.go

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

handlers/local.go

@@ -103,8 +103,7 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	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)
@@ -124,12 +123,12 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("set_back", appHandlers.SetBack)
 	ls.DbRs.AddLocalFunc("show_blocked_account", appHandlers.ShowBlockedAccount)
 	ls.DbRs.AddLocalFunc("clear_temporary_value", appHandlers.ClearTemporaryValue)
-	ls.DbRs.AddLocalFunc("get_pools", appHandlers.GetPools)
-	ls.DbRs.AddLocalFunc("swap_from_list", appHandlers.LoadSwapFromList)
-	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.DbRs.AddLocalFunc("reset_invalid_pin", appHandlers.ResetInvalidPIN)
+	ls.DbRs.AddLocalFunc("request_custom_alias", appHandlers.RequestCustomAlias)
+	ls.DbRs.AddLocalFunc("get_suggested_alias", appHandlers.GetSuggestedAlias)
+	ls.DbRs.AddLocalFunc("confirm_new_alias", appHandlers.ConfirmNewAlias)
+	ls.DbRs.AddLocalFunc("check_account_created", appHandlers.CheckAccountCreated)
+
 	ls.first = appHandlers.Init
 
 	return appHandlers, nil

menutraversal_test/group_test.json

@@ -71,7 +71,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "5",
@@ -108,11 +108,11 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "2",
@@ -149,7 +149,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "5",
@@ -173,7 +173,7 @@
                 },
                 {
                     "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "0",
@@ -190,7 +190,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "5",
@@ -239,7 +239,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "5",
@@ -264,7 +264,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "3",
@@ -284,7 +284,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Balance: {balance}\n\n0:Back\n9:Quit"
+                    "expectedContent": "{balance}\n\n0:Back\n9:Quit"
                 },
                 {
                     "input": "0",
@@ -292,7 +292,7 @@
                 },
                 {
                     "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "0",
@@ -309,7 +309,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "3",
@@ -337,7 +337,7 @@
                 },
                 {
                     "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "0",
@@ -354,7 +354,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "1",
@@ -411,7 +411,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "1",
@@ -448,7 +448,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "1",
@@ -489,7 +489,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "1",
@@ -526,7 +526,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "1",
@@ -563,7 +563,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "1",
@@ -600,7 +600,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "1",
@@ -633,7 +633,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "1",

menutraversal_test/profile_edit_start_familyname.json

@@ -9,7 +9,7 @@
                     },
                     {
                         "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                     },
                     {
                         "input": "1",

menutraversal_test/profile_edit_start_firstname.json

@@ -9,7 +9,7 @@
                 },
                 {
                     "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                   "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                 },
                 {
                     "input": "1",

menutraversal_test/profile_edit_start_gender.json

@@ -9,7 +9,7 @@
                     },
                     {
                         "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                     },
                     {
                         "input": "1",

menutraversal_test/profile_edit_start_location.json

@@ -9,7 +9,7 @@
                     },
                     {
                         "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                     },
                     {
                         "input": "1",

menutraversal_test/profile_edit_start_offerings.json

@@ -9,7 +9,7 @@
                     },
                     {
                         "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                     },
                     {
                         "input": "1",

menutraversal_test/profile_edit_start_yob.json

@@ -9,7 +9,7 @@
                     },
                     {
                         "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                     },
                     {
                         "input": "1",

menutraversal_test/profile_edit_when_adjacent_item_set.json

@@ -9,7 +9,7 @@
                     },
                     {
                         "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                     },
                     {
                         "input": "1",

menutraversal_test/test_setup.json

@@ -116,7 +116,7 @@
                     },
                     {
                         "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
                     },
                     {
                         "input": "6",

services/registration/amount.vis

@@ -1,5 +1,5 @@
 LOAD reset_transaction_amount 0
-LOAD max_amount 10
+LOAD max_amount 40
 RELOAD max_amount
 MAP max_amount
 MOUT back 0

services/registration/confirm_new_alias

@@ -0,0 +1,2 @@
+Your full alias will be: {{.get_suggested_alias}}
+Please enter your PIN to confirm: 

services/registration/confirm_new_alias.vis

@@ -0,0 +1,12 @@
+LOAD reset_invalid_pin 6
+RELOAD reset_invalid_pin
+LOAD get_suggested_alias 0
+RELOAD get_suggested_alias
+MAP get_suggested_alias
+MOUT back 0
+HALT
+INCMP _ 0
+RELOAD authorize_account
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH invalid_pin flag_invalid_pin   1
+CATCH update_alias flag_allow_update 1

services/registration/confirm_new_alias_swa

@@ -0,0 +1,2 @@
+Lakabu yako kamili itakuwa: {{.get_suggested_alias}}
+Tafadhali weka PIN yako ili kuthibitisha:

services/registration/invalid_pin

@@ -1 +1 @@
-The PIN you entered is invalid.The PIN must be different from your current PIN.For help call +254757628885
+The PIN you entered is invalid.The PIN must be a 4 digit number.

services/registration/invalid_pin.vis

@@ -1,3 +1,8 @@
-MOUT back 0
+LOAD reset_invalid_pin 6
+RELOAD reset_invalid_pin
+MOUT retry 1
+MOUT quit 9
 HALT
-INCMP _ 0
+INCMP _ 1
+INCMP quit 9
+INCMP . *

services/registration/invalid_pin_swa

@@ -1 +1 @@
-PIN mpya na udhibitisho wa PIN mpya hazilingani.Tafadhali jaribu tena.Kwa usaidizi piga simu +254757628885.
+PIN uliyoweka si sahihi. PIN lazima iwe nambari 4.

services/registration/locale/swa/default.po

@@ -31,5 +31,6 @@ 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"

services/registration/low_swap_amount

@@ -1 +0,0 @@
-Available amount {{.swap_max_limit}} is too low, please try again:

services/registration/low_swap_amount.vis

@@ -1,6 +0,0 @@
-MAP swap_max_limit
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP _ 1
-INCMP quit 9

services/registration/low_swap_amount_swa

@@ -1 +0,0 @@
-Kiasi kinachopatikana {{.swap_max_limit}} ni cha chini sana, tafadhali jaribu tena:

services/registration/main.vis

@@ -1,24 +1,20 @@
 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
 LOAD check_balance 128
 RELOAD check_balance
 CATCH api_failure flag_api_call_error 1
 MAP check_balance
 MOUT send 1
-MOUT swap 2
-MOUT vouchers 3
-MOUT account 4
-MOUT help 5
+MOUT vouchers 2
+MOUT account 3
+MOUT help 4
 MOUT quit 9
 HALT
 INCMP send 1
-INCMP pool_swap 2
-INCMP my_vouchers 3
-INCMP my_account 4
-INCMP help 5
+INCMP my_vouchers 2
+INCMP my_account 3
+INCMP help 4
 INCMP quit 9
 INCMP . *

services/registration/my_account.vis

@@ -1,3 +1,4 @@
+LOAD authorize_account 16
 LOAD reset_allow_update 0
 MOUT profile 1
 MOUT change_language 2
@@ -5,6 +6,7 @@ MOUT check_balance 3
 MOUT check_statement 4
 MOUT pin_options 5
 MOUT my_address 6
+MOUT my_account_alias 7
 MOUT back 0
 HALT
 INCMP main 0
@@ -14,4 +16,5 @@ INCMP balances 3
 INCMP check_statement 4
 INCMP pin_management 5
 INCMP address 6
+INCMP my_account_alias 7
 INCMP . *

services/registration/my_account_alias

@@ -0,0 +1,2 @@
+Current alias: {{.get_current_profile_info}}
+Enter your preferred alias:

services/registration/my_account_alias.vis

@@ -0,0 +1,8 @@
+LOAD get_current_profile_info 0
+MAP get_current_profile_info
+MOUT back 0
+HALT 
+INCMP _ 0
+LOAD request_custom_alias 0
+RELOAD request_custom_alias
+INCMP  confirm_new_alias *

services/registration/my_account_alias_menu

@@ -0,0 +1 @@
+My Alias

services/registration/my_account_alias_menu_swa

@@ -0,0 +1 @@
+Lakabu yangu

services/registration/my_account_alias_swa

@@ -0,0 +1,2 @@
+Lakabu ya sasa: {{.get_current_profile_info}}
+Weka lakabu unalopendelea:

services/registration/old_pin.vis

@@ -1,8 +1,8 @@
-RELOAD reset_allow_update
+RELOAD reset_incorrect
 MOUT back 0
 HALT
 INCMP _ 0
 RELOAD authorize_account
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH _ flag_allow_update 0
+CATCH invalid_pin  flag_invalid_pin 1
 INCMP new_pin *

services/registration/pin_management.vis

@@ -1,9 +1,10 @@
 LOAD set_back 6
-LOAD authorize_account 5
+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_invalid_pin 6
 MOUT change_pin 1
 MOUT reset_pin 2
 MOUT back 0

services/registration/pool_swap

@@ -1,2 +0,0 @@
-Enter number or pool symbol to swap from:
-{{.get_pools}}

services/registration/pool_swap.vis

@@ -1,8 +0,0 @@
-LOAD get_pools 100
-MAP get_pools
-MOUT back 0
-MOUT quit 99
-HALT
-INCMP _ 0
-INCMP quit 99
-INCMP swap_from_list *

services/registration/pool_swap_swa

@@ -1,2 +0,0 @@
-Chagua bwawa la sarafu la kubadilishana:
-{{.get_pools}}

services/registration/pp.csv

@@ -29,5 +29,5 @@ flag,flag_location_set,35,this is set when the location of the profile is set
 flag,flag_offerings_set,36,this is set when the offerings of the profile is set
 flag,flag_back_set,37,this is set when it is a back navigation
 flag,flag_account_blocked,38,this is set when an account has been blocked after the allowed incorrect PIN attempts have been exceeded
-flag,flag_incorrect_pool,39,this is set when the user selects an invalid pool
-flag,flag_low_swap_amount,40,this is set when the swap max limit is less than 0.1
+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

services/registration/root.vis

@@ -1,5 +1,7 @@
 LOAD check_blocked_status 1
 RELOAD check_blocked_status
+LOAD check_account_created 2
+RELOAD check_account_created
 CATCH blocked_account flag_account_blocked 1
 CATCH select_language flag_language_set 0
 CATCH terms flag_account_created 0

services/registration/swap_from_list

@@ -1,2 +0,0 @@
-Select number or symbol to swap FROM:
-{{.swap_from_list}}

services/registration/swap_from_list.vis

@@ -1,7 +0,0 @@
-LOAD swap_from_list 0
-CATCH _ flag_incorrect_pool 1
-MAP swap_from_list
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP swap_to_list *

services/registration/swap_from_list_swa

@@ -1,2 +0,0 @@
-Chagua nambari au ishara ya sarafu kubadilisha KUTOKA:
-{{.swap_from_list}}

services/registration/swap_initiated.vis

@@ -1,3 +0,0 @@
-LOAD reset_incorrect 6
-LOAD initiate_swap 0
-HALT

services/registration/swap_limit

@@ -1 +0,0 @@
-{{.swap_max_limit}}

services/registration/swap_limit.vis

@@ -1,6 +0,0 @@
-RELOAD swap_max_limit
-MAP swap_max_limit
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP swap_preview *

services/registration/swap_limit_swa

@@ -1 +0,0 @@
-{{.swap_max_limit}}

services/registration/swap_menu

@@ -1 +0,0 @@
-Swap

services/registration/swap_preview

@@ -1,3 +0,0 @@
-{{.swap_preview}}
-
-Please enter your PIN to confirm:

services/registration/swap_preview.vis

@@ -1,12 +0,0 @@
-LOAD swap_preview 0
-MAP swap_preview
-MOUT back 0
-MOUT quit 9
-LOAD authorize_account 6
-HALT
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH . flag_account_authorized 0
-INCMP _ 0
-INCMP quit 9
-INCMP swap_initiated *

services/registration/swap_preview_swa

@@ -1,3 +0,0 @@
-{{.swap_preview}}
-
-Tafadhali weka PIN yako kudhibitisha:

services/registration/swap_to_list

@@ -1,2 +0,0 @@
-Select number or symbol to swap TO:
-{{.swap_to_list}}

services/registration/swap_to_list.vis

@@ -1,11 +0,0 @@
-LOAD swap_to_list 0
-CATCH _ flag_incorrect_voucher 1
-MAP swap_to_list
-MOUT back 0
-HALT
-LOAD swap_max_limit 64
-RELOAD swap_max_limit
-CATCH . flag_incorrect_voucher 1
-CATCH low_swap_amount flag_low_swap_amount 1
-INCMP _ 0
-INCMP swap_limit *

services/registration/swap_to_list_swa

@@ -1,2 +0,0 @@
-Chagua nambari au ishara ya sarafu kubadilisha KWENDA:
-{{.swap_to_list}}

services/registration/update_alias

@@ -0,0 +1 @@
+Your alias has been updated successfully

services/registration/update_alias.vis

@@ -0,0 +1,7 @@
+LOAD confirm_new_alias 0
+RELOAD confirm_new_alias
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP ^ 0
+INCMP quit 9

services/registration/update_alias_swa

@@ -0,0 +1 @@
+Ombi lako la kubadilisha lakabu limefanikiwa.

services/remote.go

@@ -14,6 +14,6 @@ import (
 func New(ctx context.Context, storageService storage.StorageService) remote.AccountService {
 	return &httpremote.HTTPAccountService{
 		SS:     storageService,
-		UseApi: false,
+		UseApi: true,
 	}
 }

store/db/db.go

@@ -63,24 +63,8 @@ const (
 	DATA_INITIAL_LANGUAGE_CODE
 	//Fully qualified account alias string
 	DATA_ACCOUNT_ALIAS
-	// 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
+	//currently suggested alias by the api awaiting user's confirmation as accepted account alias
+	DATA_SUGGESTED_ALIAS
 )
 
 const (
@@ -119,31 +103,6 @@ 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")
 )
@@ -173,7 +132,8 @@ func StringToDataTyp(str string) (DataTyp, error) {
 		return DATA_GENDER, nil
 	case "DATA_OFFERINGS":
 		return DATA_OFFERINGS, nil
-
+	case "DATA_ACCOUNT_ALIAS":
+		return DATA_ACCOUNT_ALIAS, nil
 	default:
 		return 0, errors.New("invalid DataTyp string")
 	}

store/db/sub_prefix_db.go

@@ -33,11 +33,14 @@ func (s *SubPrefixDb) toKey(k []byte) []byte {
 func (s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
 	s.store.SetPrefix(db.DATATYPE_USERDATA)
 	key = s.toKey(key)
+	logg.InfoCtxf(ctx, "SubPrefixDb Get log", "key", string(key))
+
 	return s.store.Get(ctx, key)
 }
 
 func (s *SubPrefixDb) Put(ctx context.Context, key []byte, val []byte) error {
 	s.store.SetPrefix(db.DATATYPE_USERDATA)
 	key = s.toKey(key)
+	logg.InfoCtxf(ctx, "SubPrefixDb Put log", "key", string(key))
 	return s.store.Put(ctx, key, val)
 }

store/pools.go

@@ -1,93 +0,0 @@
-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, db storedb.PrefixDb, 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 := db.Get(ctx, storedb.ToBytes(key))
-		if err != nil {
-			return nil, fmt.Errorf("failed to get prefix key %x: %v", storedb.ToBytes(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
-}

store/swap.go

@@ -1,207 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"reflect"
-
-	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 {
-	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_SWAP_FROM_SYM,
-		"ActiveSwapFromDecimal": storedb.DATA_ACTIVE_SWAP_FROM_DECIMAL,
-		"ActiveSwapFromAddress": storedb.DATA_ACTIVE_SWAP_FROM_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{
-		"PublicKey":             storedb.DATA_PUBLIC_KEY,
-		"ActiveSwapMaxAmount":   storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT,
-		"ActiveSwapFromDecimal": storedb.DATA_ACTIVE_SWAP_FROM_DECIMAL,
-		"ActivePoolAddress":     storedb.DATA_ACTIVE_POOL_ADDRESS,
-		"ActiveSwapFromAddress": storedb.DATA_ACTIVE_SWAP_FROM_ADDRESS,
-		"ActiveSwapFromSym":     storedb.DATA_ACTIVE_SWAP_FROM_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, db storedb.PrefixDb, 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 := db.Get(ctx, storedb.ToBytes(key))
-		if err != nil {
-			return nil, fmt.Errorf("failed to get prefix key %x: %v", storedb.ToBytes(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
-}
-
-// UpdateSwapFromVoucherData updates the active swap to voucher data in the DataStore.
-func UpdateSwapFromVoucherData(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
-	logg.TraceCtxf(ctx, "dtal", "data", data)
-	// Active swap from voucher data entries
-	activeEntries := map[storedb.DataTyp][]byte{
-		storedb.DATA_ACTIVE_SWAP_FROM_SYM:     []byte(data.TokenSymbol),
-		storedb.DATA_ACTIVE_SWAP_FROM_DECIMAL: []byte(data.TokenDecimals),
-		storedb.DATA_ACTIVE_SWAP_FROM_ADDRESS: []byte(data.ContractAddress),
-	}
-
-	// Write active data
-	for key, value := range activeEntries {
-		if err := store.WriteEntry(ctx, sessionId, key, value); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// GetSwapToVoucherData retrieves and matches voucher data
-func GetSwapToVoucherData(ctx context.Context, db storedb.PrefixDb, input string) (*dataserviceapi.TokenHoldings, 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 := db.Get(ctx, storedb.ToBytes(key))
-		if err != nil {
-			return nil, fmt.Errorf("failed to get prefix key %x: %v", storedb.ToBytes(key), err)
-		}
-		data[key] = string(value)
-	}
-
-	symbol, balance, 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
-	}
-
-	return &dataserviceapi.TokenHoldings{
-		TokenSymbol:     string(symbol),
-		Balance:         string(balance),
-		TokenDecimals:   string(decimal),
-		ContractAddress: 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.TokenHoldings) error {
-	logg.TraceCtxf(ctx, "dtal", "data", data)
-	// 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(data.TokenDecimals),
-		storedb.DATA_ACTIVE_SWAP_TO_ADDRESS: []byte(data.ContractAddress),
-	}
-
-	// Write active data
-	for key, value := range activeEntries {
-		if err := store.WriteEntry(ctx, sessionId, key, value); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}

store/swap_test.go

@@ -1,206 +0,0 @@
-package store
-
-import (
-	"context"
-	"testing"
-
-	visedb "git.defalsify.org/vise.git/db"
-	memdb "git.defalsify.org/vise.git/db/mem"
-	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
-	"github.com/alecthomas/assert/v2"
-	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
-	"github.com/stretchr/testify/require"
-)
-
-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) {
-	ctx := context.Background()
-
-	db := memdb.NewMemDb()
-	err := db.Connect(ctx, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	prefix := storedb.ToBytes(visedb.DATATYPE_USERDATA)
-	spdb := storedb.NewSubPrefixDb(db, prefix)
-
-	// 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 {
-		err = spdb.Put(ctx, []byte(storedb.ToBytes(key)), []byte(value))
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	result, err := GetSwapFromVoucherData(ctx, spdb, "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 TestUpdateSwapFromVoucherData(t *testing.T) {
-	ctx, store := InitializeTestDb(t)
-	sessionId := "session123"
-
-	// New swap from voucher data
-	newData := &dataserviceapi.TokenHoldings{
-		TokenSymbol:     "AMANI",
-		TokenDecimals:   "6",
-		ContractAddress: "0xc7B78Ac9ACB9E025C8234621FC515bC58179dEAe",
-	}
-
-	// Old temporary data
-	tempData := &dataserviceapi.TokenHoldings{
-		TokenSymbol:     "OLD",
-		TokenDecimals:   "8",
-		ContractAddress: "0xold",
-	}
-	require.NoError(t, StoreTemporaryVoucher(ctx, store, sessionId, tempData))
-
-	// Execute update
-	err := UpdateSwapFromVoucherData(ctx, store, sessionId, newData)
-	require.NoError(t, err)
-
-	// Verify active swap from data was stored correctly
-	activeEntries := map[storedb.DataTyp][]byte{
-		storedb.DATA_ACTIVE_SWAP_FROM_SYM:     []byte(newData.TokenSymbol),
-		storedb.DATA_ACTIVE_SWAP_FROM_DECIMAL: []byte(newData.TokenDecimals),
-		storedb.DATA_ACTIVE_SWAP_FROM_ADDRESS: []byte(newData.ContractAddress),
-	}
-
-	for key, expectedValue := range activeEntries {
-		storedValue, err := store.ReadEntry(ctx, sessionId, key)
-		require.NoError(t, err)
-		require.Equal(t, expectedValue, storedValue, "Active swap from data mismatch for key %v", key)
-	}
-}
-
-func TestGetSwapToVoucherData(t *testing.T) {
-	ctx := context.Background()
-
-	db := memdb.NewMemDb()
-	err := db.Connect(ctx, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	prefix := storedb.ToBytes(visedb.DATATYPE_USERDATA)
-	spdb := storedb.NewSubPrefixDb(db, prefix)
-
-	// 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 {
-		err = spdb.Put(ctx, []byte(storedb.ToBytes(key)), []byte(value))
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	result, err := GetSwapToVoucherData(ctx, spdb, "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)
-}

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

store/vouchers.go

@@ -68,7 +68,7 @@ func ScaleDownBalance(balance, decimals string) string {
 }
 
 // GetVoucherData retrieves and matches voucher data
-func GetVoucherData(ctx context.Context, db storedb.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) {
+func GetVoucherData(ctx context.Context, store DataStore, sessionId string, input string) (*dataserviceapi.TokenHoldings, error) {
 	keys := []storedb.DataTyp{
 		storedb.DATA_VOUCHER_SYMBOLS,
 		storedb.DATA_VOUCHER_BALANCES,
@@ -78,9 +78,9 @@ func GetVoucherData(ctx context.Context, db storedb.PrefixDb, input string) (*da
 	data := make(map[storedb.DataTyp]string)
 
 	for _, key := range keys {
-		value, err := db.Get(ctx, storedb.ToBytes(key))
+		value, err := store.ReadEntry(ctx, sessionId, key)
 		if err != nil {
-			return nil, fmt.Errorf("failed to get prefix key %x: %v", storedb.ToBytes(key), err)
+			return nil, fmt.Errorf("failed to get data key %x: %v", key, err)
 		}
 		data[key] = string(value)
 	}

store/vouchers_test.go

@@ -8,7 +8,6 @@ import (
 	"github.com/alecthomas/assert/v2"
 	"github.com/stretchr/testify/require"
 
-	visedb "git.defalsify.org/vise.git/db"
 	memdb "git.defalsify.org/vise.git/db/mem"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
@@ -77,16 +76,8 @@ func TestProcessVouchers(t *testing.T) {
 }
 
 func TestGetVoucherData(t *testing.T) {
-	ctx := context.Background()
-
-	db := memdb.NewMemDb()
-	err := db.Connect(ctx, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	prefix := storedb.ToBytes(visedb.DATATYPE_USERDATA)
-	spdb := storedb.NewSubPrefixDb(db, prefix)
+	ctx, store := InitializeTestDb(t)
+	sessionId := "session123"
 
 	// Test voucher data
 	mockData := map[storedb.DataTyp][]byte{
@@ -98,13 +89,13 @@ func TestGetVoucherData(t *testing.T) {
 
 	// Put the data
 	for key, value := range mockData {
-		err = spdb.Put(ctx, []byte(storedb.ToBytes(key)), []byte(value))
+		err := store.WriteEntry(ctx, sessionId, key, []byte(value))
 		if err != nil {
 			t.Fatal(err)
 		}
 	}
 
-	result, err := GetVoucherData(ctx, spdb, "1")
+	result, err := GetVoucherData(ctx, store, sessionId, "1")
 
 	assert.NoError(t, err)
 	assert.Equal(t, "SRF", result.TokenSymbol)