Merge pull request 'account-statement' (#126) from account-statement into master

Reviewed-on: #126

.dockerignore

@@ -0,0 +1,13 @@
+/**
+!/cmd/africastalking
+!/common
+!/config
+!/initializers
+!/internal
+!/models
+!/remote
+!/services
+!/LICENSE
+!/README.md
+!/go.*
+!/.env.example

.env.example

@@ -2,6 +2,9 @@
 PORT=7123
 HOST=127.0.0.1
 
+#AfricasTalking USSD POST endpoint
+AT_ENDPOINT=/ussd/africastalking
+
 #PostgreSQL
 DB_HOST=localhost
 DB_USER=postgres
@@ -12,10 +15,6 @@ DB_SSLMODE=disable
 DB_TIMEZONE=Africa/Nairobi
 
 #External API Calls
-CREATE_ACCOUNT_URL=http://localhost:5003/api/v2/account/create
+CUSTODIAL_URL_BASE=http://localhost:5003
-TRACK_STATUS_URL=https://custodial.sarafu.africa/api/track/
+BEARER_TOKEN=eyJeSIsInRcCI6IkpXVCJ.yJwdWJsaWNLZXkiOiIwrrrrrr
-BALANCE_URL=https://custodial.sarafu.africa/api/account/status/
+DATA_URL_BASE=http://localhost:5006
-TRACK_URL=http://localhost:5003/api/v2/account/status
-
-#AfricasTalking USSD POST endpoint
-AT_ENDPOINT=/ussd/africastalking

.github/workflows/docker.yaml

@@ -0,0 +1,56 @@
+name: release
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Check out repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Login to GHCR Docker registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set outputs
+        run: |
+          echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV \
+          && echo "RELEASE_SHORT_COMMIT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+
+      - name: Build and push image
+        uses: docker/build-push-action@v2
+        with:
+          context: ./
+          file: ./Dockerfile
+          platforms: linux/amd64
+          push: true
+          build-args: |
+            BUILD=${{ env.RELEASE_SHORT_COMMIT }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+          tags: |
+            ghcr.io/grassrootseconomics/urdt-ussd:latest
+            ghcr.io/grassrootseconomics/urdt-ussd:${{ env.RELEASE_TAG }}

Dockerfile

@@ -0,0 +1,41 @@
+FROM golang:1.23.0-bookworm AS build
+
+ENV CGO_ENABLED=1
+
+ARG BUILDPLATFORM
+ARG TARGETPLATFORM
+ARG BUILD=dev
+
+WORKDIR /build
+COPY . .
+RUN apt update && apt install libgdbm-dev
+RUN git clone https://git.defalsify.org/vise.git go-vise
+
+WORKDIR /build/services/registration
+RUN echo "Compiling go-vise files"
+RUN make VISE_PATH=/build/go-vise -B
+
+WORKDIR /build
+RUN echo "Building on $BUILDPLATFORM, building for $TARGETPLATFORM"
+RUN go mod download
+RUN go build -tags logtrace -o ussd-africastalking -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
+
+FROM debian:bookworm-slim
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt update && apt install libgdbm-dev ca-certificates -y
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /service
+
+COPY --from=build /build/ussd-africastalking .
+COPY --from=build /build/LICENSE .
+COPY --from=build /build/README.md .
+COPY --from=build /build/services ./services
+COPY --from=build /build/.env.example .
+RUN mv .env.example .env
+
+EXPOSE 7123
+
+CMD ["./ussd-africastalking"]

cmd/africastalking/main.go

@@ -31,26 +31,12 @@ import (
 var (
 	logg      = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
-	InfoLogger  *log.Logger
+
-	ErrorLogger *log.Logger
+	build = "dev"
 )
 
 func init() {
 	initializers.LoadEnvVariables()
-
-	logFile := "urdt-ussd-africastalking.log"
-
-	file, err := os.OpenFile(logFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0666)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	InfoLogger = log.New(file, "INFO: ", log.Ldate|log.Ltime|log.Lshortfile)
-	ErrorLogger = log.New(file, "ERROR: ", log.Ldate|log.Ltime|log.Lshortfile)
-
-	// Inject into remote package
-	remote.InfoLogger = InfoLogger
-	remote.ErrorLogger = ErrorLogger
 }
 
 type atRequestParser struct{}
@@ -58,14 +44,14 @@ type atRequestParser struct{}
 func (arp *atRequestParser) GetSessionId(rq any) (string, error) {
 	rqv, ok := rq.(*http.Request)
 	if !ok {
-		ErrorLogger.Println("got an invalid request:", rq)
+		log.Println("got an invalid request:", rq)
 		return "", handlers.ErrInvalidRequest
 	}
 
 	// Capture body (if any) for logging
 	body, err := io.ReadAll(rqv.Body)
 	if err != nil {
-		ErrorLogger.Println("failed to read request body:", err)
+		log.Println("failed to read request body:", err)
 		return "", fmt.Errorf("failed to read request body: %v", err)
 	}
 	// Reset the body for further reading
@@ -75,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 {
-		ErrorLogger.Println("failed to marshal request body:", err)
+		log.Println("failed to marshal request body:", err)
 	} else {
-		InfoLogger.Println("Received request:", string(logBytes))
+		log.Println("Received request:", string(logBytes))
 	}
 
 	if err := rqv.ParseForm(); err != nil {
-		ErrorLogger.Println("failed to parse form data: %v", err)
+		log.Println("failed to parse form data: %v", err)
 		return "", fmt.Errorf("failed to parse form data: %v", err)
 	}
 
@@ -131,7 +117,7 @@ func main() {
 	flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
 	flag.Parse()
 
-	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)
+	logg.Infof("start command", "build", build, "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "Database", database)
@@ -173,6 +159,10 @@ func main() {
 	}
 
 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
 	lhs.SetDataStore(&userdataStore)
 
 	if err != nil {

cmd/async/main.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"log"
 	"os"
 	"os/signal"
 	"path"
@@ -24,27 +23,12 @@ import (
 var (
 	logg      = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
-	InfoLogger    *log.Logger
-	ErrorLogger   *log.Logger
 )
 
 func init() {
 	initializers.LoadEnvVariables()
-
-	logFile := "urdt-ussd-async.log"
-
-	file, err := os.OpenFile(logFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0666)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	InfoLogger = log.New(file, "INFO: ", log.Ldate|log.Ltime|log.Lshortfile)
-	ErrorLogger = log.New(file, "ERROR: ", log.Ldate|log.Ltime|log.Lshortfile)
-
-	// Inject into remote package
-	remote.InfoLogger = InfoLogger
-	remote.ErrorLogger = ErrorLogger
 }
+
 type asyncRequestParser struct {
 	sessionId string
 	input     []byte

cmd/http/main.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"log"
 	"net/http"
 	"os"
 	"os/signal"
@@ -27,26 +26,10 @@ import (
 var (
 	logg      = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
-	InfoLogger    *log.Logger
-	ErrorLogger   *log.Logger
 )
 
 func init() {
 	initializers.LoadEnvVariables()
-
-	logFile := "urdt-ussd-http.log"
-
-	file, err := os.OpenFile(logFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0666)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	InfoLogger = log.New(file, "INFO: ", log.Ldate|log.Ltime|log.Lshortfile)
-	ErrorLogger = log.New(file, "ERROR: ", log.Ldate|log.Ltime|log.Lshortfile)
-
-	// Inject into remote package
-	remote.InfoLogger = InfoLogger
-	remote.ErrorLogger = ErrorLogger
 }
 
 func main() {

cmd/main.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"log"
 	"os"
 	"path"
 
@@ -21,26 +20,10 @@ import (
 var (
 	logg      = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
-	InfoLogger    *log.Logger
-	ErrorLogger   *log.Logger
 )
 
 func init() {
 	initializers.LoadEnvVariables()
-
-	logFile := "urdt-ussd-cli.log"
-
-	file, err := os.OpenFile(logFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0666)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	InfoLogger = log.New(file, "INFO: ", log.Ldate|log.Ltime|log.Lshortfile)
-	ErrorLogger = log.New(file, "ERROR: ", log.Ldate|log.Ltime|log.Lshortfile)
-
-	// Inject into remote package
-	remote.InfoLogger = InfoLogger
-	remote.ErrorLogger = ErrorLogger
 }
 
 func main() {

common/db.go

@@ -2,6 +2,7 @@ package common
 
 import (
 	"encoding/binary"
+	"errors"
 
 	"git.defalsify.org/vise.git/logging"
 )
@@ -48,3 +49,23 @@ func PackKey(typ DataTyp, data []byte) []byte {
 	v := typToBytes(typ)
 	return append(v, data...)
 }
+
+func StringToDataTyp(str string) (DataTyp, error) {
+	switch str {
+	case "DATA_FIRST_NAME":
+		return DATA_FIRST_NAME, nil
+	case "DATA_FAMILY_NAME":
+		return DATA_FAMILY_NAME, nil
+	case "DATA_YOB":
+		return DATA_YOB, nil
+	case "DATA_LOCATION":
+		return DATA_LOCATION, nil
+	case "DATA_GENDER":
+		return DATA_GENDER, nil
+	case "DATA_OFFERINGS":
+		return DATA_OFFERINGS, nil
+
+	default:
+		return 0, errors.New("invalid DataTyp string")
+	}
+}

common/tokens.go

@@ -0,0 +1,81 @@
+package common
+
+import (
+	"context"
+	"errors"
+	"math/big"
+	"reflect"
+	"strconv"
+)
+
+type TransactionData struct {
+	TemporaryValue string
+	ActiveSym      string
+	Amount         string
+	PublicKey      string
+	Recipient      string
+	ActiveDecimal  string
+	ActiveAddress  string
+}
+
+func ParseAndScaleAmount(storedAmount, activeDecimal string) (string, error) {
+	// Parse token decimal
+	tokenDecimal, err := strconv.Atoi(activeDecimal)
+	if err != nil {
+
+		return "", err
+	}
+
+	// Parse amount
+	amount, _, err := big.ParseFloat(storedAmount, 10, 0, big.ToZero)
+	if err != nil {
+		return "", err
+	}
+
+	// Scale the amount
+	multiplier := new(big.Float).SetInt(new(big.Int).Exp(big.NewInt(10), big.NewInt(int64(tokenDecimal)), nil))
+	finalAmount := new(big.Float).Mul(amount, multiplier)
+
+	// Convert finalAmount to a string
+	finalAmountStr := new(big.Int)
+	finalAmount.Int(finalAmountStr)
+
+	return finalAmountStr.String(), nil
+}
+
+func ReadTransactionData(ctx context.Context, store DataStore, sessionId string) (TransactionData, error) {
+	data := TransactionData{}
+	fieldToKey := map[string]DataTyp{
+		"TemporaryValue": DATA_TEMPORARY_VALUE,
+		"ActiveSym":      DATA_ACTIVE_SYM,
+		"Amount":         DATA_AMOUNT,
+		"PublicKey":      DATA_PUBLIC_KEY,
+		"Recipient":      DATA_RECIPIENT,
+		"ActiveDecimal":  DATA_ACTIVE_DECIMAL,
+		"ActiveAddress":  DATA_ACTIVE_ADDRESS,
+	}
+
+	v := reflect.ValueOf(&data).Elem()
+	for fieldName, key := range fieldToKey {
+		field := v.FieldByName(fieldName)
+		if !field.IsValid() || !field.CanSet() {
+			return data, errors.New("invalid struct field: " + fieldName)
+		}
+
+		value, err := readStringEntry(ctx, store, sessionId, key)
+		if err != nil {
+			return data, err
+		}
+		field.SetString(value)
+	}
+
+	return data, nil
+}
+
+func readStringEntry(ctx context.Context, store DataStore, sessionId string, key DataTyp) (string, error) {
+	entry, err := store.ReadEntry(ctx, sessionId, key)
+	if err != nil {
+		return "", err
+	}
+	return string(entry), nil
+}

common/tokens_test.go

@@ -0,0 +1,129 @@
+package common
+
+import (
+	"testing"
+
+	"github.com/alecthomas/assert/v2"
+)
+
+func TestParseAndScaleAmount(t *testing.T) {
+	tests := []struct {
+		name        string
+		amount      string
+		decimals    string
+		want        string
+		expectError bool
+	}{
+		{
+			name:        "whole number",
+			amount:      "123",
+			decimals:    "2",
+			want:        "12300",
+			expectError: false,
+		},
+		{
+			name:        "decimal number",
+			amount:      "123.45",
+			decimals:    "2",
+			want:        "12345",
+			expectError: false,
+		},
+		{
+			name:        "zero decimals",
+			amount:      "123.45",
+			decimals:    "0",
+			want:        "123",
+			expectError: false,
+		},
+		{
+			name:        "large number",
+			amount:      "1000000.01",
+			decimals:    "6",
+			want:        "1000000010000",
+			expectError: false,
+		},
+		{
+			name:        "invalid amount",
+			amount:      "abc",
+			decimals:    "2",
+			want:        "",
+			expectError: true,
+		},
+		{
+			name:        "invalid decimals",
+			amount:      "123.45",
+			decimals:    "abc",
+			want:        "",
+			expectError: true,
+		},
+		{
+			name:        "zero amount",
+			amount:      "0",
+			decimals:    "2",
+			want:        "0",
+			expectError: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := ParseAndScaleAmount(tt.amount, tt.decimals)
+
+			// Check error cases
+			if tt.expectError {
+				if err == nil {
+					t.Errorf("ParseAndScaleAmount(%q, %q) expected error, got nil", tt.amount, tt.decimals)
+				}
+				return
+			}
+
+			if err != nil {
+				t.Errorf("ParseAndScaleAmount(%q, %q) unexpected error: %v", tt.amount, tt.decimals, err)
+				return
+			}
+
+			if got != tt.want {
+				t.Errorf("ParseAndScaleAmount(%q, %q) = %v, want %v", tt.amount, tt.decimals, got, tt.want)
+			}
+		})
+	}
+}
+
+func TestReadTransactionData(t *testing.T) {
+	sessionId := "session123"
+	publicKey := "0X13242618721"
+	ctx, store := InitializeTestDb(t)
+
+	// Test transaction data
+	transactionData := map[DataTyp]string{
+		DATA_TEMPORARY_VALUE: "0712345678",
+		DATA_ACTIVE_SYM:      "SRF",
+		DATA_AMOUNT:          "1000000",
+		DATA_PUBLIC_KEY:      publicKey,
+		DATA_RECIPIENT:       "0x41c188d63Qa",
+		DATA_ACTIVE_DECIMAL:  "6",
+		DATA_ACTIVE_ADDRESS:  "0xd4c288865Ce",
+	}
+
+	// Store the data
+	for key, value := range transactionData {
+		if err := store.WriteEntry(ctx, sessionId, key, []byte(value)); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	expectedResult := TransactionData{
+		TemporaryValue: "0712345678",
+		ActiveSym:      "SRF",
+		Amount:         "1000000",
+		PublicKey:      publicKey,
+		Recipient:      "0x41c188d63Qa",
+		ActiveDecimal:  "6",
+		ActiveAddress:  "0xd4c288865Ce",
+	}
+
+	data, err := ReadTransactionData(ctx, store, sessionId)
+
+	assert.NoError(t, err)
+	assert.Equal(t, expectedResult, data)
+}

common/transfer_statements.go

@@ -0,0 +1,119 @@
+package common
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	"git.grassecon.net/urdt/ussd/internal/storage"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+)
+
+// TransferMetadata helps organize data fields
+type TransferMetadata struct {
+	Senders        string
+	Recipients     string
+	TransferValues string
+	Addresses      string
+	TxHashes       string
+	Dates          string
+	Symbols        string
+	Decimals       string
+}
+
+// ProcessTransfers converts transfers into formatted strings
+func ProcessTransfers(transfers []dataserviceapi.Last10TxResponse) TransferMetadata {
+	var data TransferMetadata
+	var senders, recipients, transferValues, addresses, txHashes, dates, symbols, decimals []string
+
+	for _, t := range transfers {
+		senders = append(senders, t.Sender)
+		recipients = append(recipients, t.Recipient)
+
+		// Scale down the amount
+		scaledBalance := ScaleDownBalance(t.TransferValue, t.TokenDecimals)
+		transferValues = append(transferValues, scaledBalance)
+
+		addresses = append(addresses, t.ContractAddress)
+		txHashes = append(txHashes, t.TxHash)
+		dates = append(dates, fmt.Sprintf("%s", t.DateBlock))
+		symbols = append(symbols, t.TokenSymbol)
+		decimals = append(decimals, t.TokenDecimals)
+	}
+
+	data.Senders = strings.Join(senders, "\n")
+	data.Recipients = strings.Join(recipients, "\n")
+	data.TransferValues = strings.Join(transferValues, "\n")
+	data.Addresses = strings.Join(addresses, "\n")
+	data.TxHashes = strings.Join(txHashes, "\n")
+	data.Dates = strings.Join(dates, "\n")
+	data.Symbols = strings.Join(symbols, "\n")
+	data.Decimals = strings.Join(decimals, "\n")
+
+	return data
+}
+
+// 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 := []string{"txfrom", "txto", "txval", "txaddr", "txhash", "txdate", "txsym"}
+	data := make(map[string]string)
+
+	for _, key := range keys {
+		value, err := db.Get(ctx, []byte(key))
+		if err != nil {
+			return "", fmt.Errorf("failed to get %s: %v", key, err)
+		}
+		data[key] = string(value)
+	}
+
+	// Split the data
+	senders := strings.Split(string(data["txfrom"]), "\n")
+	recipients := strings.Split(string(data["txto"]), "\n")
+	values := strings.Split(string(data["txval"]), "\n")
+	addresses := strings.Split(string(data["txaddr"]), "\n")
+	hashes := strings.Split(string(data["txhash"]), "\n")
+	dates := strings.Split(string(data["txdate"]), "\n")
+	syms := strings.Split(string(data["txsym"]), "\n")
+
+	// Check if index is within range
+	if index < 1 || index > len(senders) {
+		return "", fmt.Errorf("transaction not found: index %d out of range", index)
+	}
+
+	// Adjust for 0-based indexing
+	i := index - 1
+	transactionType := "received"
+	party := fmt.Sprintf("from: %s", strings.TrimSpace(senders[i]))
+	if strings.TrimSpace(senders[i]) == publicKey {
+		transactionType = "sent"
+		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",
+		transactionType,
+		strings.TrimSpace(values[i]),
+		strings.TrimSpace(syms[i]),
+		party,
+		strings.TrimSpace(addresses[i]),
+		strings.TrimSpace(hashes[i]),
+		formattedDate,
+	)
+
+	return detail, nil
+}
+
+// Helper function to format date in desired output
+func formatDate(dateStr string) string {
+	parsedDate, err := time.Parse("2006-01-02 15:04:05 -0700 MST", dateStr)
+	if err != nil {
+		fmt.Println("Error parsing date:", err)
+		return ""
+	}
+	return parsedDate.Format("2006-01-02 03:04:05 PM")
+}

common/vouchers.go

@@ -3,6 +3,7 @@ package common
 import (
 	"context"
 	"fmt"
+	"math/big"
 	"strings"
 
 	"git.grassecon.net/urdt/ussd/internal/storage"
@@ -24,7 +25,11 @@ func ProcessVouchers(holdings []dataserviceapi.TokenHoldings) VoucherMetadata {
 
 	for i, h := range holdings {
 		symbols = append(symbols, fmt.Sprintf("%d:%s", i+1, h.TokenSymbol))
-		balances = append(balances, fmt.Sprintf("%d:%s", i+1, h.Balance))
+
+		// Scale down the balance
+		scaledBalance := ScaleDownBalance(h.Balance, h.TokenDecimals)
+
+		balances = append(balances, fmt.Sprintf("%d:%s", i+1, scaledBalance))
 		decimals = append(decimals, fmt.Sprintf("%d:%s", i+1, h.TokenDecimals))
 		addresses = append(addresses, fmt.Sprintf("%d:%s", i+1, h.ContractAddress))
 	}
@@ -37,14 +42,25 @@ func ProcessVouchers(holdings []dataserviceapi.TokenHoldings) VoucherMetadata {
 	return data
 }
 
-//func StoreVouchers(db storage.PrefixDb, data VoucherMetadata) {
+func ScaleDownBalance(balance, decimals string) string {
-//		value, err := db.Put(ctx, []byte(key))
+	// Convert balance and decimals to big.Float
-//		if err != nil {
+	bal := new(big.Float)
-//			return nil, fmt.Errorf("failed to get %s: %v", key, err)
+	bal.SetString(balance)
-//		}
+
-//		data[key] = string(value)
+	dec, ok := new(big.Int).SetString(decimals, 10)
-//	}
+	if !ok {
-//}
+		dec = big.NewInt(0) // Default to 0 decimals in case of conversion failure
+	}
+
+	divisor := new(big.Float).SetInt(new(big.Int).Exp(big.NewInt(10), dec, nil))
+	scaledBalance := new(big.Float).Quo(bal, divisor)
+
+	// Return the scaled balance without trailing decimals if it's an integer
+	if scaledBalance.IsInt() {
+		return scaledBalance.Text('f', 0)
+	}
+	return scaledBalance.Text('f', -1)
+}
 
 // GetVoucherData retrieves and matches voucher data
 func GetVoucherData(ctx context.Context, db storage.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) {
@@ -84,7 +100,7 @@ func MatchVoucher(input, symbols, balances, decimals, addresses string) (symbol,
 	decList := strings.Split(decimals, "\n")
 	addrList := strings.Split(addresses, "\n")
 
-	logg.Tracef("found" , "symlist", symList, "syms", symbols, "input", input)
+	logg.Tracef("found", "symlist", symList, "syms", symbols, "input", input)
 	for i, sym := range symList {
 		parts := strings.SplitN(sym, ":", 2)
 
@@ -135,7 +151,7 @@ func GetTemporaryVoucherData(ctx context.Context, store DataStore, sessionId str
 	return data, nil
 }
 
-// UpdateVoucherData sets the active voucher data and clears the temporary 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

@@ -59,13 +59,13 @@ func TestMatchVoucher(t *testing.T) {
 
 func TestProcessVouchers(t *testing.T) {
 	holdings := []dataserviceapi.TokenHoldings{
-		{ContractAddress: "0xd4c288865Ce", TokenSymbol: "SRF", TokenDecimals: "6", Balance: "100"},
+		{ContractAddress: "0xd4c288865Ce", TokenSymbol: "SRF", TokenDecimals: "6", Balance: "100000000"},
-		{ContractAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200"},
+		{ContractAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200000000"},
 	}
 
 	expectedResult := VoucherMetadata{
 		Symbols:   "1:SRF\n2:MILO",
-		Balances:  "1:100\n2:200",
+		Balances:  "1:100\n2:20000",
 		Decimals:  "1:6\n2:4",
 		Addresses: "1:0xd4c288865Ce\n2:0x41c188d63Qa",
 	}

config/config.go

@@ -11,6 +11,7 @@ const (
 	trackStatusPath            = "/api/track"
 	balancePathPrefix          = "/api/account"
 	trackPath                  = "/api/v2/account/status"
+	tokenTransferPrefix        = "/api/v2/token/transfer"
 	voucherHoldingsPathPrefix  = "/api/v1/holdings"
 	voucherTransfersPathPrefix = "/api/v1/transfers/last10"
 	voucherDataPathPrefix      = "/api/v1/token"
@@ -19,8 +20,7 @@ const (
 var (
 	custodialURLBase string
 	dataURLBase      string
-	CustodialAPIKey string
+	BearerToken      string
-	DataAPIKey string
 )
 
 var (
@@ -28,6 +28,7 @@ var (
 	TrackStatusURL      string
 	BalanceURL          string
 	TrackURL            string
+	TokenTransferURL    string
 	VoucherHoldingsURL  string
 	VoucherTransfersURL string
 	VoucherDataURL      string
@@ -38,8 +39,7 @@ func setBase() error {
 
 	custodialURLBase = initializers.GetEnv("CUSTODIAL_URL_BASE", "http://localhost:5003")
 	dataURLBase = initializers.GetEnv("DATA_URL_BASE", "http://localhost:5006")
-	CustodialAPIKey = initializers.GetEnv("CUSTODIAL_API_KEY", "xd")
+	BearerToken = initializers.GetEnv("BEARER_TOKEN", "")
-	DataAPIKey = initializers.GetEnv("DATA_API_KEY", "xd")
 
 	_, err = url.JoinPath(custodialURLBase, "/foo")
 	if err != nil {
@@ -62,6 +62,7 @@ func LoadConfig() error {
 	TrackStatusURL, _ = url.JoinPath(custodialURLBase, trackStatusPath)
 	BalanceURL, _ = url.JoinPath(custodialURLBase, balancePathPrefix)
 	TrackURL, _ = url.JoinPath(custodialURLBase, trackPath)
+	TokenTransferURL, _ = url.JoinPath(custodialURLBase, tokenTransferPrefix)
 	VoucherHoldingsURL, _ = url.JoinPath(dataURLBase, voucherHoldingsPathPrefix)
 	VoucherTransfersURL, _ = url.JoinPath(dataURLBase, voucherTransfersPathPrefix)
 	VoucherDataURL, _ = url.JoinPath(dataURLBase, voucherDataPathPrefix)

dev/dialoguss/sample_user.yaml

@@ -0,0 +1,3 @@
+url: http://localhost:7123
+dial: "*384*96#"
+phoneNumber: +254722123456

dev/docker-compose.yaml

@@ -0,0 +1,21 @@
+services:
+  ussd-pg-store:
+    image: postgres:17-alpine
+    restart: unless-stopped
+    user: postgres
+    environment:
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_USER=postgres
+    volumes:
+      - ./init_db.sql:/docker-entrypoint-initdb.d/init_db.sql
+      - ussd-pg:/var/lib/postgresql/data
+    ports:
+      - "127.0.0.1:5432:5432"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+volumes:
+  ussd-pg:
+    driver: local

dev/init_db.sql

@@ -0,0 +1 @@
+CREATE DATABASE urdt_ussd;

internal/handlers/handlerservice.go

@@ -80,6 +80,7 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountServiceIn
 	ls.DbRs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
 	ls.DbRs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
 	ls.DbRs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
+	ls.DbRs.AddLocalFunc("invite_valid_recipient", ussdHandlers.InviteValidRecipient)
 	ls.DbRs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
 	ls.DbRs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
 	ls.DbRs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
@@ -102,12 +103,13 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountServiceIn
 	ls.DbRs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
 	ls.DbRs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
 	ls.DbRs.AddLocalFunc("quit_with_help", ussdHandlers.QuitWithHelp)
-	ls.DbRs.AddLocalFunc("fetch_custodial_balances", ussdHandlers.FetchCustodialBalances)
+	ls.DbRs.AddLocalFunc("fetch_community_balance", ussdHandlers.FetchCommunityBalance)
 	ls.DbRs.AddLocalFunc("set_default_voucher", ussdHandlers.SetDefaultVoucher)
 	ls.DbRs.AddLocalFunc("check_vouchers", ussdHandlers.CheckVouchers)
 	ls.DbRs.AddLocalFunc("get_vouchers", ussdHandlers.GetVoucherList)
 	ls.DbRs.AddLocalFunc("view_voucher", ussdHandlers.ViewVoucher)
 	ls.DbRs.AddLocalFunc("set_voucher", ussdHandlers.SetVoucher)
+	ls.DbRs.AddLocalFunc("get_voucher_details", ussdHandlers.GetVoucherDetails)
 	ls.DbRs.AddLocalFunc("reset_valid_pin", ussdHandlers.ResetValidPin)
 	ls.DbRs.AddLocalFunc("check_pin_mismatch", ussdHandlers.CheckPinMisMatch)
 	ls.DbRs.AddLocalFunc("validate_blocked_number", ussdHandlers.ValidateBlockedNumber)
@@ -115,6 +117,10 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountServiceIn
 	ls.DbRs.AddLocalFunc("reset_unregistered_number", ussdHandlers.ResetUnregisteredNumber)
 	ls.DbRs.AddLocalFunc("reset_others_pin", ussdHandlers.ResetOthersPin)
 	ls.DbRs.AddLocalFunc("save_others_temporary_pin", ussdHandlers.SaveOthersTemporaryPin)
+	ls.DbRs.AddLocalFunc("get_current_profile_info", ussdHandlers.GetCurrentProfileInfo)
+	ls.DbRs.AddLocalFunc("check_transactions", ussdHandlers.CheckTransactions)
+	ls.DbRs.AddLocalFunc("get_transactions", ussdHandlers.GetTransactionsList)
+	ls.DbRs.AddLocalFunc("view_statement", ussdHandlers.ViewTransactionStatement)
 
 	return ussdHandlers, nil
 }

internal/handlers/ussd/menuhandler.go

@@ -161,6 +161,7 @@ func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (r
 
 	languageSetFlag, err := h.flagManager.GetFlag("flag_language_set")
 	if err != nil {
+		logg.ErrorCtxf(ctx, "Error setting the languageSetFlag", "error", err)
 		return res, err
 	}
 	res.FlagSet = append(res.FlagSet, languageSetFlag)
@@ -198,7 +199,6 @@ func (h *Handlers) createAccountNoExist(ctx context.Context, sessionId string, r
 	}
 	res.FlagSet = append(res.FlagSet, flag_account_created)
 	return nil
-
 }
 
 // CreateAccount checks if any account exists on the JSON data file, and if not
@@ -215,13 +215,15 @@ func (h *Handlers) CreateAccount(ctx context.Context, sym string, input []byte)
 	_, err = store.ReadEntry(ctx, sessionId, common.DATA_ACCOUNT_CREATED)
 	if err != nil {
 		if db.IsNotFound(err) {
-			logg.Printf(logging.LVL_INFO, "Creating an account because it doesn't exist")
+			logg.InfoCtxf(ctx, "Creating an account because it doesn't exist")
 			err = h.createAccountNoExist(ctx, sessionId, &res)
 			if err != nil {
+				logg.ErrorCtxf(ctx, "failed on createAccountNoExist", "error", err)
 				return res, err
 			}
 		}
 	}
+
 	return res, nil
 }
 
@@ -235,10 +237,12 @@ func (h *Handlers) CheckPinMisMatch(ctx context.Context, sym string, input []byt
 	store := h.userdataStore
 	blockedNumber, err := store.ReadEntry(ctx, sessionId, common.DATA_BLOCKED_NUMBER)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read blockedNumber entry with", "key", common.DATA_BLOCKED_NUMBER, "error", err)
 		return res, err
 	}
 	temporaryPin, err := store.ReadEntry(ctx, string(blockedNumber), common.DATA_TEMPORARY_VALUE)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read temporaryPin entry with", "key", common.DATA_TEMPORARY_VALUE, "error", err)
 		return res, err
 	}
 	if bytes.Equal(temporaryPin, input) {
@@ -291,6 +295,7 @@ func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byt
 	store := h.userdataStore
 	err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(accountPIN))
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to write temporaryAccountPIN entry with", "key", common.DATA_TEMPORARY_VALUE, "value", accountPIN, "error", err)
 		return res, err
 	}
 
@@ -308,12 +313,14 @@ func (h *Handlers) SaveOthersTemporaryPin(ctx context.Context, sym string, input
 	}
 	temporaryPin := string(input)
 	blockedNumber, err := store.ReadEntry(ctx, sessionId, common.DATA_BLOCKED_NUMBER)
-
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read blockedNumber entry with", "key", common.DATA_BLOCKED_NUMBER, "error", err)
 		return res, err
 	}
+
 	err = store.WriteEntry(ctx, string(blockedNumber), common.DATA_TEMPORARY_VALUE, []byte(temporaryPin))
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to write temporaryPin entry with", "key", common.DATA_TEMPORARY_VALUE, "value", temporaryPin, "error", err)
 		return res, err
 	}
 
@@ -331,6 +338,7 @@ func (h *Handlers) ConfirmPinChange(ctx context.Context, sym string, input []byt
 	store := h.userdataStore
 	temporaryPin, err := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read temporaryPin entry with", "key", common.DATA_TEMPORARY_VALUE, "error", err)
 		return res, err
 	}
 	if bytes.Equal(temporaryPin, input) {
@@ -340,6 +348,7 @@ func (h *Handlers) ConfirmPinChange(ctx context.Context, sym string, input []byt
 	}
 	err = store.WriteEntry(ctx, sessionId, common.DATA_ACCOUNT_PIN, []byte(temporaryPin))
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to write temporaryPin entry with", "key", common.DATA_ACCOUNT_PIN, "value", temporaryPin, "error", err)
 		return res, err
 	}
 	return res, nil
@@ -362,6 +371,7 @@ func (h *Handlers) VerifyCreatePin(ctx context.Context, sym string, input []byte
 	store := h.userdataStore
 	temporaryPin, err := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read temporaryPin entry with", "key", common.DATA_TEMPORARY_VALUE, "error", err)
 		return res, err
 	}
 	if bytes.Equal(input, temporaryPin) {
@@ -374,6 +384,7 @@ func (h *Handlers) VerifyCreatePin(ctx context.Context, sym string, input []byte
 
 	err = store.WriteEntry(ctx, sessionId, common.DATA_ACCOUNT_PIN, []byte(temporaryPin))
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to write temporaryPin entry with", "key", common.DATA_ACCOUNT_PIN, "value", temporaryPin, "error", err)
 		return res, err
 	}
 
@@ -406,11 +417,13 @@ func (h *Handlers) SaveFirstname(ctx context.Context, sym string, input []byte)
 		temporaryFirstName, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 		err = store.WriteEntry(ctx, sessionId, common.DATA_FIRST_NAME, []byte(temporaryFirstName))
 		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to write firstName entry with", "key", common.DATA_FIRST_NAME, "value", temporaryFirstName, "error", err)
 			return res, err
 		}
 	} else {
 		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(firstName))
 		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to write temporaryFirstName entry with", "key", common.DATA_TEMPORARY_VALUE, "value", firstName, "error", err)
 			return res, err
 		}
 	}
@@ -437,14 +450,17 @@ func (h *Handlers) SaveFamilyname(ctx context.Context, sym string, input []byte)
 		temporaryFamilyName, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 		err = store.WriteEntry(ctx, sessionId, common.DATA_FAMILY_NAME, []byte(temporaryFamilyName))
 		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to write familyName entry with", "key", common.DATA_FAMILY_NAME, "value", temporaryFamilyName, "error", err)
 			return res, err
 		}
 	} else {
 		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(familyName))
 		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to write temporaryFamilyName entry with", "key", common.DATA_TEMPORARY_VALUE, "value", familyName, "error", err)
 			return res, err
 		}
 	}
+
 	return res, nil
 }
 
@@ -465,11 +481,13 @@ func (h *Handlers) SaveYob(ctx context.Context, sym string, input []byte) (resou
 		temporaryYob, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 		err = store.WriteEntry(ctx, sessionId, common.DATA_YOB, []byte(temporaryYob))
 		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to write yob entry with", "key", common.DATA_TEMPORARY_VALUE, "value", temporaryYob, "error", err)
 			return res, err
 		}
 	} else {
 		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(yob))
 		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to write temporaryYob entry with", "key", common.DATA_TEMPORARY_VALUE, "value", yob, "error", err)
 			return res, err
 		}
 	}
@@ -495,11 +513,13 @@ func (h *Handlers) SaveLocation(ctx context.Context, sym string, input []byte) (
 		temporaryLocation, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 		err = store.WriteEntry(ctx, sessionId, common.DATA_LOCATION, []byte(temporaryLocation))
 		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to write location entry with", "key", common.DATA_LOCATION, "value", temporaryLocation, "error", err)
 			return res, err
 		}
 	} else {
 		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(location))
 		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to write temporaryLocation entry with", "key", common.DATA_TEMPORARY_VALUE, "value", location, "error", err)
 			return res, err
 		}
 	}
@@ -525,11 +545,13 @@ func (h *Handlers) SaveGender(ctx context.Context, sym string, input []byte) (re
 		temporaryGender, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 		err = store.WriteEntry(ctx, sessionId, common.DATA_GENDER, []byte(temporaryGender))
 		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to write gender entry with", "key", common.DATA_GENDER, "value", gender, "error", err)
 			return res, err
 		}
 	} else {
 		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(gender))
 		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to write temporaryGender entry with", "key", common.DATA_TEMPORARY_VALUE, "value", gender, "error", err)
 			return res, err
 		}
 	}
@@ -556,11 +578,13 @@ func (h *Handlers) SaveOfferings(ctx context.Context, sym string, input []byte)
 		temporaryOfferings, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 		err = store.WriteEntry(ctx, sessionId, common.DATA_OFFERINGS, []byte(temporaryOfferings))
 		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to write offerings entry with", "key", common.DATA_TEMPORARY_VALUE, "value", offerings, "error", err)
 			return res, err
 		}
 	} else {
 		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(offerings))
 		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to write temporaryOfferings entry with", "key", common.DATA_TEMPORARY_VALUE, "value", offerings, "error", err)
 			return res, err
 		}
 	}
@@ -571,9 +595,7 @@ func (h *Handlers) SaveOfferings(ctx context.Context, sym string, input []byte)
 // ResetAllowUpdate resets the allowupdate flag that allows a user to update  profile data.
 func (h *Handlers) ResetAllowUpdate(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
-
 	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
-
 	res.FlagReset = append(res.FlagReset, flag_allow_update)
 	return res, nil
 }
@@ -590,7 +612,6 @@ func (h *Handlers) ResetValidPin(ctx context.Context, sym string, input []byte)
 func (h *Handlers) ResetAccountAuthorized(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
-
 	res.FlagReset = append(res.FlagReset, flag_account_authorized)
 	return res, nil
 }
@@ -626,6 +647,7 @@ func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (res
 	store := h.userdataStore
 	AccountPin, err := store.ReadEntry(ctx, sessionId, common.DATA_ACCOUNT_PIN)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read AccountPin entry with", "key", common.DATA_ACCOUNT_PIN, "error", err)
 		return res, err
 	}
 	if len(input) == 4 {
@@ -673,18 +695,19 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
 	store := h.userdataStore
 	publicKey, err := store.ReadEntry(ctx, sessionId, common.DATA_PUBLIC_KEY)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", common.DATA_PUBLIC_KEY, "error", err)
 		return res, err
 	}
-	r, err := h.accountService.TrackAccountStatus(ctx, string(publicKey))
 
+	r, err := h.accountService.TrackAccountStatus(ctx, string(publicKey))
 	if err != nil {
 		res.FlagSet = append(res.FlagSet, flag_api_error)
+		logg.ErrorCtxf(ctx, "failed on TrackAccountStatus", "error", err)
 		return res, err
 	}
+
 	res.FlagReset = append(res.FlagReset, flag_api_error)
-	if !ok {
+
-		return res, err
-	}
 	if r.Active {
 		res.FlagSet = append(res.FlagSet, flag_account_success)
 		res.FlagReset = append(res.FlagReset, flag_account_pending)
@@ -692,6 +715,7 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
 		res.FlagReset = append(res.FlagReset, flag_account_success)
 		res.FlagSet = append(res.FlagSet, flag_account_pending)
 	}
+
 	return res, nil
 }
 
@@ -783,11 +807,13 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 			return res, nil
 		}
 
+		logg.ErrorCtxf(ctx, "failed to read activeSym entry with", "key", common.DATA_ACTIVE_SYM, "error", err)
 		return res, err
 	}
 
 	activeBal, err := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_BAL)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read activeBal entry with", "key", common.DATA_ACTIVE_BAL, "error", err)
 		return res, err
 	}
 
@@ -796,41 +822,14 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 	return res, nil
 }
 
-func (h *Handlers) FetchCustodialBalances(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+func (h *Handlers) FetchCommunityBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
-
+	code := codeFromCtx(ctx)
-	flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
+	l := gotext.NewLocale(translationDir, code)
-
+	l.AddDomain("default")
-	sessionId, ok := ctx.Value("SessionId").(string)
+	//TODO:
-	if !ok {
+	//Check if the address is a community account,if then,get the actual balance
-		return res, fmt.Errorf("missing session")
+	res.Content = l.Get("Community Balance: 0.00")
-	}
-	symbol, _ := h.st.Where()
-	balanceType := strings.Split(symbol, "_")[0]
-
-	store := h.userdataStore
-	publicKey, err := store.ReadEntry(ctx, sessionId, common.DATA_PUBLIC_KEY)
-	if err != nil {
-		return res, err
-	}
-
-	balanceResponse, err := h.accountService.CheckBalance(ctx, string(publicKey))
-	if err != nil {
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		return res, nil
-	}
-	res.FlagReset = append(res.FlagReset, flag_api_error)
-
-	balance := balanceResponse.Balance
-
-	switch balanceType {
-	case "my":
-		res.Content = fmt.Sprintf("Your balance is %s", balance)
-	case "community":
-		res.Content = fmt.Sprintf("Your community balance is %s", balance)
-	default:
-		break
-	}
 	return res, nil
 }
 
@@ -843,16 +842,19 @@ func (h *Handlers) ResetOthersPin(ctx context.Context, sym string, input []byte)
 	}
 	blockedPhonenumber, err := store.ReadEntry(ctx, sessionId, common.DATA_BLOCKED_NUMBER)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read blockedPhonenumber entry with", "key", common.DATA_BLOCKED_NUMBER, "error", err)
 		return res, err
 	}
 	temporaryPin, err := store.ReadEntry(ctx, string(blockedPhonenumber), common.DATA_TEMPORARY_VALUE)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read temporaryPin entry with", "key", common.DATA_TEMPORARY_VALUE, "error", err)
 		return res, err
 	}
 	err = store.WriteEntry(ctx, string(blockedPhonenumber), common.DATA_ACCOUNT_PIN, []byte(temporaryPin))
 	if err != nil {
 		return res, nil
 	}
+
 	return res, nil
 }
 
@@ -881,10 +883,11 @@ func (h *Handlers) ValidateBlockedNumber(ctx context.Context, sym string, input
 	}
 	if err != nil {
 		if db.IsNotFound(err) {
-			logg.Printf(logging.LVL_INFO, "Invalid or unregistered number")
+			logg.InfoCtxf(ctx, "Invalid or unregistered number")
 			res.FlagSet = append(res.FlagSet, flag_unregistered_number)
 			return res, nil
 		} else {
+			logg.ErrorCtxf(ctx, "Error on ValidateBlockedNumber", "error", err)
 			return res, err
 		}
 	}
@@ -899,6 +902,7 @@ func (h *Handlers) ValidateBlockedNumber(ctx context.Context, sym string, input
 func (h *Handlers) ValidateRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	var err error
+	store := h.userdataStore
 
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
@@ -908,18 +912,41 @@ func (h *Handlers) ValidateRecipient(ctx context.Context, sym string, input []by
 	recipient := string(input)
 
 	flag_invalid_recipient, _ := h.flagManager.GetFlag("flag_invalid_recipient")
+	flag_invalid_recipient_with_invite, _ := h.flagManager.GetFlag("flag_invalid_recipient_with_invite")
 
 	if recipient != "0" {
-		// mimic invalid number check
+		if !isValidPhoneNumber(recipient) {
-		if recipient == "000" {
 			res.FlagSet = append(res.FlagSet, flag_invalid_recipient)
 			res.Content = recipient
 
 			return res, nil
 		}
-		store := h.userdataStore
+
-		err = store.WriteEntry(ctx, sessionId, common.DATA_RECIPIENT, []byte(recipient))
+		// save the recipient as the temporaryRecipient
+		err = store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(recipient))
 		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to write temporaryRecipient entry with", "key", common.DATA_TEMPORARY_VALUE, "value", recipient, "error", err)
+			return res, err
+		}
+
+		publicKey, err := store.ReadEntry(ctx, recipient, common.DATA_PUBLIC_KEY)
+		if err != nil {
+			if db.IsNotFound(err) {
+				logg.InfoCtxf(ctx, "Unregistered number")
+
+				res.FlagSet = append(res.FlagSet, flag_invalid_recipient_with_invite)
+				res.Content = recipient
+
+				return res, nil
+			}
+
+			logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", common.DATA_PUBLIC_KEY, "error", err)
+			return res, err
+		}
+
+		err = store.WriteEntry(ctx, sessionId, common.DATA_RECIPIENT, publicKey)
+		if err != nil {
+			logg.ErrorCtxf(ctx, "failed to write recipient entry with", "key", common.DATA_RECIPIENT, "value", string(publicKey), "error", err)
 			return res, nil
 		}
 	}
@@ -956,6 +983,31 @@ func (h *Handlers) TransactionReset(ctx context.Context, sym string, input []byt
 	return res, nil
 }
 
+// InviteValidRecipient sends an invitation to the valid phone number.
+func (h *Handlers) InviteValidRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	store := h.userdataStore
+
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	code := codeFromCtx(ctx)
+	l := gotext.NewLocale(translationDir, code)
+	l.AddDomain("default")
+
+	recipient, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
+
+	// TODO
+	// send an invitation SMS
+	// if successful
+	// res.Content = l.Get("Your invitation to %s to join Sarafu Network has been sent.",  string(recipient))
+
+	res.Content = l.Get("Your invite request for %s to Sarafu Network failed. Please try again later.", string(recipient))
+	return res, nil
+}
+
 // ResetTransactionAmount resets the transaction amount and invalid flag
 func (h *Handlers) ResetTransactionAmount(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
@@ -992,6 +1044,7 @@ func (h *Handlers) MaxAmount(ctx context.Context, sym string, input []byte) (res
 
 	activeBal, err := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_BAL)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read activeBal entry with", "key", common.DATA_ACTIVE_BAL, "error", err)
 		return res, err
 	}
 
@@ -1017,10 +1070,12 @@ func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte)
 	// retrieve the active balance
 	activeBal, err := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_BAL)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read activeBal entry with", "key", common.DATA_ACTIVE_BAL, "error", err)
 		return res, err
 	}
 	balanceValue, err = strconv.ParseFloat(string(activeBal), 64)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "Failed to convert the activeBal to a float", "error", err)
 		return res, err
 	}
 
@@ -1043,14 +1098,15 @@ func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte)
 	formattedAmount := fmt.Sprintf("%.2f", inputAmount)
 	err = store.WriteEntry(ctx, sessionId, common.DATA_AMOUNT, []byte(formattedAmount))
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to write amount entry with", "key", common.DATA_AMOUNT, "value", formattedAmount, "error", err)
 		return res, err
 	}
 
-	res.Content = fmt.Sprintf("%s", formattedAmount)
+	res.Content = formattedAmount
 	return res, nil
 }
 
-// GetRecipient returns the transaction recipient from the gdbm.
+// GetRecipient returns the transaction recipient phone number from the gdbm.
 func (h *Handlers) GetRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 
@@ -1059,7 +1115,7 @@ func (h *Handlers) GetRecipient(ctx context.Context, sym string, input []byte) (
 		return res, fmt.Errorf("missing session")
 	}
 	store := h.userdataStore
-	recipient, _ := store.ReadEntry(ctx, sessionId, common.DATA_RECIPIENT)
+	recipient, _ := store.ReadEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE)
 
 	res.Content = string(recipient)
 
@@ -1091,7 +1147,7 @@ func (h *Handlers) GetSender(ctx context.Context, sym string, input []byte) (res
 		return res, fmt.Errorf("missing session")
 	}
 
-	res.Content = string(sessionId)
+	res.Content = sessionId
 
 	return res, nil
 }
@@ -1109,6 +1165,7 @@ func (h *Handlers) GetAmount(ctx context.Context, sym string, input []byte) (res
 	// retrieve the active symbol
 	activeSym, err := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_SYM)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read activeSym entry with", "key", common.DATA_ACTIVE_SYM, "error", err)
 		return res, err
 	}
 
@@ -1119,8 +1176,7 @@ func (h *Handlers) GetAmount(ctx context.Context, sym string, input []byte) (res
 	return res, nil
 }
 
-// InitiateTransaction returns a confirmation and resets the transaction data
+// InitiateTransaction calls the TokenTransfer and returns a confirmation based on the result
-// on the gdbm store.
 func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	var err error
@@ -1129,27 +1185,139 @@ func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []
 		return res, fmt.Errorf("missing session")
 	}
 
+	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
+
 	code := codeFromCtx(ctx)
 	l := gotext.NewLocale(translationDir, code)
 	l.AddDomain("default")
-	// TODO
-	// Use the amount, recipient and sender to call the API and initialize the transaction
-	store := h.userdataStore
 
-	amount, _ := store.ReadEntry(ctx, sessionId, common.DATA_AMOUNT)
+	data, err := common.ReadTransactionData(ctx, h.userdataStore, sessionId)
-
-	recipient, _ := store.ReadEntry(ctx, sessionId, common.DATA_RECIPIENT)
-
-	activeSym, _ := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_SYM)
-
-	res.Content = l.Get("Your request has been sent. %s will receive %s %s from %s.", string(recipient), string(amount), string(activeSym), string(sessionId))
-
-	account_authorized_flag, err := h.flagManager.GetFlag("flag_account_authorized")
 	if err != nil {
 		return res, err
 	}
 
-	res.FlagReset = append(res.FlagReset, account_authorized_flag)
+	finalAmountStr, err := common.ParseAndScaleAmount(data.Amount, data.ActiveDecimal)
+	if err != nil {
+		return res, err
+	}
+
+	// Call TokenTransfer
+	r, err := h.accountService.TokenTransfer(ctx, finalAmountStr, data.PublicKey, data.Recipient, data.ActiveAddress)
+	if err != nil {
+		flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
+		res.FlagSet = append(res.FlagSet, flag_api_error)
+		res.Content = l.Get("Your request failed. Please try again later.")
+		logg.ErrorCtxf(ctx, "failed on TokenTransfer", "error", err)
+		return res, nil
+	}
+
+	trackingId := r.TrackingId
+	logg.InfoCtxf(ctx, "TokenTransfer", "trackingId", trackingId)
+
+	res.Content = l.Get(
+		"Your request has been sent. %s will receive %s %s from %s.",
+		data.TemporaryValue,
+		data.Amount,
+		data.ActiveSym,
+		sessionId,
+	)
+
+	res.FlagReset = append(res.FlagReset, flag_account_authorized)
+	return res, nil
+}
+
+func (h *Handlers) GetCurrentProfileInfo(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	var profileInfo []byte
+	var err error
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+	sm, _ := h.st.Where()
+	parts := strings.SplitN(sm, "_", 2)
+	filename := parts[1]
+	dbKeyStr := "DATA_" + strings.ToUpper(filename)
+	dbKey, err := common.StringToDataTyp(dbKeyStr)
+
+	if err != nil {
+		return res, err
+	}
+	store := h.userdataStore
+
+	switch dbKey {
+	case common.DATA_FIRST_NAME:
+		profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_FIRST_NAME)
+		if err != nil {
+			if db.IsNotFound(err) {
+				res.Content = "Not provided"
+				break
+			}
+			logg.ErrorCtxf(ctx, "Failed to read first name entry with", "key", "error", common.DATA_FIRST_NAME, err)
+			return res, err
+		}
+		res.Content = string(profileInfo)
+	case common.DATA_FAMILY_NAME:
+		profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_FAMILY_NAME)
+		if err != nil {
+			if db.IsNotFound(err) {
+				res.Content = "Not provided"
+				break
+			}
+			logg.ErrorCtxf(ctx, "Failed to read family name entry with", "key", "error", common.DATA_FAMILY_NAME, err)
+			return res, err
+		}
+		res.Content = string(profileInfo)
+
+	case common.DATA_GENDER:
+		profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_GENDER)
+		if err != nil {
+			if db.IsNotFound(err) {
+				res.Content = "Not provided"
+				break
+			}
+			logg.ErrorCtxf(ctx, "Failed to read gender entry with", "key", "error", common.DATA_GENDER, err)
+			return res, err
+		}
+		res.Content = string(profileInfo)
+	case common.DATA_YOB:
+		profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_YOB)
+		if err != nil {
+			if db.IsNotFound(err) {
+				res.Content = "Not provided"
+				break
+			}
+			logg.ErrorCtxf(ctx, "Failed to read year of birth(yob) entry with", "key", "error", common.DATA_YOB, err)
+			return res, err
+		}
+		res.Content = string(profileInfo)
+
+	case common.DATA_LOCATION:
+		profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_LOCATION)
+		if err != nil {
+			if db.IsNotFound(err) {
+				res.Content = "Not provided"
+				break
+			}
+			logg.ErrorCtxf(ctx, "Failed to read location entry with", "key", "error", common.DATA_LOCATION, err)
+			return res, err
+		}
+		res.Content = string(profileInfo)
+	case common.DATA_OFFERINGS:
+		profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_OFFERINGS)
+		if err != nil {
+			if db.IsNotFound(err) {
+				res.Content = "Not provided"
+				break
+			}
+			logg.ErrorCtxf(ctx, "Failed to read offerings entry with", "key", "error", common.DATA_OFFERINGS, err)
+			return res, err
+		}
+		res.Content = string(profileInfo)
+	default:
+		break
+	}
+
 	return res, nil
 }
 
@@ -1248,6 +1416,7 @@ func (h *Handlers) SetDefaultVoucher(ctx context.Context, sym string, input []by
 		if db.IsNotFound(err) {
 			publicKey, err := store.ReadEntry(ctx, sessionId, common.DATA_PUBLIC_KEY)
 			if err != nil {
+				logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", common.DATA_PUBLIC_KEY, "error", err)
 				return res, err
 			}
 
@@ -1268,21 +1437,41 @@ func (h *Handlers) SetDefaultVoucher(ctx context.Context, sym string, input []by
 			firstVoucher := vouchersResp[0]
 			defaultSym := firstVoucher.TokenSymbol
 			defaultBal := firstVoucher.Balance
+			defaultDec := firstVoucher.TokenDecimals
+			defaultAddr := firstVoucher.ContractAddress
+
+			// Scale down the balance
+			scaledBalance := common.ScaleDownBalance(defaultBal, defaultDec)
 
 			// set the active symbol
 			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_SYM, []byte(defaultSym))
 			if err != nil {
+				logg.ErrorCtxf(ctx, "failed to write defaultSym entry with", "key", common.DATA_ACTIVE_SYM, "value", defaultSym, "error", err)
 				return res, err
 			}
 			// set the active balance
-			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_BAL, []byte(defaultBal))
+			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_BAL, []byte(scaledBalance))
 			if err != nil {
+				logg.ErrorCtxf(ctx, "failed to write defaultBal entry with", "key", common.DATA_ACTIVE_BAL, "value", scaledBalance, "error", err)
+				return res, err
+			}
+			// set the active decimals
+			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_DECIMAL, []byte(defaultDec))
+			if err != nil {
+				logg.ErrorCtxf(ctx, "failed to write defaultDec entry with", "key", common.DATA_ACTIVE_DECIMAL, "value", defaultDec, "error", err)
+				return res, err
+			}
+			// set the active contract address
+			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_ADDRESS, []byte(defaultAddr))
+			if err != nil {
+				logg.ErrorCtxf(ctx, "failed to write defaultAddr entry with", "key", common.DATA_ACTIVE_ADDRESS, "value", defaultAddr, "error", err)
 				return res, err
 			}
 
 			return res, nil
 		}
 
+		logg.ErrorCtxf(ctx, "failed to read activeSym entry with", "key", common.DATA_ACTIVE_SYM, "error", err)
 		return res, err
 	}
 
@@ -1303,7 +1492,8 @@ func (h *Handlers) CheckVouchers(ctx context.Context, sym string, input []byte)
 	store := h.userdataStore
 	publicKey, err := store.ReadEntry(ctx, sessionId, common.DATA_PUBLIC_KEY)
 	if err != nil {
-		return res, nil
+		logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", common.DATA_PUBLIC_KEY, "error", err)
+		return res, err
 	}
 
 	// Fetch vouchers from the API using the public key
@@ -1338,6 +1528,7 @@ func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte)
 	// Read vouchers from the store
 	voucherData, err := h.prefixDb.Get(ctx, []byte("sym"))
 	if err != nil {
+		logg.ErrorCtxf(ctx, "Failed to read the voucherData from prefixDb", "error", err)
 		return res, err
 	}
 
@@ -1347,6 +1538,7 @@ func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte)
 }
 
 // ViewVoucher retrieves the token holding and balance from the subprefixDB
+// and displays it to the user for them to select it
 func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	sessionId, ok := ctx.Value("SessionId").(string)
@@ -1373,6 +1565,7 @@ func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (r
 	}
 
 	if err := common.StoreTemporaryVoucher(ctx, h.userdataStore, sessionId, metadata); err != nil {
+		logg.ErrorCtxf(ctx, "failed on StoreTemporaryVoucher", "error", err)
 		return res, err
 	}
 
@@ -1394,14 +1587,218 @@ func (h *Handlers) SetVoucher(ctx context.Context, sym string, input []byte) (re
 	// Get temporary data
 	tempData, err := common.GetTemporaryVoucherData(ctx, h.userdataStore, sessionId)
 	if err != nil {
+		logg.ErrorCtxf(ctx, "failed on GetTemporaryVoucherData", "error", err)
 		return res, err
 	}
 
 	// Set as active and clear temporary data
 	if err := common.UpdateVoucherData(ctx, h.userdataStore, sessionId, tempData); err != nil {
+		logg.ErrorCtxf(ctx, "failed on UpdateVoucherData", "error", err)
 		return res, err
 	}
 
 	res.Content = tempData.TokenSymbol
 	return res, nil
 }
+
+// GetVoucherDetails retrieves the voucher details
+func (h *Handlers) GetVoucherDetails(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	store := h.userdataStore
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
+
+	// get the active address
+	activeAddress, err := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_ADDRESS)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read activeAddress entry with", "key", common.DATA_ACTIVE_ADDRESS, "error", err)
+		return res, err
+	}
+
+	// use the voucher contract address to get the data from the API
+	voucherData, err := h.accountService.VoucherData(ctx, string(activeAddress))
+	if err != nil {
+		res.FlagSet = append(res.FlagSet, flag_api_error)
+		return res, nil
+	}
+
+	tokenSymbol := voucherData.TokenSymbol
+	tokenName := voucherData.TokenName
+
+	res.Content = fmt.Sprintf("%s %s", tokenSymbol, tokenName)
+
+	return res, nil
+}
+
+// CheckTransactions retrieves the transactions from the API using the "PublicKey" and stores to prefixDb
+func (h *Handlers) CheckTransactions(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	flag_no_transfers, _ := h.flagManager.GetFlag("flag_no_transfers")
+	flag_api_error, _ := h.flagManager.GetFlag("flag_api_error")
+
+	store := h.userdataStore
+	publicKey, err := store.ReadEntry(ctx, sessionId, common.DATA_PUBLIC_KEY)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", common.DATA_PUBLIC_KEY, "error", err)
+		return res, err
+	}
+
+	// Fetch transactions from the API using the public key
+	transactionsResp, err := h.accountService.FetchTransactions(ctx, string(publicKey))
+	if err != nil {
+		res.FlagSet = append(res.FlagSet, flag_api_error)
+		logg.ErrorCtxf(ctx, "failed on FetchTransactions", "error", err)
+		return res, err
+	}
+
+	// Return if there are no transactions
+	if len(transactionsResp) == 0 {
+		res.FlagSet = append(res.FlagSet, flag_no_transfers)
+		return res, nil
+	}
+
+	data := common.ProcessTransfers(transactionsResp)
+
+	// Store all transaction data
+	dataMap := map[string]string{
+		"txfrom": data.Senders,
+		"txto":   data.Recipients,
+		"txval":  data.TransferValues,
+		"txaddr": data.Addresses,
+		"txhash": data.TxHashes,
+		"txdate": data.Dates,
+		"txsym":  data.Symbols,
+		"txdeci": data.Decimals,
+	}
+
+	for key, value := range dataMap {
+		if err := h.prefixDb.Put(ctx, []byte(key), []byte(value)); err != nil {
+			logg.ErrorCtxf(ctx, "failed to write to prefixDb", "error", err)
+			return res, err
+		}
+	}
+
+	res.FlagReset = append(res.FlagReset, flag_no_transfers)
+
+	return res, nil
+}
+
+// GetTransactionsList fetches the list of transactions 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")
+	}
+	store := h.userdataStore
+	publicKey, err := store.ReadEntry(ctx, sessionId, common.DATA_PUBLIC_KEY)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", common.DATA_PUBLIC_KEY, "error", err)
+		return res, err
+	}
+
+	// Read transactions from the store and format them
+	TransactionSenders, err := h.prefixDb.Get(ctx, []byte("txfrom"))
+	if err != nil {
+		logg.ErrorCtxf(ctx, "Failed to read the TransactionSenders from prefixDb", "error", err)
+		return res, err
+	}
+	TransactionSyms, err := h.prefixDb.Get(ctx, []byte("txsym"))
+	if err != nil {
+		logg.ErrorCtxf(ctx, "Failed to read the TransactionSyms from prefixDb", "error", err)
+		return res, err
+	}
+	TransactionValues, err := h.prefixDb.Get(ctx, []byte("txval"))
+	if err != nil {
+		logg.ErrorCtxf(ctx, "Failed to read the TransactionValues from prefixDb", "error", err)
+		return res, err
+	}
+	TransactionDates, err := h.prefixDb.Get(ctx, []byte("txdate"))
+	if err != nil {
+		logg.ErrorCtxf(ctx, "Failed to read the TransactionDates from prefixDb", "error", err)
+		return res, err
+	}
+
+	// Parse the data
+	senders := strings.Split(string(TransactionSenders), "\n")
+	syms := strings.Split(string(TransactionSyms), "\n")
+	values := strings.Split(string(TransactionValues), "\n")
+	dates := strings.Split(string(TransactionDates), "\n")
+
+	var formattedTransactions []string
+	for i := 0; i < len(senders); i++ {
+		sender := strings.TrimSpace(senders[i])
+		sym := strings.TrimSpace(syms[i])
+		value := strings.TrimSpace(values[i])
+		date := strings.Split(strings.TrimSpace(dates[i]), " ")[0]
+
+		status := "received"
+		if sender == string(publicKey) {
+			status = "sent"
+		}
+
+		formattedTransactions = append(formattedTransactions, fmt.Sprintf("%d:%s %s %s %s", i+1, status, value, sym, date))
+	}
+
+	res.Content = strings.Join(formattedTransactions, "\n")
+
+	return res, nil
+}
+
+// ViewTransactionStatement retrieves the transaction statement
+// and displays it to the user
+func (h *Handlers) ViewTransactionStatement(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+	store := h.userdataStore
+	publicKey, err := store.ReadEntry(ctx, sessionId, common.DATA_PUBLIC_KEY)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", common.DATA_PUBLIC_KEY, "error", err)
+		return res, err
+	}
+
+	flag_incorrect_statement, _ := h.flagManager.GetFlag("flag_incorrect_statement")
+
+	inputStr := string(input)
+	if inputStr == "0" || inputStr == "99" || inputStr == "11" || inputStr == "22" {
+		res.FlagReset = append(res.FlagReset, flag_incorrect_statement)
+		return res, nil
+	}
+
+	// Convert input string to integer
+	index, err := strconv.Atoi(strings.TrimSpace(inputStr))
+	if err != nil {
+		return res, fmt.Errorf("invalid input: must be a number between 1 and 10")
+	}
+
+	if index < 1 || index > 10 {
+		return res, fmt.Errorf("invalid input: index must be between 1 and 10")
+	}
+
+	statement, err := common.GetTransferData(ctx, h.prefixDb, string(publicKey), index)
+	if err != nil {
+		return res, fmt.Errorf("failed to retrieve transfer data: %v", err)
+	}
+
+	if statement == "" {
+		res.FlagSet = append(res.FlagSet, flag_incorrect_statement)
+		return res, nil
+	}
+
+	res.FlagReset = append(res.FlagReset, flag_incorrect_statement)
+	res.Content = statement
+
+	return res, nil
+}

internal/handlers/ussd/menuhandler_test.go

@@ -2,7 +2,6 @@ package ussd
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"log"
 	"path"
@@ -586,9 +585,9 @@ func TestGetRecipient(t *testing.T) {
 	ctx, store := InitializeTestStore(t)
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
-	recepient := "0xcasgatweksalw1018221"
+	recepient := "0712345678"
 
-	err := store.WriteEntry(ctx, sessionId, common.DATA_RECIPIENT, []byte(recepient))
+	err := store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(recepient))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1227,31 +1226,40 @@ func TestInitiateTransaction(t *testing.T) {
 
 	tests := []struct {
 		name             string
-		input          []byte
+		TemporaryValue   []byte
-		Recipient      []byte
-		Amount         []byte
 		ActiveSym        []byte
-		status         string
+		StoredAmount     []byte
+		TransferAmount   string
+		PublicKey        []byte
+		Recipient        []byte
+		ActiveDecimal    []byte
+		ActiveAddress    []byte
+		TransferResponse *models.TokenTransferResponse
 		expectedResult   resource.Result
 	}{
 		{
 			name:           "Test initiate transaction",
-			Amount:    []byte("0.002"),
+			TemporaryValue: []byte("0711223344"),
 			ActiveSym:      []byte("SRF"),
+			StoredAmount:   []byte("1.00"),
+			TransferAmount: "1000000",
+			PublicKey:      []byte("0X13242618721"),
 			Recipient:      []byte("0x12415ass27192"),
+			ActiveDecimal:  []byte("6"),
+			ActiveAddress:  []byte("0xd4c288865Ce"),
+			TransferResponse: &models.TokenTransferResponse{
+				TrackingId: "1234567890",
+			},
 			expectedResult: resource.Result{
 				FlagReset: []uint32{account_authorized_flag},
-				Content:   "Your request has been sent. 0x12415ass27192 will receive 0.002 SRF from 254712345678.",
+				Content:   "Your request has been sent. 0711223344 will receive 1.00 SRF from 254712345678.",
 			},
 		},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			err := store.WriteEntry(ctx, sessionId, common.DATA_AMOUNT, []byte(tt.Amount))
+			err := store.WriteEntry(ctx, sessionId, common.DATA_TEMPORARY_VALUE, []byte(tt.TemporaryValue))
-			if err != nil {
-				t.Fatal(err)
-			}
-			err = store.WriteEntry(ctx, sessionId, common.DATA_RECIPIENT, []byte(tt.Recipient))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -1259,9 +1267,31 @@ func TestInitiateTransaction(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
+			err = store.WriteEntry(ctx, sessionId, common.DATA_AMOUNT, []byte(tt.StoredAmount))
+			if err != nil {
+				t.Fatal(err)
+			}
+			err = store.WriteEntry(ctx, sessionId, common.DATA_PUBLIC_KEY, []byte(tt.PublicKey))
+			if err != nil {
+				t.Fatal(err)
+			}
+			err = store.WriteEntry(ctx, sessionId, common.DATA_RECIPIENT, []byte(tt.Recipient))
+			if err != nil {
+				t.Fatal(err)
+			}
+			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_DECIMAL, []byte(tt.ActiveDecimal))
+			if err != nil {
+				t.Fatal(err)
+			}
+			err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_ADDRESS, []byte(tt.ActiveAddress))
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			mockAccountService.On("TokenTransfer").Return(tt.TransferResponse, nil)
 
 			// Call the method under test
-			res, _ := h.InitiateTransaction(ctx, "transaction_reset_amount", tt.input)
+			res, _ := h.InitiateTransaction(ctx, "transaction_reset_amount", []byte(""))
 
 			// Assert that no errors occurred
 			assert.NoError(t, err)
@@ -1453,10 +1483,12 @@ func TestValidateRecipient(t *testing.T) {
 	}
 
 	sessionId := "session123"
+	publicKey := "0X13242618721"
 	ctx, store := InitializeTestStore(t)
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
 	flag_invalid_recipient, _ := fm.parser.GetFlag("flag_invalid_recipient")
+	flag_invalid_recipient_with_invite, _ := fm.parser.GetFlag("flag_invalid_recipient_with_invite")
 
 	// Define test cases
 	tests := []struct {
@@ -1466,19 +1498,33 @@ func TestValidateRecipient(t *testing.T) {
 	}{
 		{
 			name:  "Test with invalid recepient",
-			input: []byte("000"),
+			input: []byte("9234adf5"),
 			expectedResult: resource.Result{
 				FlagSet: []uint32{flag_invalid_recipient},
-				Content: "000",
+				Content: "9234adf5",
 			},
 		},
 		{
-			name:           "Test with valid recepient",
+			name:  "Test with valid unregistered recepient",
-			input:          []byte("0705X2"),
+			input: []byte("0712345678"),
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_invalid_recipient_with_invite},
+				Content: "0712345678",
+			},
+		},
+		{
+			name:           "Test with valid registered recepient",
+			input:          []byte("0711223344"),
 			expectedResult: resource.Result{},
 		},
 	}
 
+	// store a public key for the valid recipient
+	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) {
 			// Create the Handlers instance
@@ -1726,58 +1772,43 @@ func TestConfirmPin(t *testing.T) {
 	}
 }
 
-func TestFetchCustodialBalances(t *testing.T) {
+func TestFetchCommunityBalance(t *testing.T) {
-	fm, err := NewFlagManager(flagsPath)
-	if err != nil {
-		t.Logf(err.Error())
-	}
-	flag_api_error, _ := fm.GetFlag("flag_api_call_error")
 
 	// Define test data
 	sessionId := "session123"
-	publicKey := "0X13242618721"
-
 	ctx, store := InitializeTestStore(t)
-	ctx = context.WithValue(ctx, "SessionId", sessionId)
-
-	err = store.WriteEntry(ctx, sessionId, common.DATA_PUBLIC_KEY, []byte(publicKey))
-	if err != nil {
-		t.Fatal(err)
-	}
 
 	tests := []struct {
 		name           string
-		balanceResponse *models.BalanceResult
+		languageCode   string
 		expectedResult resource.Result
 	}{
 		{
-			name: "Test when fetch custodial balances is not a success",
+			name: "Test community balance content when language is english",
-			balanceResponse: &models.BalanceResult{
-				Balance: "0.003 CELO",
-				Nonce:   json.Number("0"),
-			},
 			expectedResult: resource.Result{
-				FlagReset: []uint32{flag_api_error},
+				Content: "Community Balance: 0.00",
 			},
+			languageCode: "eng",
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			mockAccountService := new(mocks.MockAccountService)
 			mockState := state.NewState(16)
 
 			h := &Handlers{
 				userdataStore:  store,
-				flagManager:    fm.parser,
 				st:             mockState,
 				accountService: mockAccountService,
 			}
-
+			ctx = context.WithValue(ctx, "SessionId", sessionId)
-			// Set up the expected behavior of the mock
+			ctx = context.WithValue(ctx, "Language", lang.Language{
-			mockAccountService.On("CheckBalance", string(publicKey)).Return(tt.balanceResponse, nil)
+				Code: tt.languageCode,
+			})
 
 			// Call the method
-			res, _ := h.FetchCustodialBalances(ctx, "fetch_custodial_balances", []byte(""))
+			res, _ := h.FetchCommunityBalance(ctx, "fetch_community_balance", []byte(""))
 
 			//Assert that the result set to content is what was expected
 			assert.Equal(t, res, tt.expectedResult, "Result should match expected result")
@@ -1987,7 +2018,7 @@ func TestSetVoucher(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	res, err := h.SetVoucher(ctx, "set_voucher", []byte{})
+	res, err := h.SetVoucher(ctx, "set_voucher", []byte(""))
 
 	assert.NoError(t, err)
 

internal/storage/storageservice.go

@@ -41,10 +41,13 @@ func buildConnStr() string {
 	dbName := initializers.GetEnv("DB_NAME", "")
 	port := initializers.GetEnv("DB_PORT", "5432")
 
-	return fmt.Sprintf(
+	connString := fmt.Sprintf(
 		"postgres://%s:%s@%s:%s/%s",
 		user, password, host, port, dbName,
 	)
+	logg.Debugf("pg conn string", "conn", connString)
+
+	return connString
 }
 
 func NewMenuStorageService(dbDir string, resourceDir string) *MenuStorageService {

internal/testutil/mocks/servicemock.go

@@ -28,7 +28,6 @@ func (m *MockAccountService) TrackAccountStatus(ctx context.Context, trackingId
 	return args.Get(0).(*models.TrackStatusResult), args.Error(1)
 }
 
-
 func (m *MockAccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
 	args := m.Called(publicKey)
 	return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1)
@@ -39,7 +38,12 @@ func (m *MockAccountService) FetchTransactions(ctx context.Context, publicKey st
 	return args.Get(0).([]dataserviceapi.Last10TxResponse), args.Error(1)
 }
 
-func(m MockAccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
+func (m *MockAccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
 	args := m.Called(address)
 	return args.Get(0).(*models.VoucherDataResult), args.Error(1)
 }
+
+func (m *MockAccountService) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
+	args := m.Called()
+	return args.Get(0).(*models.TokenTransferResponse), args.Error(1)
+}

internal/testutil/testservice/TestAccountService.go

@@ -12,14 +12,14 @@ type TestAccountService struct {
 }
 
 func (tas *TestAccountService) CreateAccount(ctx context.Context) (*models.AccountResult, error) {
-	return &models.AccountResult {
+	return &models.AccountResult{
 		TrackingId: "075ccc86-f6ef-4d33-97d5-e91cfb37aa0d",
 		PublicKey:  "0x623EFAFa8868df4B934dd12a8B26CB3Dd75A7AdD",
 	}, nil
 }
 
 func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error) {
-	balanceResponse := &models.BalanceResult {
+	balanceResponse := &models.BalanceResult{
 		Balance: "0.003 CELO",
 		Nonce:   json.Number("0"),
 	}
@@ -27,7 +27,7 @@ func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey strin
 }
 
 func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error) {
-	return &models.TrackStatusResult {
+	return &models.TrackStatusResult{
 		Active: true,
 	}, nil
 }
@@ -47,6 +47,12 @@ func (tas *TestAccountService) FetchTransactions(ctx context.Context, publicKey
 	return []dataserviceapi.Last10TxResponse{}, nil
 }
 
-func(m TestAccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
+func (m TestAccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
 	return &models.VoucherDataResult{}, nil
 }
+
+func (tas *TestAccountService) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
+	return &models.TokenTransferResponse{
+		TrackingId: "e034d147-747d-42ea-928d-b5a7cb3426af",
+	}, nil
+}

internal/testutil/testtag/onlinetest.go

@@ -2,8 +2,8 @@
 
 package testtag
 
-import "git.grassecon.net/urdt/ussd/internal/handlers/server"
+import "git.grassecon.net/urdt/ussd/remote"
 
 var (
-	AccountService server.AccountServiceInterface
+	AccountService remote.AccountServiceInterface
 )

menutraversal_test/group_test.json

@@ -103,7 +103,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Your balance is 0.003 CELO\n0:Back\n9:Quit"
+                    "expectedContent": "Balance: {balance}\n\n0:Back\n9:Quit"
                 },
                 {
                     "input": "0",
@@ -149,7 +149,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Your community balance is 0.003 CELO\n0:Back\n9:Quit"
+                    "expectedContent": "{balance}\n0:Back\n9:Quit"
                 },
                 {
                     "input": "0",

menutraversal_test/test_setup.json

@@ -53,7 +53,7 @@
                 ]
             },
             {
-                "name": "send_with_invalid_inputs",
+                "name": "send_with_invite",
                 "steps": [
                     {
                         "input": "",
@@ -65,39 +65,19 @@
                     },
                     {
                         "input": "000",
-                        "expectedContent": "000 is not registered or invalid, please try again:\n1:Retry\n9:Quit"
+                        "expectedContent": "000 is invalid, please try again:\n1:Retry\n9:Quit"
                     },
                     {
                         "input": "1",
                         "expectedContent": "Enter recipient's phone number:\n0:Back"
                     },
                     {
-                        "input": "065656",
+                        "input": "0712345678",
-                        "expectedContent": "{max_amount}\nEnter amount:\n0:Back"
+                        "expectedContent": "0712345678 is not registered, please try again:\n1:Retry\n2:Invite to Sarafu Network\n9:Quit"
                     },
                     {
-                        "input": "10000000",
+                        "input": "2",
-                        "expectedContent": "Amount 10000000 is invalid, please try again:\n1:Retry\n9:Quit"
+                        "expectedContent": "Your invite request for 0712345678 to Sarafu Network failed. Please try again later."
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "{max_amount}\nEnter amount:\n0:Back"
-                    },
-                    {
-                        "input": "1.00",
-                        "expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
-                    },
-                    {
-                        "input": "1222",
-                        "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
-                    },
-                    {
-                        "input": "1234",
-                        "expectedContent": "Your request has been sent. 065656 will receive {send_amount} from {session_id}."
                     }
                 ]
             },

models/balanceresponse.go

@@ -2,7 +2,6 @@ package models
 
 import "encoding/json"
 
-
 type BalanceResult struct {
 	Balance string      `json:"balance"`
 	Nonce   json.Number `json:"nonce"`

models/token_transfer_response.go

@@ -0,0 +1,5 @@
+package models
+
+type TokenTransferResponse struct {
+	TrackingId string `json:"trackingId"`
+}

models/tokenresponse.go

@@ -1,18 +0,0 @@
-package models
-
-type ApiResponse struct {
-	OK          bool   `json:"ok"`
-	Description string `json:"description"`
-	Result      Result `json:"result"`
-}
-
-type Result struct {
-	Holdings []Holding `json:"holdings"`
-}
-
-type Holding struct {
-	ContractAddress string `json:"contractAddress"`
-	TokenSymbol     string `json:"tokenSymbol"`
-	TokenDecimals   string `json:"tokenDecimals"`
-	Balance         string `json:"balance"`
-}

models/voucher_data_result.go

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

models/vouchersresponse.go

@@ -1,21 +0,0 @@
-package models
-
-import dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
-
-//type VoucherHoldingResponse struct {
-//	Ok          bool          `json:"ok"`
-//	Description string        `json:"description"`
-//	Result      VoucherResult `json:"result"`
-//}
-
-// VoucherResult holds the list of token holdings
-type VoucherResult struct {
-	Holdings []dataserviceapi.TokenHoldings `json:"holdings"`
-}
-
-type VoucherDataResult struct {
-	TokenName	string `json:"tokenName"`
-	TokenSymbol     string `json:"tokenSymbol"`
-	TokenDecimals   string `json:"tokenDecimals"`
-	SinkAddress	string `json:"sinkAddress"`
-}

remote/accountservice.go

@@ -16,11 +16,6 @@ import (
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 )
 
-var (
-	InfoLogger  *log.Logger
-	ErrorLogger *log.Logger
-)
-
 type AccountServiceInterface interface {
 	CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error)
 	CreateAccount(ctx context.Context) (*models.AccountResult, error)
@@ -28,6 +23,7 @@ type AccountServiceInterface interface {
 	FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error)
 	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)
 }
 
 type AccountService struct {
@@ -55,7 +51,7 @@ func (as *AccountService) TrackAccountStatus(ctx context.Context, publicKey stri
 		return nil, err
 	}
 
-	_, err = doCustodialRequest(ctx, req, &r)
+	_, err = doRequest(ctx, req, &r)
 	if err != nil {
 		return nil, err
 	}
@@ -79,7 +75,7 @@ func (as *AccountService) CheckBalance(ctx context.Context, publicKey string) (*
 		return nil, err
 	}
 
-	_, err = doCustodialRequest(ctx, req, &balanceResult)
+	_, err = doRequest(ctx, req, &balanceResult)
 	return &balanceResult, err
 }
 
@@ -96,9 +92,8 @@ func (as *AccountService) CreateAccount(ctx context.Context) (*models.AccountRes
 	if err != nil {
 		return nil, err
 	}
-	_, err = doCustodialRequest(ctx, req, &r)
+	_, err = doRequest(ctx, req, &r)
 	if err != nil {
-		log.Printf("Failed to make custodial %s request to endpoint: %s with reason: %s", req.Method, req.URL, err.Error())
 		return nil, err
 	}
 
@@ -109,7 +104,9 @@ func (as *AccountService) CreateAccount(ctx context.Context) (*models.AccountRes
 // Parameters:
 //   - publicKey: The public key associated with the account.
 func (as *AccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
-	var r []dataserviceapi.TokenHoldings
+	var r struct {
+		Holdings []dataserviceapi.TokenHoldings `json:"holdings"`
+	}
 
 	ep, err := url.JoinPath(config.VoucherHoldingsURL, publicKey)
 	if err != nil {
@@ -121,19 +118,21 @@ func (as *AccountService) FetchVouchers(ctx context.Context, publicKey string) (
 		return nil, err
 	}
 
-	_, err = doDataRequest(ctx, req, r)
+	_, err = doRequest(ctx, req, &r)
 	if err != nil {
 		return nil, err
 	}
 
-	return r, nil
+	return r.Holdings, nil
 }
 
 // FetchTransactions retrieves the last 10 transactions for a given public key from the data indexer API endpoint
 // Parameters:
 //   - publicKey: The public key associated with the account.
 func (as *AccountService) FetchTransactions(ctx context.Context, publicKey string) ([]dataserviceapi.Last10TxResponse, error) {
-	var r []dataserviceapi.Last10TxResponse
+	var r struct {
+		Transfers []dataserviceapi.Last10TxResponse `json:"transfers"`
+	}
 
 	ep, err := url.JoinPath(config.VoucherTransfersURL, publicKey)
 	if err != nil {
@@ -145,19 +144,21 @@ func (as *AccountService) FetchTransactions(ctx context.Context, publicKey strin
 		return nil, err
 	}
 
-	_, err = doDataRequest(ctx, req, r)
+	_, err = doRequest(ctx, req, &r)
 	if err != nil {
 		return nil, err
 	}
 
-	return r, nil
+	return r.Transfers, nil
 }
 
 // VoucherData retrieves voucher metadata from the data indexer API endpoint.
 // Parameters:
 //   - address: The voucher address.
 func (as *AccountService) VoucherData(ctx context.Context, address string) (*models.VoucherDataResult, error) {
-	var voucherDataResult models.VoucherDataResult
+	var r struct {
+		TokenDetails models.VoucherDataResult `json:"tokenDetails"`
+	}
 
 	ep, err := url.JoinPath(config.VoucherDataURL, address)
 	if err != nil {
@@ -169,22 +170,63 @@ func (as *AccountService) VoucherData(ctx context.Context, address string) (*mod
 		return nil, err
 	}
 
-	_, err = doCustodialRequest(ctx, req, &voucherDataResult)
+	_, err = doRequest(ctx, req, &r)
-	return &voucherDataResult, err
+	return &r.TokenDetails, err
+}
+
+// TokenTransfer creates a new token transfer in the custodial system.
+// Returns:
+//   - *models.TokenTransferResponse: A pointer to an TokenTransferResponse struct containing the trackingId.
+//     If there is an error during the request or processing, this will be nil.
+//   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
+//     If no error occurs, this will be nil.
+func (as *AccountService) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
+	var r models.TokenTransferResponse
+
+	// Create request payload
+	payload := map[string]string{
+		"amount":       amount,
+		"from":         from,
+		"to":           to,
+		"tokenAddress": tokenAddress,
+	}
+
+	payloadBytes, err := json.Marshal(payload)
+	if err != nil {
+		return nil, err
+	}
+
+	// Create a new request
+	req, err := http.NewRequest("POST", config.TokenTransferURL, bytes.NewBuffer(payloadBytes))
+	if err != nil {
+		return nil, err
+	}
+	_, err = doRequest(ctx, req, &r)
+	if err != nil {
+		return nil, err
+	}
+
+	return &r, nil
 }
 
 func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
 	var okResponse api.OKResponse
 	var errResponse api.ErrResponse
+
+	req.Header.Set("Authorization", "Bearer "+config.BearerToken)
 	req.Header.Set("Content-Type", "application/json")
+
+	logRequestDetails(req)
+
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
+		log.Printf("Failed to make %s request to endpoint: %s with reason: %s", req.Method, req.URL, err.Error())
 		errResponse.Description = err.Error()
 		return nil, err
 	}
 	defer resp.Body.Close()
 
-	InfoLogger.Printf("Received response for %s: Status Code: %d | Content-Type: %s", req.URL, resp.StatusCode, resp.Header.Get("Content-Type"))
+	log.Printf("Received response for %s: Status Code: %d | Content-Type: %s", req.URL, resp.StatusCode, resp.Header.Get("Content-Type"))
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
@@ -213,25 +255,13 @@ func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKRespons
 	return &okResponse, err
 }
 
-func doCustodialRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
-	req.Header.Set("X-GE-KEY", config.CustodialAPIKey)
-	logRequestDetails(req)
-	return doRequest(ctx, req, rcpt)
-}
-
-func doDataRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
-	req.Header.Set("X-GE-KEY", config.DataAPIKey)
-	logRequestDetails(req)
-	return doRequest(ctx, req, rcpt)
-}
-
 func logRequestDetails(req *http.Request) {
 	var bodyBytes []byte
 	contentType := req.Header.Get("Content-Type")
 	if req.Body != nil {
 		bodyBytes, err := io.ReadAll(req.Body)
 		if err != nil {
-			ErrorLogger.Printf("Error reading request body: %s", err)
+			log.Printf("Error reading request body: %s", err)
 			return
 		}
 		req.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
@@ -239,5 +269,5 @@ func logRequestDetails(req *http.Request) {
 		bodyBytes = []byte("-")
 	}
 
-	InfoLogger.Printf("URL: %s  | Content-Type: %s | Method: %s| Request Body: %s", req.URL, contentType, req.Method, string(bodyBytes))
+	log.Printf("URL: %s | Content-Type: %s | Method: %s| Request Body: %s", req.URL, contentType, req.Method, string(bodyBytes))
 }

services/registration/amount.vis

@@ -9,7 +9,7 @@ RELOAD validate_amount
 CATCH api_failure flag_api_call_error  1
 CATCH invalid_amount flag_invalid_amount 1
 INCMP _ 0
-LOAD get_recipient 12
+LOAD get_recipient 0
 LOAD get_sender 64
 LOAD get_amount 32
 INCMP transaction_pin *

services/registration/api_failure.vis

@@ -1,5 +1,5 @@
-MOUT retry 0
+MOUT retry 1
 MOUT quit 9
 HALT
-INCMP _ 0
+INCMP _ 1
 INCMP quit 9

services/registration/check_statement

@@ -0,0 +1 @@
+Please enter your PIN to view statement:

services/registration/check_statement.vis

@@ -0,0 +1,12 @@
+LOAD check_transactions 0
+RELOAD check_transactions
+CATCH no_transfers flag_no_transfers 1
+LOAD authorize_account 6
+MOUT back 0
+MOUT quit 9
+HALT
+RELOAD authorize_account
+CATCH incorrect_pin flag_incorrect_pin 1
+INCMP _ 0
+INCMP quit 9
+INCMP transactions *

services/registration/check_statement_swa

@@ -0,0 +1 @@
+Tafadhali weka PIN yako kuona taarifa ya matumizi:

services/registration/comminity_balance_swa

@@ -1 +1 @@
-Salio la kikundi
+{{.fetch_community_balance}}

services/registration/community_balance

@@ -1 +1 @@
-{{.fetch_custodial_balances}}
+{{.fetch_community_balance}}

services/registration/community_balance.vis

@@ -1,7 +1,7 @@
 LOAD reset_incorrect 6
-LOAD fetch_custodial_balances 0
+LOAD fetch_community_balance 0
 CATCH api_failure  flag_api_call_error  1
-MAP fetch_custodial_balances
+MAP fetch_community_balance
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
 MOUT back 0

services/registration/edit_family_name

@@ -0,0 +1,2 @@
+Current family name: {{.get_current_profile_info}}
+Enter family name:

services/registration/edit_family_name.vis

@@ -1,5 +1,7 @@
 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
 MOUT back 0
 HALT
 LOAD save_familyname 0

services/registration/edit_family_name_swa

@@ -0,0 +1,2 @@
+Jina la familia la sasa: {{.get_current_profile_info}}
+Weka jina la familia

services/registration/edit_first_name

@@ -0,0 +1,2 @@
+Current name: {{.get_current_profile_info}}
+Enter your first names:

services/registration/edit_first_name.vis

@@ -1,5 +1,8 @@
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_firstname flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
+MAP get_current_profile_info
 MOUT back 0
 HALT
 LOAD save_firstname 0

services/registration/edit_first_name_swa

@@ -0,0 +1,2 @@
+Jina la kwanza la sasa {{.get_current_profile_info}}
+Weka majina yako ya kwanza:

services/registration/edit_location

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

services/registration/edit_location.vis

@@ -1,5 +1,7 @@
 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
 MOUT back 0
 HALT
 LOAD save_location 0

services/registration/edit_location_swa

@@ -0,0 +1,2 @@
+Eneo la sasa {{.get_current_profile_info}}
+Weka eneo:

services/registration/edit_offerings

@@ -0,0 +1,2 @@
+Current offerings: {{.get_current_profile_info}}
+Enter the services or goods you offer: 

services/registration/edit_offerings.vis

@@ -1,5 +1,7 @@
 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 0
 MOUT back 0
 HALT

services/registration/edit_offerings_swa

@@ -0,0 +1,2 @@
+Unachouza kwa sasa: {{.get_current_profile_info}}
+Weka unachouza

services/registration/edit_profile.vis

@@ -2,8 +2,8 @@ LOAD reset_account_authorized 16
 RELOAD reset_account_authorized
 LOAD reset_allow_update 0
 RELOAD reset_allow_update
-MOUT edit_name 1
+MOUT edit_first_name 1
-MOUT edit_familyname 2
+MOUT edit_family_name 2
 MOUT edit_gender 3
 MOUT edit_yob 4
 MOUT edit_location 5
@@ -12,10 +12,10 @@ MOUT view 7
 MOUT back 0
 HALT
 INCMP my_account 0
-INCMP enter_name 1
+INCMP edit_first_name 1
-INCMP enter_familyname 2
+INCMP edit_family_name 2
 INCMP select_gender 3
-INCMP enter_yob 4
+INCMP edit_yob 4
-INCMP enter_location 5
+INCMP edit_location 5
-INCMP enter_offerings 6
+INCMP edit_offerings 6
 INCMP view_profile 7

services/registration/edit_yob

@@ -0,0 +1,2 @@
+Current year of birth: {{.get_current_profile_info}}
+Enter your year of birth

services/registration/edit_yob.vis

@@ -1,8 +1,12 @@
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_yob flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
+MAP get_current_profile_info
 MOUT back 0
 HALT
-LOAD verify_yob 0
+LOAD verify_yob 6
+RELOAD verify_yob
 CATCH incorrect_date_format flag_incorrect_date_format 1
 LOAD save_yob 0
 RELOAD save_yob

services/registration/edit_yob_swa

@@ -0,0 +1,2 @@
+Mwaka wa sasa wa kuzaliwa {{.get_current_profile_info}}
+Weka mwaka wa kuzaliwa

services/registration/enter_familyname

@@ -1 +0,0 @@
-Enter family name:

services/registration/enter_familyname_swa

@@ -1 +0,0 @@
-Weka jina la familia

services/registration/enter_location

@@ -1 +0,0 @@
-Enter your location:

services/registration/enter_location_swa

@@ -1 +0,0 @@
-Weka eneo:

services/registration/enter_name

@@ -1 +0,0 @@
-Enter your first names:

services/registration/enter_name_swa

@@ -1 +0,0 @@
-Weka majina yako ya kwanza:

services/registration/enter_offerings

@@ -1 +0,0 @@
-Enter the services or goods you offer: 

services/registration/enter_offerings_swa

@@ -1 +0,0 @@
-Weka unachouza

services/registration/enter_yob

@@ -1 +0,0 @@
-Enter your year of birth

services/registration/enter_yob_swa

@@ -1 +0,0 @@
-Weka mwaka wa kuzaliwa

services/registration/incorrect_date_format.vis

@@ -2,5 +2,5 @@ LOAD reset_incorrect_date_format 8
 MOUT retry 1
 MOUT quit 9
 HALT
-INCMP enter_yob 1
+INCMP _ 1
 INCMP quit 9

services/registration/invalid_recipient

@@ -1 +1 @@
-{{.validate_recipient}} is not registered or invalid, please try again:
+{{.validate_recipient}} is invalid, please try again:

services/registration/invalid_recipient_swa

@@ -1 +1 @@
-{{.validate_recipient}} haijasajiliwa au sio sahihi, tafadhali weka tena:
+{{.validate_recipient}} sio sahihi, tafadhali weka tena:

services/registration/invite_menu

@@ -0,0 +1 @@
+Invite to Sarafu Network

services/registration/invite_menu_swa

@@ -0,0 +1 @@
+Karibisha kwa matandao wa Sarafu

services/registration/invite_recipient

@@ -0,0 +1 @@
+{{.validate_recipient}} is not registered, please try again:

services/registration/invite_recipient.vis

@@ -0,0 +1,8 @@
+MAP validate_recipient
+MOUT retry 1
+MOUT invite 2
+MOUT quit 9
+HALT
+INCMP _ 1
+INCMP invite_result 2
+INCMP quit 9

services/registration/invite_recipient_swa

@@ -0,0 +1 @@
+{{.validate_recipient}} haijasajiliwa, tafadhali weka tena:

services/registration/invite_result.vis

@@ -0,0 +1,2 @@
+LOAD invite_valid_recipient 0
+HALT

services/registration/locale/swa/default.po

@@ -12,3 +12,15 @@ msgstr "Kwa usaidizi zaidi,piga: 0757628885"
 
 msgid "Balance: %s\n"
 msgstr "Salio: %s\n"
+
+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."
+msgstr "Ombi lako la kumwalika %s kwa matandao wa Sarafu limetumwa."
+
+msgid "Your request failed. Please try again later."
+msgstr "Ombi lako halikufaulu. Tafadhali jaribu tena baadaye."
+
+msgid "Community Balance: 0.00"
+msgid "Salio la Kikundi: 0.00"

services/registration/my_account.vis

@@ -11,5 +11,6 @@ INCMP main 0
 INCMP edit_profile 1
 INCMP change_language 2
 INCMP balances 3
+INCMP check_statement 4
 INCMP pin_management 5
 INCMP address 6

services/registration/my_balance

@@ -1 +1 @@
-{{.fetch_custodial_balances}}
+{{.check_balance}}

services/registration/my_balance.vis

@@ -1,7 +1,7 @@
 LOAD reset_incorrect 6
-LOAD fetch_custodial_balances 0
+LOAD check_balance 0
 CATCH api_failure  flag_api_call_error  1
-MAP fetch_custodial_balances
+MAP check_balance
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
 MOUT back 0

services/registration/my_vouchers.vis

@@ -6,3 +6,4 @@ MOUT back 0
 HALT
 INCMP _ 0
 INCMP select_voucher 1
+INCMP voucher_details 2

services/registration/no_transfers

@@ -0,0 +1 @@
+No transfers history

services/registration/no_transfers.vis

@@ -0,0 +1,5 @@
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP ^ 0
+INCMP quit 9

services/registration/no_transfers_swa

@@ -0,0 +1 @@
+Hakuna historia kwa akaunti yako

services/registration/pp.csv

@@ -19,3 +19,5 @@ flag,flag_api_call_error,25,this is set when communication to an external servic
 flag,flag_no_active_voucher,26,this is set when a user does not have an active voucher
 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

services/registration/select_gender

@@ -1 +1,2 @@
+Current gender: {{.get_current_profile_info}}
 Select gender: 

services/registration/select_gender.vis

@@ -1,5 +1,7 @@
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH profile_update_success flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
 MOUT male 1
 MOUT female 2
 MOUT unspecified 3
@@ -9,7 +11,3 @@ INCMP _ 0
 INCMP set_male 1
 INCMP set_female 2
 INCMP set_unspecified 3
-
-
-
-

services/registration/select_gender_swa

@@ -1 +1,2 @@
+Jinsia ya sasa {{.get_current_profile_info}}
 Chagua jinsia

services/registration/send.vis

@@ -1,9 +1,11 @@
 LOAD transaction_reset 0
+RELOAD transaction_reset
 CATCH no_voucher flag_no_active_voucher 1
 MOUT back 0
 HALT
 LOAD validate_recipient 20
 RELOAD validate_recipient
 CATCH invalid_recipient flag_invalid_recipient 1
+CATCH invite_recipient flag_invalid_recipient_with_invite 1
 INCMP _ 0
 INCMP amount *

services/registration/transactions

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

services/registration/transactions.vis

@@ -0,0 +1,15 @@
+LOAD get_transactions 0
+MAP get_transactions
+MOUT back 0
+MOUT quit 99
+MNEXT next 11
+MPREV prev 22
+HALT
+LOAD view_statement 0
+RELOAD view_statement
+CATCH . flag_incorrect_statement 1
+INCMP ^ 0
+INCMP quit 99
+INCMP > 11
+INCMP < 22
+INCMP view_statement *

services/registration/transactions_swa

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

services/registration/view_statement

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

services/registration/view_statement.vis

@@ -0,0 +1,10 @@
+MAP view_statement
+MOUT back 0
+MOUT quit 9
+MNEXT next 11
+MPREV prev 22
+HALT
+INCMP _ 0
+INCMP quit 9
+INCMP > 11
+INCMP < 22

services/registration/voucher_details

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

services/registration/voucher_details.vis

@@ -0,0 +1,6 @@
+CATCH no_voucher flag_no_active_voucher 1
+LOAD get_voucher_details 0
+MAP get_voucher_details
+MOUT back 0
+HALT
+INCMP _ 0