updated tests

cmd/africastalking/main.go

@@ -32,8 +32,8 @@ import (
 var (
 	logg          = logging.NewVanilla()
 	scriptDir     = path.Join("services", "registration")
-
 	build         = "dev"
+	menuSeparator = ": "
 )
 
 func init() {
@@ -128,12 +128,14 @@ func main() {
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "Database", database)
+	ctx = context.WithValue(ctx, "MenuSeparator", menuSeparator)
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
 		Root:          "root",
 		OutputSize:    uint32(size),
 		FlagCount:     uint32(128),
+		MenuSeparator: menuSeparator,
 	}
 
 	if engineDebug {

cmd/async/main.go

@@ -23,6 +23,7 @@ import (
 var (
 	logg      = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
+	menuSeparator = ": "
 )
 
 func init() {
@@ -67,12 +68,14 @@ func main() {
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "Database", database)
+	ctx = context.WithValue(ctx, "MenuSeparator", menuSeparator)
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
 		Root:          "root",
 		OutputSize:    uint32(size),
 		FlagCount:     uint32(128),
+		MenuSeparator: menuSeparator,
 	}
 
 	if engineDebug {

cmd/http/main.go

@@ -26,6 +26,7 @@ import (
 var (
 	logg      = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
+	menuSeparator = ": "
 )
 
 func init() {
@@ -55,12 +56,14 @@ func main() {
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "Database", database)
+	ctx = context.WithValue(ctx, "MenuSeparator", menuSeparator)
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
 		Root:          "root",
 		OutputSize:    uint32(size),
 		FlagCount:     uint32(128),
+		MenuSeparator: menuSeparator,
 	}
 
 	if engineDebug {

cmd/main.go

@@ -20,6 +20,7 @@ import (
 var (
 	logg          = logging.NewVanilla()
 	scriptDir     = path.Join("services", "registration")
+	menuSeparator = ": "
 )
 
 func init() {
@@ -46,6 +47,7 @@ func main() {
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 	ctx = context.WithValue(ctx, "Database", database)
+	ctx = context.WithValue(ctx, "MenuSeparator", menuSeparator)
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
@@ -53,6 +55,7 @@ func main() {
 		SessionId:     sessionId,
 		OutputSize:    uint32(size),
 		FlagCount:     uint32(128),
+		MenuSeparator: menuSeparator,
 	}
 
 	resourceDir := scriptDir

common/transfer_statements.go

@@ -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]),

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.20241122120231-9e9ee5bdfa7a
+	git.defalsify.org/vise.git v0.2.1-0.20241212130612-18a95521a7cf
 	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,9 @@
 git.defalsify.org/vise.git v0.2.1-0.20241122120231-9e9ee5bdfa7a h1:LvGKktk0kUnuRN3nF9r15D8OoV0sFaMmQr52kGq2gtE=
 git.defalsify.org/vise.git v0.2.1-0.20241122120231-9e9ee5bdfa7a/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.2.1-0.20241209194740-26fc82a76ede h1:BtooQZJDYEgeRKqv8RSxYSbW5jh0UIFJ6zRMEZZn0sc=
+git.defalsify.org/vise.git v0.2.1-0.20241209194740-26fc82a76ede/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.2.1-0.20241212130612-18a95521a7cf h1:K58RcCiBZSmfU7zwg4nCHzY5ikw+wyfFoDU+4SXkarU=
+git.defalsify.org/vise.git v0.2.1-0.20241212130612-18a95521a7cf/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/ussd/menuhandler.go

@@ -1676,6 +1676,11 @@ func (h *Handlers) CheckVouchers(ctx context.Context, sym string, input []byte)
 func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 
+	menuSeparator, ok := ctx.Value("MenuSeparator").(string)
+	if !ok {
+		return res, fmt.Errorf("missing menu Separator")
+	}
+
 	// Read vouchers from the store
 	voucherData, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_VOUCHER_SYMBOLS))
 	if err != nil {
@@ -1683,7 +1688,9 @@ func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte)
 		return res, err
 	}
 
-	res.Content = string(voucherData)
+	formattedData := strings.ReplaceAll(string(voucherData), ":", menuSeparator)
+
+	res.Content = string(formattedData)
 
 	return res, nil
 }
@@ -1846,13 +1853,19 @@ func (h *Handlers) CheckTransactions(ctx context.Context, sym string, input []by
 	return res, nil
 }
 
-// GetTransactionsList fetches the list of transactions and formats them
+// GetTransactionsList reads the list of transactions from the db and formats them
 func (h *Handlers) GetTransactionsList(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")
 	}
+
+	menuSeparator, ok := ctx.Value("MenuSeparator").(string)
+	if !ok {
+		return res, fmt.Errorf("missing menu Separator")
+	}
+
 	store := h.userdataStore
 	publicKey, err := store.ReadEntry(ctx, sessionId, common.DATA_PUBLIC_KEY)
 	if err != nil {
@@ -1895,12 +1908,12 @@ func (h *Handlers) GetTransactionsList(ctx context.Context, sym string, input []
 		value := strings.TrimSpace(values[i])
 		date := strings.Split(strings.TrimSpace(dates[i]), " ")[0]
 
-		status := "received"
+		status := "Received"
 		if sender == string(publicKey) {
-			status = "sent"
+			status = "Sent"
 		}
 
-		formattedTransactions = append(formattedTransactions, fmt.Sprintf("%d:%s %s %s %s", i+1, status, value, sym, date))
+		formattedTransactions = append(formattedTransactions, fmt.Sprintf("%d%s%s %s %s %s", i+1, menuSeparator, status, value, sym, date))
 	}
 
 	res.Content = strings.Join(formattedTransactions, "\n")

internal/handlers/ussd/menuhandler_test.go

@@ -1982,7 +1982,11 @@ func TestCheckVouchers(t *testing.T) {
 
 func TestGetVoucherList(t *testing.T) {
 	sessionId := "session123"
+	menuSeparator := ":"
+	
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
+	ctx = context.WithValue(ctx, "MenuSeparator", menuSeparator)
+	
 
 	spdb := InitializeTestSubPrefixDb(t, ctx)