cmd/africastalking/main.go

@@ -7,6 +7,7 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 	"os"
 	"os/signal"
@@ -19,7 +20,6 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
 
-	"git.grassecon.net/urdt/ussd/common"
 	"git.grassecon.net/urdt/ussd/config"
 	"git.grassecon.net/urdt/ussd/initializers"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
@@ -29,10 +29,10 @@ import (
 )
 
 var (
-	logg          = logging.NewVanilla()
+	logg      = logging.NewVanilla()
-	scriptDir     = path.Join("services", "registration")
+	scriptDir = path.Join("services", "registration")
-	build         = "dev"
+
-	menuSeparator = ": "
+	build = "dev"
 )
 
 func init() {
@@ -44,14 +44,14 @@ type atRequestParser struct{}
 func (arp *atRequestParser) GetSessionId(rq any) (string, error) {
 	rqv, ok := rq.(*http.Request)
 	if !ok {
-		logg.Warnf("got an invalid request", "req", rq)
+		log.Printf("got an invalid request:", rq)
 		return "", handlers.ErrInvalidRequest
 	}
 
 	// Capture body (if any) for logging
 	body, err := io.ReadAll(rqv.Body)
 	if err != nil {
-		logg.Warnf("failed to read request body", "err", err)
+		log.Printf("failed to read request body:", err)
 		return "", fmt.Errorf("failed to read request body: %v", err)
 	}
 	// Reset the body for further reading
@@ -61,13 +61,13 @@ func (arp *atRequestParser) GetSessionId(rq any) (string, error) {
 	bodyLog := map[string]string{"body": string(body)}
 	logBytes, err := json.Marshal(bodyLog)
 	if err != nil {
-		logg.Warnf("failed to marshal request body", "err", err)
+		log.Printf("failed to marshal request body:", err)
 	} else {
-		logg.Debugf("received request", "bytes", logBytes)
+		log.Printf("Received request:", string(logBytes))
 	}
 
 	if err := rqv.ParseForm(); err != nil {
-		logg.Warnf("failed to parse form data", "err", err)
+		log.Printf("failed to parse form data: %v", err)
 		return "", fmt.Errorf("failed to parse form data: %v", err)
 	}
 
@@ -76,13 +76,7 @@ func (arp *atRequestParser) GetSessionId(rq any) (string, error) {
 		return "", fmt.Errorf("no phone number found")
 	}
 
-	formattedNumber, err := common.FormatPhoneNumber(phoneNumber)
+	return phoneNumber, nil
-	if err != nil {
-		logg.Warnf("failed to format phone number", "err", err)
-		return "", fmt.Errorf("failed to format number")
-	}
-
-	return formattedNumber, nil
 }
 
 func (arp *atRequestParser) GetInput(rq any) ([]byte, error) {
@@ -130,10 +124,9 @@ func main() {
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
-		Root:          "root",
+		Root:       "root",
-		OutputSize:    uint32(size),
+		OutputSize: uint32(size),
-		FlagCount:     uint32(128),
+		FlagCount:  uint32(128),
-		MenuSeparator: menuSeparator,
 	}
 
 	if engineDebug {

cmd/async/main.go

@@ -23,7 +23,6 @@ import (
 var (
 	logg      = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
-	menuSeparator = ": "
 )
 
 func init() {
@@ -71,10 +70,9 @@ func main() {
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
-		Root:          "root",
+		Root:       "root",
-		OutputSize:    uint32(size),
+		OutputSize: uint32(size),
-		FlagCount:     uint32(128),
+		FlagCount:  uint32(128),
-		MenuSeparator: menuSeparator,
 	}
 
 	if engineDebug {

cmd/http/main.go

@@ -26,7 +26,6 @@ import (
 var (
 	logg      = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
-	menuSeparator = ": "
 )
 
 func init() {
@@ -59,10 +58,9 @@ func main() {
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
-		Root:          "root",
+		Root:       "root",
-		OutputSize:    uint32(size),
+		OutputSize: uint32(size),
-		FlagCount:     uint32(128),
+		FlagCount:  uint32(128),
-		MenuSeparator: menuSeparator,
 	}
 
 	if engineDebug {

cmd/main.go

@@ -18,9 +18,8 @@ import (
 )
 
 var (
-	logg          = logging.NewVanilla()
+	logg      = logging.NewVanilla()
-	scriptDir     = path.Join("services", "registration")
+	scriptDir = path.Join("services", "registration")
-	menuSeparator = ": "
 )
 
 func init() {
@@ -50,11 +49,10 @@ func main() {
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
-		Root:          "root",
+		Root:       "root",
-		SessionId:     sessionId,
+		SessionId:  sessionId,
-		OutputSize:    uint32(size),
+		OutputSize: uint32(size),
-		FlagCount:     uint32(128),
+		FlagCount:  uint32(128),
-		MenuSeparator: menuSeparator,
 	}
 
 	resourceDir := scriptDir

common/db.go

@@ -7,84 +7,32 @@ import (
 	"git.defalsify.org/vise.git/logging"
 )
 
-// DataType is a subprefix value used in association with vise/db.DATATYPE_USERDATA. 
-//
-// All keys are used only within the context of a single account. Unless otherwise specified, the user context is the session id.
-//
-// * The first byte is vise/db.DATATYPE_USERDATA
-// * The last 2 bytes are the DataTyp value, big-endian.
-// * The intermediate bytes are the id of the user context.
-//
-// All values are strings
 type DataTyp uint16
 
 const (
-	// API Tracking id to follow status of account creation
+	DATA_ACCOUNT DataTyp = iota
-	DATA_TRACKING_ID = iota
+	DATA_ACCOUNT_CREATED
-	// EVM address returned from API on account creation
+	DATA_TRACKING_ID
 	DATA_PUBLIC_KEY
-	// Currently active PIN used to authenticate ussd state change requests
+	DATA_CUSTODIAL_ID
 	DATA_ACCOUNT_PIN
-	// The first name of the user
+	DATA_ACCOUNT_STATUS
 	DATA_FIRST_NAME
-	// The last name of the user
 	DATA_FAMILY_NAME
-	// The year-of-birth of the user
 	DATA_YOB
-	// The location of the user
 	DATA_LOCATION
-	// The gender of the user
 	DATA_GENDER
-	// The offerings description of the user
 	DATA_OFFERINGS
-	// The ethereum address of the recipient of an ongoing send request
 	DATA_RECIPIENT
-	// The voucher value amount of an ongoing send request
 	DATA_AMOUNT
-	// A general swap field for temporary values
 	DATA_TEMPORARY_VALUE
-	// Currently active voucher symbol of user
 	DATA_ACTIVE_SYM
-	// Voucher balance of user's currently active voucher
 	DATA_ACTIVE_BAL
-	// String boolean indicating whether use of PIN is blocked
 	DATA_BLOCKED_NUMBER
-	// Reverse mapping of a user's evm address to a session id.
 	DATA_PUBLIC_KEY_REVERSE
-	// Decimal count of the currently active voucher
 	DATA_ACTIVE_DECIMAL
-	// EVM address of the currently active voucher
 	DATA_ACTIVE_ADDRESS
-)
+	DATA_TRANSACTIONS
-
-const (
-	// List of valid voucher symbols in the user context.
-	DATA_VOUCHER_SYMBOLS DataTyp = 256 + iota
-	// List of voucher balances for vouchers valid in the user context.
-	DATA_VOUCHER_BALANCES
-	// List of voucher decimal counts for vouchers valid in the user context.
-	DATA_VOUCHER_DECIMALS
-	// List of voucher EVM addresses for vouchers valid in the user context.
-	DATA_VOUCHER_ADDRESSES
-	// List of senders for valid transactions in the user context.
-)
-
-const (
-	DATA_TX_SENDERS = 512 + iota
-	// List of recipients for valid transactions in the user context.
-	DATA_TX_RECIPIENTS
-	// List of voucher values for valid transactions in the user context.
-	DATA_TX_VALUES
-	// List of voucher EVM addresses for valid transactions in the user context.
-	DATA_TX_ADDRESSES
-	// List of valid transaction hashes in the user context.
-	DATA_TX_HASHES
-	// List of transaction dates for valid transactions in the user context.
-	DATA_TX_DATES
-	// List of voucher symbols for valid transactions in the user context.
-	DATA_TX_SYMBOLS
-	// List of voucher decimal counts for valid transactions in the user context.
-	DATA_TX_DECIMALS
 )
 
 var (
@@ -121,10 +69,3 @@ func StringToDataTyp(str string) (DataTyp, error) {
 		return 0, errors.New("invalid DataTyp string")
 	}
 }
-
-// ToBytes converts DataTyp or int to a byte slice
-func ToBytes[T ~uint16 | int](value T) []byte {
-	bytes := make([]byte, 2)
-	binary.BigEndian.PutUint16(bytes, uint16(value))
-	return bytes
-}

common/recipient.go

@@ -1,73 +0,0 @@
-package common
-
-import (
-	"errors"
-	"fmt"
-	"regexp"
-	"strings"
-)
-
-// Define the regex patterns as constants
-const (
-	phoneRegex   = `^(?:\+254|254|0)?((?:7[0-9]{8})|(?:1[01][0-9]{7}))$`
-	addressRegex = `^0x[a-fA-F0-9]{40}$`
-	aliasRegex   = `^[a-zA-Z0-9]+$`
-)
-
-// IsValidPhoneNumber checks if the given number is a valid phone number
-func IsValidPhoneNumber(phonenumber string) bool {
-	match, _ := regexp.MatchString(phoneRegex, phonenumber)
-	return match
-}
-
-// IsValidAddress checks if the given address is a valid Ethereum address
-func IsValidAddress(address string) bool {
-	match, _ := regexp.MatchString(addressRegex, address)
-	return match
-}
-
-// IsValidAlias checks if the alias is a valid alias format
-func IsValidAlias(alias string) bool {
-	match, _ := regexp.MatchString(aliasRegex, alias)
-	return match
-}
-
-// CheckRecipient validates the recipient format based on the criteria
-func CheckRecipient(recipient string) (string, error) {
-	if IsValidPhoneNumber(recipient) {
-		return "phone number", nil
-	}
-
-	if IsValidAddress(recipient) {
-		return "address", nil
-	}
-
-	if IsValidAlias(recipient) {
-		return "alias", nil
-	}
-
-	return "", fmt.Errorf("invalid recipient: must be a phone number, address or alias")
-}
-
-// FormatPhoneNumber formats a Kenyan phone number to "+254xxxxxxxx".
-func FormatPhoneNumber(phone string) (string, error) {
-	if !IsValidPhoneNumber(phone) {
-		return "", errors.New("invalid phone number")
-	}
-
-	// Remove any leading "+" and spaces
-	phone = strings.TrimPrefix(phone, "+")
-	phone = strings.ReplaceAll(phone, " ", "")
-
-	// Replace leading "0" with "254" if present
-	if strings.HasPrefix(phone, "0") {
-		phone = "254" + phone[1:]
-	}
-
-	// Add "+" if not already present
-	if !strings.HasPrefix(phone, "254") {
-		return "", errors.New("unexpected format")
-	}
-
-	return "+" + phone, nil
-}

common/transfer_statements.go

@@ -57,25 +57,25 @@ func ProcessTransfers(transfers []dataserviceapi.Last10TxResponse) TransferMetad
 // GetTransferData retrieves and matches transfer data
 // returns a formatted string of the full transaction/statement
 func GetTransferData(ctx context.Context, db storage.PrefixDb, publicKey string, index int) (string, error) {
-	keys := []DataTyp{DATA_TX_SENDERS, DATA_TX_RECIPIENTS, DATA_TX_VALUES, DATA_TX_ADDRESSES, DATA_TX_HASHES, DATA_TX_DATES, DATA_TX_SYMBOLS}
+	keys := []string{"txfrom", "txto", "txval", "txaddr", "txhash", "txdate", "txsym"}
-	data := make(map[DataTyp]string)
+	data := make(map[string]string)
 
 	for _, key := range keys {
-		value, err := db.Get(ctx, ToBytes(key))
+		value, err := db.Get(ctx, []byte(key))
 		if err != nil {
-			return "", fmt.Errorf("failed to get %s: %v", ToBytes(key), err)
+			return "", fmt.Errorf("failed to get %s: %v", key, err)
 		}
 		data[key] = string(value)
 	}
 
 	// Split the data
-	senders := strings.Split(string(data[DATA_TX_SENDERS]), "\n")
+	senders := strings.Split(string(data["txfrom"]), "\n")
-	recipients := strings.Split(string(data[DATA_TX_RECIPIENTS]), "\n")
+	recipients := strings.Split(string(data["txto"]), "\n")
-	values := strings.Split(string(data[DATA_TX_VALUES]), "\n")
+	values := strings.Split(string(data["txval"]), "\n")
-	addresses := strings.Split(string(data[DATA_TX_ADDRESSES]), "\n")
+	addresses := strings.Split(string(data["txaddr"]), "\n")
-	hashes := strings.Split(string(data[DATA_TX_HASHES]), "\n")
+	hashes := strings.Split(string(data["txhash"]), "\n")
-	dates := strings.Split(string(data[DATA_TX_DATES]), "\n")
+	dates := strings.Split(string(data["txdate"]), "\n")
-	syms := strings.Split(string(data[DATA_TX_SYMBOLS]), "\n")
+	syms := strings.Split(string(data["txsym"]), "\n")
 
 	// Check if index is within range
 	if index < 1 || index > len(senders) {
@@ -84,18 +84,18 @@ func GetTransferData(ctx context.Context, db storage.PrefixDb, publicKey string,
 
 	// Adjust for 0-based indexing
 	i := index - 1
-	transactionType := "Received"
+	transactionType := "received"
-	party := fmt.Sprintf("From: %s", strings.TrimSpace(senders[i]))
+	party := fmt.Sprintf("from: %s", strings.TrimSpace(senders[i]))
 	if strings.TrimSpace(senders[i]) == publicKey {
-		transactionType = "Sent"
+		transactionType = "sent"
-		party = fmt.Sprintf("To: %s", strings.TrimSpace(recipients[i]))
+		party = fmt.Sprintf("to: %s", strings.TrimSpace(recipients[i]))
 	}
 
 	formattedDate := formatDate(strings.TrimSpace(dates[i]))
 
 	// Build the full transaction detail
 	detail := fmt.Sprintf(
-		"%s %s %s\n%s\nContract address: %s\nTxhash: %s\nDate: %s",
+		"%s %s %s\n%s\ncontract address: %s\ntxhash: %s\ndate: %s",
 		transactionType,
 		strings.TrimSpace(values[i]),
 		strings.TrimSpace(syms[i]),

common/user_store.go

@@ -20,7 +20,7 @@ type UserDataStore struct {
 func (store *UserDataStore) ReadEntry(ctx context.Context, sessionId string, typ DataTyp) ([]byte, error) {
 	store.SetPrefix(db.DATATYPE_USERDATA)
 	store.SetSession(sessionId)
-	k := ToBytes(typ)
+	k := PackKey(typ, []byte(sessionId))
 	return store.Get(ctx, k)
 }
 
@@ -29,6 +29,6 @@ func (store *UserDataStore) ReadEntry(ctx context.Context, sessionId string, typ
 func (store *UserDataStore) WriteEntry(ctx context.Context, sessionId string, typ DataTyp, value []byte) error {
 	store.SetPrefix(db.DATATYPE_USERDATA)
 	store.SetSession(sessionId)
-	k := ToBytes(typ)
+	k := PackKey(typ, []byte(sessionId))
 	return store.Put(ctx, k, value)
 }

common/vouchers.go

@@ -64,23 +64,22 @@ func ScaleDownBalance(balance, decimals string) string {
 
 // GetVoucherData retrieves and matches voucher data
 func GetVoucherData(ctx context.Context, db storage.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) {
-	keys := []DataTyp{DATA_VOUCHER_SYMBOLS, DATA_VOUCHER_BALANCES, DATA_VOUCHER_DECIMALS, DATA_VOUCHER_ADDRESSES}
+	keys := []string{"sym", "bal", "deci", "addr"}
-	data := make(map[DataTyp]string)
+	data := make(map[string]string)
 
 	for _, key := range keys {
-		value, err := db.Get(ctx, ToBytes(key))
+		value, err := db.Get(ctx, []byte(key))
 		if err != nil {
-			return nil, fmt.Errorf("failed to get %s: %v", ToBytes(key), err)
+			return nil, fmt.Errorf("failed to get %s: %v", key, err)
 		}
 		data[key] = string(value)
 	}
 
 	symbol, balance, decimal, address := MatchVoucher(input,
-		data[DATA_VOUCHER_SYMBOLS],
+		data["sym"],
-		data[DATA_VOUCHER_BALANCES],
+		data["bal"],
-		data[DATA_VOUCHER_DECIMALS],
+		data["deci"],
-		data[DATA_VOUCHER_ADDRESSES],
+		data["addr"])
-	)
 
 	if symbol == "" {
 		return nil, nil
@@ -152,7 +151,7 @@ func GetTemporaryVoucherData(ctx context.Context, store DataStore, sessionId str
 	return data, nil
 }
 
-// UpdateVoucherData updates the active voucher data in the DataStore.
+// UpdateVoucherData sets the active voucher data in the DataStore.
 func UpdateVoucherData(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
 	logg.TraceCtxf(ctx, "dtal", "data", data)
 	// Active voucher data entries

common/vouchers_test.go

@@ -8,9 +8,8 @@ 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"
 	"git.grassecon.net/urdt/ussd/internal/storage"
+	memdb "git.defalsify.org/vise.git/db/mem"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 )
 
@@ -84,21 +83,19 @@ func TestGetVoucherData(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-
+	spdb := storage.NewSubPrefixDb(db, []byte("vouchers"))
-	prefix := ToBytes(visedb.DATATYPE_USERDATA)
-	spdb := storage.NewSubPrefixDb(db, prefix)
 
 	// Test voucher data
-	mockData := map[DataTyp][]byte{
+	mockData := map[string][]byte{
-		DATA_VOUCHER_SYMBOLS:   []byte("1:SRF\n2:MILO"),
+		"sym":  []byte("1:SRF\n2:MILO"),
-		DATA_VOUCHER_BALANCES:  []byte("1:100\n2:200"),
+		"bal":  []byte("1:100\n2:200"),
-		DATA_VOUCHER_DECIMALS:  []byte("1:6\n2:4"),
+		"deci": []byte("1:6\n2:4"),
-		DATA_VOUCHER_ADDRESSES: []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"),
+		"addr": []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"),
 	}
 
 	// Put the data
 	for key, value := range mockData {
-		err = spdb.Put(ctx, []byte(ToBytes(key)), []byte(value))
+		err = spdb.Put(ctx, []byte(key), []byte(value))
 		if err != nil {
 			t.Fatal(err)
 		}

config/config.go

@@ -15,7 +15,6 @@ const (
 	voucherHoldingsPathPrefix  = "/api/v1/holdings"
 	voucherTransfersPathPrefix = "/api/v1/transfers/last10"
 	voucherDataPathPrefix      = "/api/v1/token"
-	AliasPrefix                = "api/v1/alias"
 )
 
 var (
@@ -33,7 +32,6 @@ var (
 	VoucherHoldingsURL  string
 	VoucherTransfersURL string
 	VoucherDataURL      string
-	CheckAliasURL       string
 )
 
 func setBase() error {
@@ -68,7 +66,6 @@ func LoadConfig() error {
 	VoucherHoldingsURL, _ = url.JoinPath(dataURLBase, voucherHoldingsPathPrefix)
 	VoucherTransfersURL, _ = url.JoinPath(dataURLBase, voucherTransfersPathPrefix)
 	VoucherDataURL, _ = url.JoinPath(dataURLBase, voucherDataPathPrefix)
-	CheckAliasURL, _ = url.JoinPath(dataURLBase, AliasPrefix)
 
 	return nil
 }

debug/cap.go

@@ -1,5 +0,0 @@
-package debug
-
-var (
-	DebugCap uint32
-)

debug/db.go

@@ -1,84 +0,0 @@
-package debug
-
-import (
-	"fmt"
-	"encoding/binary"
-
-	"git.grassecon.net/urdt/ussd/common"
-	"git.defalsify.org/vise.git/db"
-)
-
-var (
-	dbTypStr map[common.DataTyp]string = make(map[common.DataTyp]string)
-)
-
-type KeyInfo struct {
-	SessionId string
-	Typ uint8
-	SubTyp common.DataTyp
-	Label string
-	Description string
-}
-
-func (k KeyInfo) String() string {
-	v := uint16(k.SubTyp)
-	s := subTypToString(k.SubTyp)
-	if s == "" {
-		v = uint16(k.Typ)
-		s = typToString(k.Typ)
-	}
-	return fmt.Sprintf("Session Id: %s\nTyp: %s (%d)\n", k.SessionId, s, v)
-}
-
-func ToKeyInfo(k []byte, sessionId string) (KeyInfo, error) {
-	o := KeyInfo{}
-	b := []byte(sessionId)
-
-	if len(k) <= len(b) {
-		return o, fmt.Errorf("storage key missing")
-	}
-
-	o.SessionId = sessionId
-
-	o.Typ = uint8(k[0])
-	k = k[1:]
-	o.SessionId = string(k[:len(b)])
-	k = k[len(b):]
-
-	if o.Typ == db.DATATYPE_USERDATA {
-		if len(k) == 0 {
-			return o, fmt.Errorf("missing subtype key")
-		}
-		v := binary.BigEndian.Uint16(k[:2])
-		o.SubTyp = common.DataTyp(v)
-		o.Label = subTypToString(o.SubTyp)
-		k = k[2:]
-	} else {
-		o.Label = typToString(o.Typ)
-	}
-
-	if len(k) != 0 {
-		return o, fmt.Errorf("excess key information")
-	}
-
-	return o, nil
-}
-
-func FromKey(k []byte) (KeyInfo, error) {
-	o := KeyInfo{}
-
-	if len(k) < 4 {
-		return o, fmt.Errorf("insufficient key length")
-	}
-
-	sessionIdBytes := k[1:len(k)-2]
-	return ToKeyInfo(k, string(sessionIdBytes))
-}
-
-func subTypToString(v common.DataTyp) string {
-	return dbTypStr[v + db.DATATYPE_USERDATA + 1]
-}
-
-func typToString(v uint8) string {
-	return dbTypStr[common.DataTyp(uint16(v))]
-}

debug/db_debug.go

@@ -1,48 +0,0 @@
-// +build debugdb
-
-package debug
-
-import (
-	"git.defalsify.org/vise.git/db"
-
-	"git.grassecon.net/urdt/ussd/common"
-)
-
-func init() {
-	DebugCap |= 1
-	dbTypStr[db.DATATYPE_STATE] = "internal state"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACCOUNT] = "account"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACCOUNT_CREATED] = "account created"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TRACKING_ID] = "tracking id"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_PUBLIC_KEY] = "public key"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_CUSTODIAL_ID] = "custodial id"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACCOUNT_PIN] = "account pin"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACCOUNT_STATUS] = "account status"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_FIRST_NAME] = "first name"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_FAMILY_NAME] = "family name"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_YOB] = "year of birth"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_LOCATION] = "location"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_GENDER] = "gender"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_OFFERINGS] = "offerings"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_RECIPIENT] = "recipient"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_AMOUNT] = "amount"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TEMPORARY_VALUE] = "temporary value"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACTIVE_SYM] = "active sym"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACTIVE_BAL] = "active bal"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_BLOCKED_NUMBER] = "blocked number"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_PUBLIC_KEY_REVERSE] = "public_key_reverse"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACTIVE_DECIMAL] = "active decimal"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_ACTIVE_ADDRESS] = "active address"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_VOUCHER_SYMBOLS] = "voucher symbols"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_VOUCHER_BALANCES] = "voucher balances"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_VOUCHER_DECIMALS] = "voucher decimals"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_VOUCHER_ADDRESSES] = "voucher addresses"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_SENDERS] = "tx senders"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_RECIPIENTS] = "tx recipients"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_VALUES] = "tx values"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_ADDRESSES] = "tx addresses"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_HASHES] = "tx hashes"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_DATES] = "tx dates"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_SYMBOLS] = "tx symbols"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + common.DATA_TX_DECIMALS] = "tx decimals"
-}

debug/db_test.go

@@ -1,78 +0,0 @@
-package debug
-
-import (
-	"testing"
-
-	"git.grassecon.net/urdt/ussd/common"
-	"git.defalsify.org/vise.git/db"
-)
-
-func TestDebugDbSubKeyInfo(t *testing.T) {
-	s := "foo"
-	b := []byte{0x20}
-	b = append(b, []byte(s)...)
-	b = append(b, []byte{0x00, 0x02}...)
-	r, err := ToKeyInfo(b, s)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if r.SessionId != s {
-		t.Fatalf("expected %s, got %s", s, r.SessionId)
-	}
-	if r.Typ != 32 {
-		t.Fatalf("expected 64, got %d", r.Typ)
-	}
-	if r.SubTyp != 2 {
-		t.Fatalf("expected 2, got %d", r.SubTyp)
-	}
-	if DebugCap & 1 > 0 {
-		if r.Label != "tracking id" {
-			t.Fatalf("expected 'tracking id', got '%s'", r.Label)
-		}
-	}
-}
-
-func TestDebugDbKeyInfo(t *testing.T) {
-	s := "bar"
-	b := []byte{0x10}
-	b = append(b, []byte(s)...)
-	r, err := ToKeyInfo(b, s)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if r.SessionId != s {
-		t.Fatalf("expected %s, got %s", s, r.SessionId)
-	}
-	if r.Typ != 16 {
-		t.Fatalf("expected 16, got %d", r.Typ)
-	}
-	if DebugCap & 1 > 0 {
-		if r.Label != "internal state" {
-			t.Fatalf("expected 'internal_state', got '%s'", r.Label)
-		}
-	}
-}
-
-func TestDebugDbKeyInfoRestore(t *testing.T) {
-	s := "bar"
-	b := []byte{db.DATATYPE_USERDATA}
-	b = append(b, []byte(s)...)
-	k := common.ToBytes(common.DATA_ACTIVE_SYM)
-	b = append(b, k...)
-
-	r, err := ToKeyInfo(b, s)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if r.SessionId != s {
-		t.Fatalf("expected %s, got %s", s, r.SessionId)
-	}
-	if r.Typ != 32 {
-		t.Fatalf("expected 32, got %d", r.Typ)
-	}
-	if DebugCap & 1 > 0 {
-		if r.Label != "active sym" {
-			t.Fatalf("expected 'active sym', got '%s'", r.Label)
-		}
-	}
-}

devtools/gen/main.go

@@ -1,79 +0,0 @@
-package main
-
-import (
-	"context"
-	"crypto/sha1"
-	"flag"
-	"fmt"
-	"os"
-	"path"
-
-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/internal/storage"
-	"git.grassecon.net/urdt/ussd/initializers"
-	"git.grassecon.net/urdt/ussd/common"
-)
-
-var (
-	logg      = logging.NewVanilla()
-	scriptDir = path.Join("services", "registration")
-)
-
-func init() {
-	initializers.LoadEnvVariables()
-}
-
-
-func main() {
-	config.LoadConfig()
-
-	var dbDir string
-	var sessionId string
-	var database string
-	var engineDebug bool
-
-	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&database, "db", "gdbm", "database to be used")
-	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
-	flag.Parse()
-
-	ctx := context.Background()
-	ctx = context.WithValue(ctx, "SessionId", sessionId)
-	ctx = context.WithValue(ctx, "Database", database)
-
-	resourceDir := scriptDir
-	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
-
-	store, err := menuStorageService.GetUserdataDb(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-	userStore := common.UserDataStore{store}
-
-	h := sha1.New()
-	h.Write([]byte(sessionId))
-	address := h.Sum(nil)
-	addressString := fmt.Sprintf("%x", address)
-
-	err = userStore.WriteEntry(ctx, sessionId, common.DATA_PUBLIC_KEY, []byte(addressString))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	err = userStore.WriteEntry(ctx, addressString, common.DATA_PUBLIC_KEY_REVERSE, []byte(sessionId))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	err = store.Close()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-	
-}

devtools/store/main.go

@@ -1,78 +0,0 @@
-package main
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"os"
-	"path"
-
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/initializers"
-	"git.grassecon.net/urdt/ussd/internal/storage"
-	"git.grassecon.net/urdt/ussd/debug"
-	"git.defalsify.org/vise.git/logging"
-)
-
-var (
-	logg      = logging.NewVanilla()
-	scriptDir = path.Join("services", "registration")
-)
-
-func init() {
-	initializers.LoadEnvVariables()
-}
-
-
-func main() {
-	config.LoadConfig()
-
-	var dbDir string
-	var sessionId string
-	var database string
-	var engineDebug bool
-
-	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&database, "db", "gdbm", "database to be used")
-	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
-	flag.Parse()
-
-	ctx := context.Background()
-	ctx = context.WithValue(ctx, "SessionId", sessionId)
-	ctx = context.WithValue(ctx, "Database", database)
-
-	resourceDir := scriptDir
-	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
-
-	store, err := menuStorageService.GetUserdataDb(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	d, err := store.Dump(ctx, []byte(sessionId))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	for true {
-		k, v := d.Next(ctx)
-		if k == nil {
-			break
-		}
-		o, err := debug.FromKey(k)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, err.Error())
-			os.Exit(1)
-		}
-		fmt.Printf("%vValue: %v\n\n", o, v)
-	}
-
-	err = store.Close()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-}

doc/data.md

@@ -1,28 +0,0 @@
-# Internals
-
-## Version
-
-This document describes component versions:
-
-* `urdt-ussd` `v0.5.0-beta`
-* `go-vise` `v0.2.2`
-
-
-## User profile data
-
-All user profile items are stored under keys matching the user's session id, prefixed with the 8-bit value `git.defalsify.org/vise.git/db.DATATYPE_USERDATA` (32), and followed with a 16-big big-endian value subprefix.
-
-For example, given the sessionId `+254123` and the key `git.grassecon.net/urdt-ussd/common.DATA_PUBLIC_KEY` (2) will be stored under the key:
-
-```
-0x322b3235343132330002
-
-prefix   sessionid       subprefix
-32       2b323534313233  0002
-```
-
-### Sub-prefixes
-
-All sub-prefixes are defined as constants in the `git.grassecon.net/urdt-ussd/common` package. The constant names have the prefix `DATA_`
-
-Please refer to inline godoc documentation for the `git.grassecon.net/urdt-ussd/common` package for details on each data item.

go.mod

@@ -3,7 +3,7 @@ module git.grassecon.net/urdt/ussd
 go 1.23.0
 
 require (
-	git.defalsify.org/vise.git v0.2.1-0.20241212145627-683015d4df80
+	git.defalsify.org/vise.git v0.2.1-0.20241122120231-9e9ee5bdfa7a
 	github.com/alecthomas/assert/v2 v2.2.2
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/grassrootseconomics/eth-custodial v1.3.0-beta

go.sum

@@ -1,5 +1,5 @@
-git.defalsify.org/vise.git v0.2.1-0.20241212145627-683015d4df80 h1:GYUVXRUtMpA40T4COeAduoay6CIgXjD5cfDYZOTFIKw=
+git.defalsify.org/vise.git v0.2.1-0.20241122120231-9e9ee5bdfa7a h1:LvGKktk0kUnuRN3nF9r15D8OoV0sFaMmQr52kGq2gtE=
-git.defalsify.org/vise.git v0.2.1-0.20241212145627-683015d4df80/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.2.1-0.20241122120231-9e9ee5bdfa7a/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
 github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
 github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
 github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=

internal/handlers/base.go

@@ -55,9 +55,6 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
 	}
 
 	f.hn = f.hn.WithPersister(rqs.Storage.Persister)
-	defer func() {
-		f.hn.Exit()
-	}()
 	eni := f.GetEngine(rqs.Config, f.rs, rqs.Storage.Persister)
 	en, ok := eni.(*engine.DefaultEngine)
 	if !ok {

internal/handlers/handlerservice.go

@@ -2,7 +2,6 @@ package handlers
 
 import (
 	"context"
-	"strings"
 
 	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/db"
@@ -65,11 +64,7 @@ func (ls *LocalHandlerService) SetDataStore(db *db.Db) {
 }
 
 func (ls *LocalHandlerService) GetHandler(accountService remote.AccountServiceInterface) (*ussd.Handlers, error) {
-	replaceSeparatorFunc := func(input string) string {
+	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore, ls.AdminStore, accountService)
-		return strings.ReplaceAll(input, ":", ls.Cfg.MenuSeparator)
-	}
-
-	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore, ls.AdminStore, accountService, replaceSeparatorFunc)
 	if err != nil {
 		return nil, err
 	}
@@ -116,7 +111,7 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountServiceIn
 	ls.DbRs.AddLocalFunc("set_voucher", ussdHandlers.SetVoucher)
 	ls.DbRs.AddLocalFunc("get_voucher_details", ussdHandlers.GetVoucherDetails)
 	ls.DbRs.AddLocalFunc("reset_valid_pin", ussdHandlers.ResetValidPin)
-	ls.DbRs.AddLocalFunc("check_pin_mismatch", ussdHandlers.CheckBlockedNumPinMisMatch)
+	ls.DbRs.AddLocalFunc("check_pin_mismatch", ussdHandlers.CheckPinMisMatch)
 	ls.DbRs.AddLocalFunc("validate_blocked_number", ussdHandlers.ValidateBlockedNumber)
 	ls.DbRs.AddLocalFunc("retrieve_blocked_number", ussdHandlers.RetrieveBlockedNumber)
 	ls.DbRs.AddLocalFunc("reset_unregistered_number", ussdHandlers.ResetUnregisteredNumber)
@@ -126,8 +121,6 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountServiceIn
 	ls.DbRs.AddLocalFunc("check_transactions", ussdHandlers.CheckTransactions)
 	ls.DbRs.AddLocalFunc("get_transactions", ussdHandlers.GetTransactionsList)
 	ls.DbRs.AddLocalFunc("view_statement", ussdHandlers.ViewTransactionStatement)
-	ls.DbRs.AddLocalFunc("update_all_profile_items", ussdHandlers.UpdateAllProfileItems)
-	ls.DbRs.AddLocalFunc("set_back", ussdHandlers.SetBack)
 
 	return ussdHandlers, nil
 }

internal/handlers/ussd/menuhandler_test.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"log"
 	"path"
-	"strings"
 	"testing"
 
 	"git.defalsify.org/vise.git/lang"
@@ -23,7 +22,6 @@ import (
 	testdataloader "github.com/peteole/testdata-loader"
 	"github.com/stretchr/testify/require"
 
-	visedb "git.defalsify.org/vise.git/db"
 	memdb "git.defalsify.org/vise.git/db/mem"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 )
@@ -33,11 +31,6 @@ var (
 	flagsPath = path.Join(baseDir, "services", "registration", "pp.csv")
 )
 
-// mockReplaceSeparator function
-var mockReplaceSeparator = func(input string) string {
-	return strings.ReplaceAll(input, ":", ": ")
-}
-
 // InitializeTestStore sets up and returns an in-memory database and store.
 func InitializeTestStore(t *testing.T) (context.Context, *common.UserDataStore) {
 	ctx := context.Background()
@@ -63,8 +56,7 @@ func InitializeTestSubPrefixDb(t *testing.T, ctx context.Context) *storage.SubPr
 	if err != nil {
 		t.Fatal(err)
 	}
-	prefix := common.ToBytes(visedb.DATATYPE_USERDATA)
+	spdb := storage.NewSubPrefixDb(db, []byte("vouchers"))
-	spdb := storage.NewSubPrefixDb(db, prefix)
 
 	return spdb
 }
@@ -73,15 +65,12 @@ func TestNewHandlers(t *testing.T) {
 	_, store := InitializeTestStore(t)
 
 	fm, err := NewFlagManager(flagsPath)
-	if err != nil {
-		log.Fatal(err)
-	}
-
 	accountService := testservice.TestAccountService{}
-
+	if err != nil {
-	// Test case for valid UserDataStore
+		t.Logf(err.Error())
+	}
 	t.Run("Valid UserDataStore", func(t *testing.T) {
-		handlers, err := NewHandlers(fm.parser, store, nil, &accountService, mockReplaceSeparator)
+		handlers, err := NewHandlers(fm.parser, store, nil, &accountService)
 		if err != nil {
 			t.Fatalf("expected no error, got %v", err)
 		}
@@ -91,30 +80,19 @@ func TestNewHandlers(t *testing.T) {
 		if handlers.userdataStore == nil {
 			t.Fatal("expected userdataStore to be set in handlers")
 		}
-		if handlers.ReplaceSeparatorFunc == nil {
-			t.Fatal("expected ReplaceSeparatorFunc to be set in handlers")
-		}
-
-		// Test ReplaceSeparatorFunc functionality
-		input := "1:Menu item"
-		expectedOutput := "1: Menu item"
-		if handlers.ReplaceSeparatorFunc(input) != expectedOutput {
-			t.Fatalf("ReplaceSeparatorFunc function did not return expected output: got %v, want %v", handlers.ReplaceSeparatorFunc(input), expectedOutput)
-		}
 	})
 
-	// Test case for nil UserDataStore
+	// Test case for nil userdataStore
 	t.Run("Nil UserDataStore", func(t *testing.T) {
-		handlers, err := NewHandlers(fm.parser, nil, nil, &accountService, mockReplaceSeparator)
+		handlers, err := NewHandlers(fm.parser, nil, nil, &accountService)
 		if err == nil {
 			t.Fatal("expected an error, got none")
 		}
 		if handlers != nil {
 			t.Fatal("expected handlers to be nil")
 		}
-		expectedError := "cannot create handler with nil userdata store"
+		if err.Error() != "cannot create handler with nil userdata store" {
-		if err.Error() != expectedError {
+			t.Fatalf("expected specific error, got %v", err)
-			t.Fatalf("expected error '%s', got '%v'", expectedError, err)
 		}
 	})
 }
@@ -201,14 +179,11 @@ func TestSaveFirstname(t *testing.T) {
 	fm, _ := NewFlagManager(flagsPath)
 
 	flag_allow_update, _ := fm.GetFlag("flag_allow_update")
-	flag_firstname_set, _ := fm.GetFlag("flag_firstname_set")
 
 	// Set the flag in the State
-	mockState := state.NewState(128)
+	mockState := state.NewState(16)
 	mockState.SetFlag(flag_allow_update)
 
-	expectedResult := resource.Result{}
-
 	// Define test data
 	firstName := "John"
 
@@ -216,8 +191,6 @@ func TestSaveFirstname(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	expectedResult.FlagSet = []uint32{flag_firstname_set}
-
 	// Create the Handlers instance with the mock store
 	h := &Handlers{
 		userdataStore: store,
@@ -230,7 +203,7 @@ func TestSaveFirstname(t *testing.T) {
 
 	// Assert results
 	assert.NoError(t, err)
-	assert.Equal(t, expectedResult, res)
+	assert.Equal(t, resource.Result{}, res)
 
 	// Verify that the DATA_FIRST_NAME entry has been updated with the temporary value
 	storedFirstName, _ := store.ReadEntry(ctx, sessionId, common.DATA_FIRST_NAME)
@@ -245,16 +218,11 @@ func TestSaveFamilyname(t *testing.T) {
 	fm, _ := NewFlagManager(flagsPath)
 
 	flag_allow_update, _ := fm.GetFlag("flag_allow_update")
-	flag_firstname_set, _ := fm.GetFlag("flag_familyname_set")
 
 	// Set the flag in the State
-	mockState := state.NewState(128)
+	mockState := state.NewState(16)
 	mockState.SetFlag(flag_allow_update)
 
-	expectedResult := resource.Result{}
-
-	expectedResult.FlagSet = []uint32{flag_firstname_set}
-
 	// Define test data
 	familyName := "Doeee"
 
@@ -274,7 +242,7 @@ func TestSaveFamilyname(t *testing.T) {
 
 	// Assert results
 	assert.NoError(t, err)
-	assert.Equal(t, expectedResult, res)
+	assert.Equal(t, resource.Result{}, res)
 
 	// Verify that the DATA_FAMILY_NAME entry has been updated with the temporary value
 	storedFamilyName, _ := store.ReadEntry(ctx, sessionId, common.DATA_FAMILY_NAME)
@@ -289,14 +257,11 @@ func TestSaveYoB(t *testing.T) {
 	fm, _ := NewFlagManager(flagsPath)
 
 	flag_allow_update, _ := fm.GetFlag("flag_allow_update")
-	flag_yob_set, _ := fm.GetFlag("flag_yob_set")
 
 	// Set the flag in the State
-	mockState := state.NewState(108)
+	mockState := state.NewState(16)
 	mockState.SetFlag(flag_allow_update)
 
-	expectedResult := resource.Result{}
-
 	// Define test data
 	yob := "1980"
 
@@ -304,8 +269,6 @@ func TestSaveYoB(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	expectedResult.FlagSet = []uint32{flag_yob_set}
-
 	// Create the Handlers instance with the mock store
 	h := &Handlers{
 		userdataStore: store,
@@ -318,7 +281,7 @@ func TestSaveYoB(t *testing.T) {
 
 	// Assert results
 	assert.NoError(t, err)
-	assert.Equal(t, expectedResult, res)
+	assert.Equal(t, resource.Result{}, res)
 
 	// Verify that the DATA_YOB entry has been updated with the temporary value
 	storedYob, _ := store.ReadEntry(ctx, sessionId, common.DATA_YOB)
@@ -333,14 +296,11 @@ func TestSaveLocation(t *testing.T) {
 	fm, _ := NewFlagManager(flagsPath)
 
 	flag_allow_update, _ := fm.GetFlag("flag_allow_update")
-	flag_location_set, _ := fm.GetFlag("flag_location_set")
 
 	// Set the flag in the State
-	mockState := state.NewState(108)
+	mockState := state.NewState(16)
 	mockState.SetFlag(flag_allow_update)
 
-	expectedResult := resource.Result{}
-
 	// Define test data
 	location := "Kilifi"
 
@@ -348,8 +308,6 @@ func TestSaveLocation(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	expectedResult.FlagSet = []uint32{flag_location_set}
-
 	// Create the Handlers instance with the mock store
 	h := &Handlers{
 		userdataStore: store,
@@ -362,7 +320,7 @@ func TestSaveLocation(t *testing.T) {
 
 	// Assert results
 	assert.NoError(t, err)
-	assert.Equal(t, expectedResult, res)
+	assert.Equal(t, resource.Result{}, res)
 
 	// Verify that the DATA_LOCATION entry has been updated with the temporary value
 	storedLocation, _ := store.ReadEntry(ctx, sessionId, common.DATA_LOCATION)
@@ -377,14 +335,11 @@ func TestSaveOfferings(t *testing.T) {
 	fm, _ := NewFlagManager(flagsPath)
 
 	flag_allow_update, _ := fm.GetFlag("flag_allow_update")
-	flag_offerings_set, _ := fm.GetFlag("flag_offerings_set")
 
 	// Set the flag in the State
-	mockState := state.NewState(108)
+	mockState := state.NewState(16)
 	mockState.SetFlag(flag_allow_update)
 
-	expectedResult := resource.Result{}
-
 	// Define test data
 	offerings := "Bananas"
 
@@ -392,8 +347,6 @@ func TestSaveOfferings(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	expectedResult.FlagSet = []uint32{flag_offerings_set}
-
 	// Create the Handlers instance with the mock store
 	h := &Handlers{
 		userdataStore: store,
@@ -406,7 +359,7 @@ func TestSaveOfferings(t *testing.T) {
 
 	// Assert results
 	assert.NoError(t, err)
-	assert.Equal(t, expectedResult, res)
+	assert.Equal(t, resource.Result{}, res)
 
 	// Verify that the DATA_OFFERINGS entry has been updated with the temporary value
 	storedOfferings, _ := store.ReadEntry(ctx, sessionId, common.DATA_OFFERINGS)
@@ -421,10 +374,9 @@ func TestSaveGender(t *testing.T) {
 	fm, _ := NewFlagManager(flagsPath)
 
 	flag_allow_update, _ := fm.GetFlag("flag_allow_update")
-	flag_gender_set, _ := fm.GetFlag("flag_gender_set")
 
 	// Set the flag in the State
-	mockState := state.NewState(108)
+	mockState := state.NewState(16)
 	mockState.SetFlag(flag_allow_update)
 
 	// Define test cases
@@ -468,16 +420,12 @@ func TestSaveGender(t *testing.T) {
 				flagManager:   fm.parser,
 			}
 
-			expectedResult := resource.Result{}
-
 			// Call the method
 			res, err := h.SaveGender(ctx, "save_gender", tt.input)
 
-			expectedResult.FlagSet = []uint32{flag_gender_set}
-
 			// Assert results
 			assert.NoError(t, err)
-			assert.Equal(t, expectedResult, res)
+			assert.Equal(t, resource.Result{}, res)
 
 			// Verify that the DATA_GENDER entry has been updated with the temporary value
 			storedGender, _ := store.ReadEntry(ctx, sessionId, common.DATA_GENDER)
@@ -1550,10 +1498,10 @@ func TestValidateRecipient(t *testing.T) {
 	}{
 		{
 			name:  "Test with invalid recepient",
-			input: []byte("7?1234"),
+			input: []byte("9234adf5"),
 			expectedResult: resource.Result{
 				FlagSet: []uint32{flag_invalid_recipient},
-				Content: "7?1234",
+				Content: "9234adf5",
 			},
 		},
 		{
@@ -1569,40 +1517,22 @@ func TestValidateRecipient(t *testing.T) {
 			input:          []byte("0711223344"),
 			expectedResult: resource.Result{},
 		},
-		{
-			name:           "Test with address",
-			input:          []byte("0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9"),
-			expectedResult: resource.Result{},
-		},
-		{
-			name:           "Test with alias recepient",
-			input:          []byte("alias123"),
-			expectedResult: resource.Result{},
-		},
 	}
 
 	// store a public key for the valid recipient
-	err = store.WriteEntry(ctx, "+254711223344", common.DATA_PUBLIC_KEY, []byte(publicKey))
+	err = store.WriteEntry(ctx, "0711223344", common.DATA_PUBLIC_KEY, []byte(publicKey))
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			mockAccountService := new(mocks.MockAccountService)
 			// Create the Handlers instance
 			h := &Handlers{
-				flagManager:    fm.parser,
+				flagManager:   fm.parser,
-				userdataStore:  store,
+				userdataStore: store,
-				accountService: mockAccountService,
 			}
 
-			aliasResponse := &dataserviceapi.AliasAddress{
-				Address: "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
-			}
-
-			mockAccountService.On("CheckAliasAddress", string(tt.input)).Return(aliasResponse, nil)
-
 			// Call the method
 			res, err := h.ValidateRecipient(ctx, "validate_recepient", tt.input)
 
@@ -1634,7 +1564,7 @@ func TestCheckBalance(t *testing.T) {
 			publicKey:      "0X98765432109",
 			activeSym:      "ETH",
 			activeBal:      "1.5",
-			expectedResult: resource.Result{Content: "Balance: 1.50 ETH\n"},
+			expectedResult: resource.Result{Content: "Balance: 1.5 ETH\n"},
 			expectError:    false,
 		},
 	}
@@ -1989,7 +1919,7 @@ func TestCheckVouchers(t *testing.T) {
 	assert.NoError(t, err)
 
 	// Read voucher sym data from the store
-	voucherData, err := spdb.Get(ctx, common.ToBytes(common.DATA_VOUCHER_SYMBOLS))
+	voucherData, err := spdb.Get(ctx, []byte("sym"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -2002,31 +1932,26 @@ func TestCheckVouchers(t *testing.T) {
 
 func TestGetVoucherList(t *testing.T) {
 	sessionId := "session123"
-
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
 	spdb := InitializeTestSubPrefixDb(t, ctx)
 
-	// Initialize Handlers
 	h := &Handlers{
-		prefixDb:             spdb,
+		prefixDb: spdb,
-		ReplaceSeparatorFunc: mockReplaceSeparator,
 	}
 
-	mockSyms := []byte("1:SRF\n2:MILO")
+	expectedSym := []byte("1:SRF\n2:MILO")
 
 	// Put voucher sym data from the store
-	err := spdb.Put(ctx, common.ToBytes(common.DATA_VOUCHER_SYMBOLS), mockSyms)
+	err := spdb.Put(ctx, []byte("sym"), expectedSym)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	expectedSyms := []byte("1: SRF\n2: MILO")
-
 	res, err := h.GetVoucherList(ctx, "", []byte(""))
 
 	assert.NoError(t, err)
-	assert.Equal(t, res.Content, string(expectedSyms))
+	assert.Equal(t, res.Content, string(expectedSym))
 }
 
 func TestViewVoucher(t *testing.T) {
@@ -2048,16 +1973,16 @@ func TestViewVoucher(t *testing.T) {
 	}
 
 	// Define mock voucher data
-	mockData := map[common.DataTyp][]byte{
+	mockData := map[string][]byte{
-		common.DATA_VOUCHER_SYMBOLS:   []byte("1:SRF\n2:MILO"),
+		"sym":  []byte("1:SRF\n2:MILO"),
-		common.DATA_VOUCHER_BALANCES:  []byte("1:100\n2:200"),
+		"bal":  []byte("1:100\n2:200"),
-		common.DATA_VOUCHER_DECIMALS:  []byte("1:6\n2:4"),
+		"deci": []byte("1:6\n2:4"),
-		common.DATA_VOUCHER_ADDRESSES: []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"),
+		"addr": []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"),
 	}
 
 	// Put the data
 	for key, value := range mockData {
-		err = spdb.Put(ctx, []byte(common.ToBytes(key)), []byte(value))
+		err = spdb.Put(ctx, []byte(key), []byte(value))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -2065,7 +1990,7 @@ func TestViewVoucher(t *testing.T) {
 
 	res, err := h.ViewVoucher(ctx, "view_voucher", []byte("1"))
 	assert.NoError(t, err)
-	assert.Equal(t, res.Content, "Symbol: SRF\nBalance: 100")
+	assert.Equal(t, res.Content, "SRF\n100")
 }
 
 func TestSetVoucher(t *testing.T) {
@@ -2099,42 +2024,3 @@ func TestSetVoucher(t *testing.T) {
 
 	assert.Equal(t, string(tempData.TokenSymbol), res.Content)
 }
-
-func TestGetVoucherDetails(t *testing.T) {
-	ctx, store := InitializeTestStore(t)
-	fm, err := NewFlagManager(flagsPath)
-	if err != nil {
-		t.Logf(err.Error())
-	}
-	mockAccountService := new(mocks.MockAccountService)
-
-	sessionId := "session123"
-	ctx = context.WithValue(ctx, "SessionId", sessionId)
-	expectedResult := resource.Result{}
-
-	tokA_AAddress := "0x0000000000000000000000000000000000000000"
-
-	h := &Handlers{
-		userdataStore:  store,
-		flagManager:    fm.parser,
-		accountService: mockAccountService,
-	}
-	err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_ADDRESS, []byte(tokA_AAddress))
-	if err != nil {
-		t.Fatal(err)
-	}
-	tokenDetails := &models.VoucherDataResult{
-		TokenName:      "Token A",
-		TokenSymbol:    "TOKA",
-		TokenLocation:  "Kilifi,Kenya",
-		TokenCommodity: "Farming",
-	}
-	expectedResult.Content = fmt.Sprintf(
-		"Name: %s\nSymbol: %s\nCommodity: %s\nLocation: %s", tokenDetails.TokenName, tokenDetails.TokenSymbol, tokenDetails.TokenCommodity, tokenDetails.TokenLocation,
-	)
-	mockAccountService.On("VoucherData", string(tokA_AAddress)).Return(tokenDetails, nil)
-
-	res, err := h.GetVoucherDetails(ctx, "SessionId", []byte(""))
-	assert.NoError(t, err)
-	assert.Equal(t, expectedResult, res)
-}

internal/storage/db.go

@@ -6,6 +6,10 @@ import (
 	"git.defalsify.org/vise.git/db"
 )
 
+const (
+	DATATYPE_USERSUB = 64
+)
+
 // PrefixDb interface abstracts the database operations.
 type PrefixDb interface {
 	Get(ctx context.Context, key []byte) ([]byte, error)
@@ -31,13 +35,13 @@ func (s *SubPrefixDb) toKey(k []byte) []byte {
 }
 
 func (s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
-	s.store.SetPrefix(db.DATATYPE_USERDATA)
+	s.store.SetPrefix(DATATYPE_USERSUB)
 	key = s.toKey(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)
+	s.store.SetPrefix(DATATYPE_USERSUB)
 	key = s.toKey(key)
 	return s.store.Put(ctx, key, val)
 }

internal/storage/gdbm.go

@@ -115,8 +115,7 @@ func(tdb *ThreadGdbmDb) Close() error {
 	return err
 }
 
-func(tdb *ThreadGdbmDb) Dump(ctx context.Context, key []byte) (*db.Dumper, error) {
+func(tdb *ThreadGdbmDb) Dump(_ context.Context, _ []byte) (*db.Dumper, error) {
-	tdb.reserve()
+	logg.Warnf("method not implemented for thread gdbm db")
-	defer tdb.release()
+	return nil, nil
-	return tdb.db.Dump(ctx, key)
 }

internal/testutil/mocks/servicemock.go

@@ -47,8 +47,3 @@ func (m *MockAccountService) TokenTransfer(ctx context.Context, amount, from, to
 	args := m.Called()
 	return args.Get(0).(*models.TokenTransferResponse), args.Error(1)
 }
-
-func (m *MockAccountService) CheckAliasAddress(ctx context.Context, alias string) (*dataserviceapi.AliasAddress, error) {
-	args := m.Called(alias)
-	return args.Get(0).(*dataserviceapi.AliasAddress), args.Error(1)
-}

internal/testutil/testservice/TestAccountService.go

@@ -33,8 +33,8 @@ func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey
 }
 
 func (tas *TestAccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
-	return []dataserviceapi.TokenHoldings{
+	return []dataserviceapi.TokenHoldings {
-		dataserviceapi.TokenHoldings{
+		dataserviceapi.TokenHoldings {
 			ContractAddress: "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
 			TokenSymbol:     "SRF",
 			TokenDecimals:   "6",
@@ -56,7 +56,3 @@ func (tas *TestAccountService) TokenTransfer(ctx context.Context, amount, from,
 		TrackingId: "e034d147-747d-42ea-928d-b5a7cb3426af",
 	}, nil
 }
-
-func (m TestAccountService) CheckAliasAddress(ctx context.Context, alias string) (*dataserviceapi.AliasAddress, error) {
-	return &dataserviceapi.AliasAddress{}, nil
-}

internal/utils/age.go

@@ -1,9 +1,6 @@
 package utils
 
-import (
+import "time"
-	"strconv"
-	"time"
-)
 
 // CalculateAge calculates the age based on a given birthdate and the current date in the format dd/mm/yy
 // It adjusts for cases where the current date is before the birthday in the current year.
@@ -28,29 +25,11 @@ func CalculateAge(birthdate, today time.Time) int {
 // It subtracts the YOB from the current year to determine the age.
 //
 // Parameters:
-//
+//   yob: The year of birth as an integer.
-//	yob: The year of birth as an integer.
 //
 // Returns:
-//
+//   The calculated age as an integer.
-//	The calculated age as an integer.
 func CalculateAgeWithYOB(yob int) int {
-	currentYear := time.Now().Year()
+    currentYear := time.Now().Year()
-	return currentYear - yob
+    return currentYear - yob
-}
+}
-
-
-//IsValidYob checks if the provided yob can be considered valid 
-func IsValidYOb(yob string) bool {
-	currentYear := time.Now().Year()
-	yearOfBirth, err := strconv.ParseInt(yob, 10, 64)
-	if err != nil {
-		return false
-	}
-	if yearOfBirth >= 1900 && int(yearOfBirth) <= currentYear {
-		return true
-	} else {
-		return false
-	}
-
-}

internal/utils/name.go

@@ -1,17 +0,0 @@
-package utils
-
-func ConstructName(firstName, familyName, defaultValue string) string {
-	name := defaultValue
-	if familyName != defaultValue {
-		if firstName != defaultValue {
-			name = firstName + " " + familyName
-		} else {
-			name = familyName
-		}
-	} else {
-		if firstName != defaultValue {
-			name = firstName
-		}
-	}
-	return name
-}

menutraversal_test/group_test.json

@@ -54,7 +54,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect PIN\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -62,7 +62,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Select language:\n0:English\n1:Kiswahili"
+                    "expectedContent": "Select language:\n0:english\n1:kiswahili"
                 },
                 {
                     "input": "0",
@@ -95,7 +95,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect PIN\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -141,7 +141,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect PIN\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -167,7 +167,7 @@
             ]
         },
         {
-            "name": "menu_my_account_edit_all_account_details_starting_from_firstname",
+            "name": "menu_my_account_edit_firstname",
             "steps": [
                 {
                     "input": "",
@@ -187,26 +187,6 @@
                 },
                 {
                     "input": "foo",
-                    "expectedContent": "Enter family name:\n0:Back"
-                },
-                {
-                    "input": "bar",
-                    "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent":  "Enter your year of birth\n0:Back"
-                },
-                {
-                    "input": "1940",
-                    "expectedContent": "Enter your location:\n0:Back"
-                },
-                {
-                    "input": "Kilifi",
-                    "expectedContent": "Enter the services or goods you offer: \n0:Back"
-                },
-                {
-                    "input": "Bananas",
                     "expectedContent": "Please enter your PIN:"
                 },
                 {
@@ -217,6 +197,10 @@
                     "input": "0",
                     "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
                 },
+                {
+                    "input": "0",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                },
                 {
                     "input": "0",
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
@@ -224,7 +208,7 @@
             ]
         },
         {
-            "name": "menu_my_account_edit_familyname_when_all_account__details_have_been_set",
+            "name": "menu_my_account_edit_familyname",
             "steps": [
                 {
                     "input": "",
@@ -254,6 +238,10 @@
                     "input": "0",
                     "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
                 },
+                {
+                    "input": "0",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                },
                 {
                     "input": "0",
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
@@ -262,7 +250,7 @@
             ]
         },
         {
-            "name": "menu_my_account_edit_gender_when_all_account__details_have_been_set",
+            "name": "menu_my_account_edit_gender",
             "steps": [
                 {
                     "input": "",
@@ -292,6 +280,10 @@
                     "input": "0",
                     "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
                 },
+                {
+                    "input": "0",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                },
                 {
                     "input": "0",
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
@@ -299,7 +291,7 @@
             ]
         },
         {
-            "name": "menu_my_account_edit_yob_when_all_account__details_have_been_set",
+            "name": "menu_my_account_edit_yob",
             "steps": [
                 {
                     "input": "",
@@ -329,6 +321,10 @@
                     "input": "0",
                     "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
                 },
+                {
+                    "input": "0",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                },
                 {
                     "input": "0",
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
@@ -336,7 +332,7 @@
             ]
         },
         {
-            "name": "menu_my_account_edit_location_when_all_account_details_have_been_set",
+            "name": "menu_my_account_edit_location",
             "steps": [
                 {
                     "input": "",
@@ -366,6 +362,10 @@
                     "input": "0",
                     "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
                 },
+                {
+                    "input": "0",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                },
                 {
                     "input": "0",
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
@@ -373,7 +373,7 @@
             ]
         },
         {
-            "name": "menu_my_account_edit_offerings_when_all_account__details_have_been_set",
+            "name": "menu_my_account_edit_offerings",
             "steps": [
                 {
                     "input": "",
@@ -403,6 +403,10 @@
                     "input": "0",
                     "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
                 },
+                {
+                    "input": "0",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                },
                 {
                     "input": "0",
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
@@ -436,6 +440,10 @@
                     "input": "0",
                     "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
                 },
+                {
+                    "input": "0",
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                },
                 {
                     "input": "0",
                     "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"

menutraversal_test/menu_traversal_test.go

@@ -3,7 +3,6 @@ package menutraversaltest
 import (
 	"bytes"
 	"context"
-	"flag"
 	"log"
 	"math/rand"
 	"os"
@@ -16,15 +15,14 @@ import (
 )
 
 var (
-	testData  = driver.ReadData()
+	testData      = driver.ReadData()
-	testStore = ".test_state"
+	testStore     = ".test_state"
-	sessionID string
+	groupTestFile = "group_test.json"
-	src       = rand.NewSource(42)
+	sessionID     string
-	g         = rand.New(src)
+	src           = rand.NewSource(42)
+	g             = rand.New(src)
 )
 
-var groupTestFile = flag.String("test-file", "group_test.json", "The test file to use for running the group tests")
-
 func GenerateSessionId() string {
 	uu := uuid.NewGenWithOptions(uuid.WithRandomReader(g))
 	v, err := uu.NewV4()
@@ -339,7 +337,7 @@ func TestMainMenuSend(t *testing.T) {
 }
 
 func TestGroups(t *testing.T) {
-	groups, err := driver.LoadTestGroups(*groupTestFile)
+	groups, err := driver.LoadTestGroups(groupTestFile)
 	if err != nil {
 		log.Fatalf("Failed to load test groups: %v", err)
 	}

menutraversal_test/profile_edit_start_familyname.json

@@ -1,68 +0,0 @@
-{
-    "groups": [
-        { 
-                "name": "menu_my_account_edit_all_account_details_starting_from_family_name",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    },
-                    {
-                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                    },
-                    {
-                        "input": "2",
-                        "expectedContent": "Enter family name:\n0:Back"
-                    },
-                    {
-                        "input": "bar",
-                        "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent":  "Enter your year of birth\n0:Back"
-                    },
-                    {
-                        "input": "1940",
-                        "expectedContent": "Enter your location:\n0:Back"
-                    },
-                    {
-                        "input": "Kilifi",
-                        "expectedContent": "Enter the services or goods you offer: \n0:Back"
-                    },
-                    {
-                        "input": "Bananas",
-                        "expectedContent": "Please enter your PIN:"
-                    },
-                    {
-                        "input": "1234",
-                        "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    }
-                ]
-            }
-    ]
-}
-      
-        
-       
-        
-    
-
-
-    
-
-
-    

menutraversal_test/profile_edit_start_firstname.json

@@ -1,61 +0,0 @@
-{
-    "groups": [
-        { 
-            "name": "menu_my_account_edit_all_account_details_starting_from_firstname",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Enter your first names:\n0:Back"
-                },
-                {
-                    "input": "foo",
-                    "expectedContent": "Enter family name:\n0:Back"
-                },
-                {
-                    "input": "bar",
-                    "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent":  "Enter your year of birth\n0:Back"
-                },
-                {
-                    "input": "1940",
-                    "expectedContent": "Enter your location:\n0:Back"
-                },
-                {
-                    "input": "Kilifi",
-                    "expectedContent": "Enter the services or goods you offer: \n0:Back"
-                },
-                {
-                    "input": "Bananas",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        }
-    ]
-}

menutraversal_test/profile_edit_start_gender.json

@@ -1,55 +0,0 @@
-{
-    "groups": [
-        { 
-                "name": "menu_my_account_edit_all_account_details_starting_from_gender",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    },
-                    {
-                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                    },
-                    {
-                        "input": "3",
-                        "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent":  "Enter your year of birth\n0:Back"
-                    },
-                    {
-                        "input": "1940",
-                        "expectedContent": "Enter your location:\n0:Back"
-                    },
-                    {
-                        "input": "Kilifi",
-                        "expectedContent": "Enter the services or goods you offer: \n0:Back"
-                    },
-                    {
-                        "input": "Bananas",
-                        "expectedContent": "Please enter your PIN:"
-                    },
-                    {
-                        "input": "1234",
-                        "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    }
-                ]
-            }
-    ]
-}
-      
-      

menutraversal_test/profile_edit_start_location.json

@@ -1,46 +0,0 @@
-{
-    "groups": [
-        { 
-                "name": "menu_my_account_edit_all_account_details_starting_from_location",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    },
-                    {
-                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                    },  
-                    {
-                        "input": "5",
-                        "expectedContent": "Enter your location:\n0:Back"
-                    },
-                    {
-                        "input": "Kilifi",
-                        "expectedContent": "Enter the services or goods you offer: \n0:Back"
-                    },
-                    {
-                        "input": "Bananas",
-                        "expectedContent": "Please enter your PIN:"
-                    },
-                    {
-                        "input": "1234",
-                        "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    }
-                ]
-            }
-    ]
-}
-     

menutraversal_test/profile_edit_start_offerings.json

@@ -1,42 +0,0 @@
-{
-    "groups": [
-        { 
-                "name": "menu_my_account_edit_all_account_details_starting_from_offerings",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    },
-                    {
-                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                    },
-                    {
-                        "input": "6",
-                        "expectedContent": "Enter the services or goods you offer: \n0:Back"
-                    },
-                    {
-                        "input": "Bananas",
-                        "expectedContent": "Please enter your PIN:"
-                    },
-                    {
-                        "input": "1234",
-                        "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    }
-                ]
-            }
-    ]
-}
-     

menutraversal_test/profile_edit_start_yob.json

@@ -1,50 +0,0 @@
-{
-    "groups": [
-        { 
-                "name": "menu_my_account_edit_all_account_details_starting_from_yob",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    },
-                    {
-                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                    },
-                    {
-                        "input": "4",
-                        "expectedContent":  "Enter your year of birth\n0:Back"
-                    },
-                    {
-                        "input": "1940",
-                        "expectedContent": "Enter your location:\n0:Back"
-                    },
-                    {
-                        "input": "Kilifi",
-                        "expectedContent": "Enter the services or goods you offer: \n0:Back"
-                    },
-                    {
-                        "input": "Bananas",
-                        "expectedContent": "Please enter your PIN:"
-                    },
-                    {
-                        "input": "1234",
-                        "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    }
-                ]
-            }
-    ]
-}
-     

menutraversal_test/profile_edit_when_adjacent_item_set.json

@@ -1,70 +0,0 @@
-{
-    "groups": [
-        { 
-                "name": "menu_my_account_edit_familyname_when_adjacent_profile_information_set",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    },
-                    {
-                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                    },
-                    {
-                        "input": "3",
-                        "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent":  "Enter your year of birth\n0:Back"
-                    },
-                    {
-                        "input": "1940",
-                        "expectedContent": "Enter your location:\n0:Back"
-                    },
-                    {
-                        "input": "Kilifi",
-                        "expectedContent": "Enter the services or goods you offer: \n0:Back"
-                    },
-                    {
-                        "input": "Bananas",
-                        "expectedContent": "Please enter your PIN:"
-                    },
-                    {
-                        "input": "1234",
-                        "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                    },
-                    {
-                        "input": "2",
-                        "expectedContent": "Enter family name:\n0:Back"
-                    },
-                    {
-                        "input": "foo2",
-                        "expectedContent": "Please enter your PIN:"
-                    },
-                    {
-                        "input": "1234",
-                        "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                    },
-                    {
-                       "input": "0",
-                       "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    }
-                ]
-            }
-    ]
-}
-    

menutraversal_test/test_setup.json

@@ -7,11 +7,11 @@
                 "steps": [
                     {
                         "input": "",
-                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:English\n1:Kiswahili"
+                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:english\n1:kiswahili"
                     },
                     {
                         "input": "0",
-                        "expectedContent": "Do you agree to terms and conditions?\nhttps://grassecon.org/pages/terms-and-conditions\n\n0:Yes\n1:No"
+                        "expectedContent": "Do you agree to terms and conditions?\n0:yes\n1:no"
                     },
                     {
                         "input": "0",
@@ -40,11 +40,11 @@
                 "steps": [
                     {
                         "input": "",
-                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:English\n1:Kiswahili"
+                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:english\n1:kiswahili"
                     },
                     {
                         "input": "0",
-                        "expectedContent": "Do you agree to terms and conditions?\nhttps://grassecon.org/pages/terms-and-conditions\n\n0:Yes\n1:No"
+                        "expectedContent": "Do you agree to terms and conditions?\n0:yes\n1:no"
                     },
                     {
                         "input": "1",
@@ -61,7 +61,7 @@
                     },
                     {
                         "input": "1",
-                        "expectedContent": "Enter recipient's phone number/address/alias:\n0:Back"
+                        "expectedContent": "Enter recipient's phone number:\n0:Back"
                     },
                     {
                         "input": "000",
@@ -69,7 +69,7 @@
                     },
                     {
                         "input": "1",
-                        "expectedContent": "Enter recipient's phone number/address/alias:\n0:Back"
+                        "expectedContent": "Enter recipient's phone number:\n0:Back"
                     },
                     {
                         "input": "0712345678",

models/profile.go

@@ -1,18 +0,0 @@
-package models
-
-type Profile struct {
-	ProfileItems []string
-	Max          int
-}
-
-func (p *Profile) InsertOrShift(index int, value string) {
-	if index < len(p.ProfileItems) {
-		p.ProfileItems = append(p.ProfileItems[:index], value)
-	} else {
-		for len(p.ProfileItems) < index {
-			p.ProfileItems = append(p.ProfileItems, "0")
-		}
-		p.ProfileItems = append(p.ProfileItems, "0") 
-		p.ProfileItems[index] = value
-	}
-}

models/voucher_data_result.go

@@ -1,10 +1,8 @@
 package models
 
 type VoucherDataResult struct {
-	TokenName      string `json:"tokenName"`
+	TokenName     string `json:"tokenName"`
-	TokenSymbol    string `json:"tokenSymbol"`
+	TokenSymbol   string `json:"tokenSymbol"`
-	TokenDecimals  int    `json:"tokenDecimals"`
+	TokenDecimals int    `json:"tokenDecimals"`
-	SinkAddress    string `json:"sinkAddress"`
+	SinkAddress   string `json:"sinkAddress"`
-	TokenCommodity string `json:"tokenCommodity"`
-	TokenLocation  string `json:"tokenLocation"`
 }

remote/accountservice.go

@@ -24,7 +24,6 @@ type AccountServiceInterface interface {
 	FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error)
 	VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error)
 	TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error)
-	CheckAliasAddress(ctx context.Context, alias string) (*dataserviceapi.AliasAddress, error)
 }
 
 type AccountService struct {
@@ -210,26 +209,6 @@ func (as *AccountService) TokenTransfer(ctx context.Context, amount, from, to, t
 	return &r, nil
 }
 
-// CheckAliasAddress retrieves the address of an alias from the API endpoint.
-// Parameters:
-//   - alias: The alias of the user.
-func (as *AccountService) CheckAliasAddress(ctx context.Context, alias string) (*dataserviceapi.AliasAddress, error) {
-	var r dataserviceapi.AliasAddress
-
-	ep, err := url.JoinPath(config.CheckAliasURL, alias)
-	if err != nil {
-		return nil, err
-	}
-
-	req, err := http.NewRequest("GET", ep, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	_, err = doRequest(ctx, req, &r)
-	return &r, err
-}
-
 func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
 	var okResponse api.OKResponse
 	var errResponse api.ErrResponse

services/registration/_catch_swa

@@ -1 +0,0 @@
-Tatizo la kimtambo limetokea,tafadhali jaribu tena baadaye.

services/registration/edit_family_name.vis

@@ -2,17 +2,9 @@ CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_familyname flag_allow_update 1
 LOAD get_current_profile_info 0
 RELOAD get_current_profile_info
-MAP get_current_profile_info
 MOUT back 0
 HALT
-RELOAD set_back 
+LOAD save_familyname 0
-CATCH _ flag_back_set 1
-LOAD save_familyname 64
 RELOAD save_familyname
-CATCH pin_entry flag_familyname_set 1
+INCMP _ 0
-CATCH select_gender flag_gender_set 0
+INCMP pin_entry *
-CATCH edit_yob flag_yob_set 0
-CATCH edit_location flag_location_set 0
-CATCH edit_offerings flag_offerings_set 0
-CATCH pin_entry flag_familyname_set 0
-INCMP select_gender *

services/registration/edit_first_name.vis

@@ -5,14 +5,7 @@ RELOAD get_current_profile_info
 MAP get_current_profile_info
 MOUT back 0
 HALT
-RELOAD set_back 
+LOAD save_firstname 0
-CATCH _ flag_back_set 1
-LOAD save_firstname 128
 RELOAD save_firstname
-CATCH pin_entry flag_firstname_set 1
+INCMP _ 0
-CATCH edit_family_name flag_familyname_set 0
+INCMP pin_entry *
-CATCH edit_gender flag_gender_set 0
-CATCH edit_yob flag_yob_set 0
-CATCH edit_location flag_location_set 0
-CATCH edit_offerings flag_offerings_set 0
-CATCH pin_entry flag_firstname_set 0

services/registration/edit_location.vis

@@ -2,14 +2,9 @@ CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_location flag_allow_update 1
 LOAD get_current_profile_info 0
 RELOAD get_current_profile_info
-LOAD save_location 16
 MOUT back 0
 HALT
-RELOAD set_back 
+LOAD save_location 0
-CATCH _ flag_back_set 1
 RELOAD save_location
 INCMP _ 0
-CATCH pin_entry flag_location_set 1
+INCMP pin_entry *
-CATCH edit_offerings flag_offerings_set 0
-CATCH pin_entry flag_location_set 0
-INCMP edit_offerings *

services/registration/edit_offerings.vis

@@ -2,12 +2,9 @@ CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_offerings flag_allow_update 1
 LOAD get_current_profile_info 0
 RELOAD get_current_profile_info
-LOAD save_offerings 8
+LOAD save_offerings 0
 MOUT back 0
 HALT
-RELOAD set_back 
-CATCH _ flag_back_set 1
 RELOAD save_offerings
 INCMP _ 0
-CATCH pin_entry flag_offerings_set 1
+INCMP pin_entry *
-INCMP update_profile_items *

services/registration/edit_profile.vis

@@ -11,8 +11,7 @@ MOUT edit_offerings 6
 MOUT view 7
 MOUT back 0
 HALT
-LOAD set_back 6
+INCMP my_account 0
-INCMP ^ 0
 INCMP edit_first_name 1
 INCMP edit_family_name 2
 INCMP select_gender 3

services/registration/edit_yob.vis

@@ -5,15 +5,10 @@ RELOAD get_current_profile_info
 MAP get_current_profile_info
 MOUT back 0
 HALT
-RELOAD set_back 
-CATCH _ flag_back_set 1
 LOAD verify_yob 6
 RELOAD verify_yob
 CATCH incorrect_date_format flag_incorrect_date_format 1
-LOAD save_yob 32
+LOAD save_yob 0
 RELOAD save_yob
-CATCH pin_entry flag_yob_set 1
+INCMP _ 0
-CATCH edit_location flag_location_set 0
+INCMP pin_entry *
-CATCH edit_offerings flag_offerings_set 0
-CATCH pin_entry flag_yob_set 0
-INCMP edit_location *

services/registration/english_menu

@@ -1 +0,0 @@
-English

services/registration/incorrect_pin

@@ -1 +1 @@
-Incorrect PIN
+Incorrect pin

services/registration/invalid_pin_swa

@@ -1 +1 @@
-PIN mpya na udhibitisho wa PIN mpya hazilingani.Tafadhali jaribu tena.Kwa usaidizi piga simu +254757628885.
+PIN mpya na udhibitisho wa pin mpya hazilingani.Tafadhali jaribu tena.Kwa usaidizi piga simu +254757628885.

services/registration/kiswahili_menu

@@ -1 +0,0 @@
-Kiswahili

services/registration/locale/swa/default.po

@@ -13,7 +13,7 @@ msgstr "Kwa usaidizi zaidi,piga: 0757628885"
 msgid "Balance: %s\n"
 msgstr "Salio: %s\n"
 
-msgid "Your invite request for %s to Sarafu Network failed. Please try again later."
+msid "Your invite request for %s to Sarafu Network failed. Please try again later."
 msgstr "Ombi lako la kumwalika %s kwa matandao wa Sarafu halikufaulu. Tafadhali jaribu tena baadaye."
 
 msgid "Your invitation to %s to join Sarafu Network has been sent."
@@ -23,7 +23,4 @@ msgid "Your request failed. Please try again later."
 msgstr "Ombi lako halikufaulu. Tafadhali jaribu tena baadaye."
 
 msgid "Community Balance: 0.00"
-msgstr "Salio la Kikundi: 0.00"
+msgid "Salio la Kikundi: 0.00"
-
-msgid "Symbol: %s\nBalance: %s"
-msgstr "Sarafu: %s\nSalio: %s"

services/registration/main.vis

@@ -1,10 +1,10 @@
 LOAD set_default_voucher 8
 RELOAD set_default_voucher
+LOAD check_balance 64
+RELOAD check_balance
 LOAD check_vouchers 10
 RELOAD check_vouchers
-LOAD check_balance 128
+CATCH api_failure  flag_api_call_error  1
-RELOAD check_balance
-CATCH api_failure flag_api_call_error 1
 MAP check_balance
 MOUT send 1
 MOUT vouchers 2

services/registration/my_balance_swa

@@ -1 +1 @@
-{{.check_balance}}
+Salio lako ni: 0.00 SRF

services/registration/next_menu

@@ -1 +0,0 @@
-Next

services/registration/next_menu_swa

@@ -1 +0,0 @@
-Mbele

services/registration/no_menu

@@ -1 +1 @@
-No
+no

services/registration/no_menu_swa

@@ -1 +1 @@
-La
+la

services/registration/pp.csv

@@ -21,10 +21,3 @@ flag,flag_admin_privilege,27,this is set when a user has admin privileges.
 flag,flag_unregistered_number,28,this is set when an unregistered phonenumber tries to perform an action
 flag,flag_no_transfers,29,this is set when a user does not have any transactions
 flag,flag_incorrect_statement,30,this is set when the selected statement is invalid
-flag,flag_firstname_set,31,this is set when the first name of the profile is set
-flag,flag_familyname_set,32,this is set when the family name of the profile is set
-flag,flag_yob_set,33,this is set when the yob of the profile is set
-flag,flag_gender_set,34,this is set when the gender of the profile is set
-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

services/registration/prev_menu

@@ -1 +0,0 @@
-Prev

services/registration/prev_menu_swa

@@ -1 +0,0 @@
-Nyuma

services/registration/profile_update_success.vis

@@ -1,5 +1,3 @@
-LOAD update_all_profile_items 0
-RELOAD update_all_profile_items
 MOUT back 0
 MOUT quit 9
 HALT

services/registration/select_gender.vis

@@ -11,4 +11,3 @@ INCMP _ 0
 INCMP set_male 1
 INCMP set_female 2
 INCMP set_unspecified 3
-INCMP . *

services/registration/send

@@ -1 +1 @@
-Enter recipient's phone number/address/alias:
+Enter recipient's phone number:

services/registration/set_eng.vis

@@ -1,4 +1,3 @@
 LOAD set_language 6
-RELOAD set_language
 CATCH terms flag_account_created 0
 MOVE language_changed

services/registration/set_female.vis

@@ -1,10 +1,4 @@
-LOAD save_gender 32
+LOAD save_gender 0
-RELOAD save_gender
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_gender flag_allow_update 1
-CATCH pin_entry flag_gender_set 1
+MOVE pin_entry
-CATCH edit_yob flag_yob_set 0
-CATCH edit_location flag_location_set 0
-CATCH edit_offerings flag_offerings_set 0
-CATCH pin_entry flag_gender_set 0
-MOVE edit_yob

services/registration/set_male.vis

@@ -1,10 +1,4 @@
-LOAD save_gender 16
+LOAD save_gender 0
-RELOAD save_gender
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_gender flag_allow_update 1
-CATCH pin_entry flag_gender_set 1
+MOVE pin_entry
-CATCH edit_yob flag_yob_set 0
-CATCH edit_location flag_location_set 0
-CATCH edit_offerings flag_offerings_set 0
-CATCH pin_entry flag_gender_set 0
-MOVE edit_yob

services/registration/set_swa.vis

@@ -1,4 +1,3 @@
 LOAD set_language 6
-RELOAD set_language
 CATCH terms flag_account_created 0
 MOVE language_changed

services/registration/set_unspecified.vis

@@ -1,10 +1,4 @@
-LOAD save_gender 8
+LOAD save_gender 0
-RELOAD save_gender
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_gender flag_allow_update 1
-CATCH pin_entry flag_gender_set 1
+MOVE pin_entry
-CATCH edit_yob flag_yob_set 0
-CATCH edit_location flag_location_set 0
-CATCH edit_offerings flag_offerings_set 0
-CATCH pin_entry flag_gender_set 0
-MOVE edit_yob

services/registration/terms

@@ -1,2 +1 @@
-Do you agree to terms and conditions?
+Do you agree to terms and conditions?
-https://grassecon.org/pages/terms-and-conditions

services/registration/terms_swa

@@ -1,2 +1 @@
-Kwa kutumia hii huduma umekubali sheria na masharti?
+Kwa kutumia hii huduma umekubali sheria na masharti?
-https://grassecon.org/pages/terms-and-conditions

services/registration/update_profile_items.vis

@@ -1,3 +0,0 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-MOVE pin_entry

services/registration/yes_menu

@@ -1 +1 @@
-Yes
+yes

services/registration/yes_menu_swa

@@ -1 +1 @@
-Ndio
+ndio