return an event channel for the test engine

This reverts commit 188cb573dd.

cmd/africastalking/main.go

@@ -88,7 +88,7 @@ func main() {
 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
 	}
 
 	if engineDebug {

cmd/async/main.go

@@ -61,7 +61,7 @@ func main() {
 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
 	}
 
 	if engineDebug {
@@ -95,6 +95,7 @@ func main() {
 
 	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
+
 	accountService := server.AccountService{}
 
 	hl, err := lhs.GetHandler(&accountService)

cmd/http/main.go

@@ -49,7 +49,7 @@ func main() {
 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
 	}
 
 	if engineDebug {
@@ -88,6 +88,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
+
 	accountService := server.AccountService{}
 	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {

cmd/main.go

@@ -41,7 +41,7 @@ func main() {
 		Root:       "root",
 		SessionId:  sessionId,
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
 	}
 
 	resourceDir := scriptDir
@@ -85,7 +85,6 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-
 	accountService := server.AccountService{}
 	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {

driver/testdriver.go

@@ -13,12 +13,13 @@ type Step struct {
 }
 
 func (s *Step) MatchesExpectedContent(content []byte) (bool, error) {
-	pattern := regexp.QuoteMeta(s.ExpectedContent)
+	pattern := `.*\?.*|.*`
 	re, err := regexp.Compile(pattern)
 	if err != nil {
 		return false, err
 	}
-	if re.Match([]byte(content)) {
+	// Check if the content matches the regex pattern
+	if re.Match(content) {
 		return true, nil
 	}
 	return false, nil
@@ -37,8 +38,7 @@ type TestCase struct {
 }
 
 func (s *TestCase) MatchesExpectedContent(content []byte) (bool, error) {
-	pattern := regexp.QuoteMeta(s.ExpectedContent)
-	re, err := regexp.Compile(pattern)
+	re, err := regexp.Compile(s.ExpectedContent)
 	if err != nil {
 		return false, err
 	}

event/lib.go

@@ -1,20 +0,0 @@
-package event
-
-import (
-	tevent "github.com/grassrootseconomics/eth-tracker/pkg/event"
-	trouter "github.com/grassrootseconomics/eth-tracker/pkg/router"
-)
-
-var (
-	typeTokenMint = "TOKEN_MINT"
-	typeTokenTransfer = "TOKEN_TRANSFER"
-	typeFaucetGive = "FAUCET_GIVE"
-)
-
-func processFaucetGive(db db.Db, payload map[string]any) {
-	var sessionId string
-	var tokenString string
-	var amount uint64
-
-
-}

internal/handlers/handlerservice.go

@@ -54,7 +54,7 @@ func (ls *LocalHandlerService) SetDataStore(db *db.Db) {
 }
 
 func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceInterface) (*ussd.Handlers, error) {
-	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore,accountService)
+	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore, accountService)
 	if err != nil {
 		return nil, err
 	}
@@ -83,6 +83,7 @@ func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceIn
 	ls.DbRs.AddLocalFunc("save_location", ussdHandlers.SaveLocation)
 	ls.DbRs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
 	ls.DbRs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
+	ls.DbRs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
 	ls.DbRs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
 	ls.DbRs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
 	ls.DbRs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
@@ -93,7 +94,6 @@ func (ls *LocalHandlerService) GetHandler(accountService server.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)
 
 	return ussdHandlers, nil
 }

internal/handlers/server/accountservice.go

@@ -4,22 +4,21 @@ import (
 	"encoding/json"
 	"io"
 	"net/http"
-	"time"
 
 	"git.grassecon.net/urdt/ussd/config"
 	"git.grassecon.net/urdt/ussd/internal/models"
 )
 
 type AccountServiceInterface interface {
-	CheckBalance(publicKey string) (*models.BalanceResponse, error)
+	CheckBalance(publicKey string) (string, error)
 	CreateAccount() (*models.AccountResponse, error)
-	CheckAccountStatus(trackingId string) (*models.TrackStatusResponse, error)
+	CheckAccountStatus(trackingId string) (string, error)
 }
 
 type AccountService struct {
 }
 
-type TestAccountService struct {
+type MockAccountService struct {
 }
 
 // CheckAccountStatus retrieves the status of an account transaction based on the provided tracking ID.
@@ -33,44 +32,53 @@ type TestAccountService struct {
 //   - string: The status of the transaction as a string. If there is an error during the request or processing, this will be an empty string.
 //   - 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) CheckAccountStatus(trackingId string) (*models.TrackStatusResponse, error) {
+func (as *AccountService) CheckAccountStatus(trackingId string) (string, error) {
 	resp, err := http.Get(config.TrackStatusURL + trackingId)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 	defer resp.Body.Close()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
+
 	var trackResp models.TrackStatusResponse
 	err = json.Unmarshal(body, &trackResp)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
-	return &trackResp, nil
+
+	status := trackResp.Result.Transaction.Status
+
+	return status, nil
 }
 
 // CheckBalance retrieves the balance for a given public key from the custodial balance API endpoint.
 // Parameters:
 //   - publicKey: The public key associated with the account whose balance needs to be checked.
-func (as *AccountService) CheckBalance(publicKey string) (*models.BalanceResponse, error) {
+func (as *AccountService) CheckBalance(publicKey string) (string, error) {
+
 	resp, err := http.Get(config.BalanceURL + publicKey)
 	if err != nil {
-		return nil, err
+		return "0.0", err
 	}
 	defer resp.Body.Close()
+
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return nil, err
+		return "0.0", err
 	}
+
 	var balanceResp models.BalanceResponse
 	err = json.Unmarshal(body, &balanceResp)
 	if err != nil {
-		return nil, err
+		return "0.0", err
 	}
-	return &balanceResp, nil
+
+	balance := balanceResp.Result.Balance
+	return balance, nil
 }
 
 // CreateAccount creates a new account in the custodial system.
@@ -85,19 +93,22 @@ func (as *AccountService) CreateAccount() (*models.AccountResponse, error) {
 		return nil, err
 	}
 	defer resp.Body.Close()
+
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
+
 	var accountResp models.AccountResponse
 	err = json.Unmarshal(body, &accountResp)
 	if err != nil {
 		return nil, err
 	}
+
 	return &accountResp, nil
 }
 
-func (tas *TestAccountService) CreateAccount() (*models.AccountResponse, error) {
+func (mas *MockAccountService) CreateAccount() (*models.AccountResponse, error) {
 	return &models.AccountResponse{
 		Ok: true,
 		Result: struct {
@@ -112,7 +123,7 @@ func (tas *TestAccountService) CreateAccount() (*models.AccountResponse, error)
 	}, nil
 }
 
-func (tas *TestAccountService) CheckBalance(publicKey string) (*models.BalanceResponse, error) {
+func (mas *MockAccountService) CheckBalance(publicKey string) (string, error) {
 
 	balanceResponse := &models.BalanceResponse{
 		Ok: true,
@@ -125,29 +136,9 @@ func (tas *TestAccountService) CheckBalance(publicKey string) (*models.BalanceRe
 		},
 	}
 
-	return balanceResponse, nil
+	return balanceResponse.Result.Balance, nil
 }
 
-func (tas *TestAccountService) CheckAccountStatus(trackingId string) (*models.TrackStatusResponse, error) {
-	trackResponse := &models.TrackStatusResponse{
-		Ok: true,
-		Result: struct {
-			Transaction struct {
-				CreatedAt     time.Time   "json:\"createdAt\""
-				Status        string      "json:\"status\""
-				TransferValue json.Number "json:\"transferValue\""
-				TxHash        string      "json:\"txHash\""
-				TxType        string      "json:\"txType\""
-			}
-		}{
-			Transaction: models.Transaction{
-				CreatedAt:     time.Now(),
-				Status:        "SUCCESS",
-				TransferValue: json.Number("0.5"),
-				TxHash:        "0x123abc456def",
-				TxType:        "transfer",
-			},
-		},
-	}
-	return trackResponse, nil
+func (mas *MockAccountService) CheckAccountStatus(trackingId string) (string, error) {
+	return "SUCCESS", nil
 }

internal/handlers/ussd/menuhandler.go

@@ -290,6 +290,8 @@ func (h *Handlers) VerifyPin(ctx context.Context, sym string, input []byte) (res
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+
+	//AccountPin, _ := utils.ReadEntry(ctx, h.userdataStore, sessionId, utils.DATA_ACCOUNT_PIN)
 	store := h.userdataStore
 	AccountPin, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACCOUNT_PIN)
 	if err != nil {
@@ -500,7 +502,7 @@ func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (res
 	if err != nil {
 		return res, err
 	}
-	if len(input) == 4 {
+	if len(input) > 1 {
 		if bytes.Equal(input, AccountPin) {
 			if h.st.MatchFlag(flag_account_authorized, false) {
 				res.FlagReset = append(res.FlagReset, flag_incorrect_pin)
@@ -523,7 +525,9 @@ func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (res
 // ResetIncorrectPin resets the incorrect pin flag  after a new PIN attempt.
 func (h *Handlers) ResetIncorrectPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
+
 	flag_incorrect_pin, _ := h.flagManager.GetFlag("flag_incorrect_pin")
+
 	res.FlagReset = append(res.FlagReset, flag_incorrect_pin)
 	return res, nil
 }
@@ -535,7 +539,6 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
 
 	flag_account_success, _ := h.flagManager.GetFlag("flag_account_success")
 	flag_account_pending, _ := h.flagManager.GetFlag("flag_account_pending")
-	flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
 
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
@@ -547,23 +550,18 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
 		return res, err
 	}
 
-	accountStatus, err := h.accountService.CheckAccountStatus(string(trackingId))
+	status, err := h.accountService.CheckAccountStatus(string(trackingId))
 	if err != nil {
 		fmt.Println("Error checking account status:", err)
 		return res, err
 	}
-	if !accountStatus.Ok {
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		return res, err
-	}
-	res.FlagReset = append(res.FlagReset, flag_api_error)
-	status := accountStatus.Result.Transaction.Status
 
 	err = store.WriteEntry(ctx, sessionId, utils.DATA_ACCOUNT_STATUS, []byte(status))
 	if err != nil {
 		return res, nil
 	}
-	if accountStatus.Result.Transaction.Status == "SUCCESS" {
+
+	if status == "SUCCESS" {
 		res.FlagSet = append(res.FlagSet, flag_account_success)
 		res.FlagReset = append(res.FlagReset, flag_account_pending)
 	} else {
@@ -643,8 +641,6 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 	var res resource.Result
 	var err error
 
-	flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
-
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
@@ -656,60 +652,15 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 		return res, err
 	}
 
-	balanceResponse, err := h.accountService.CheckBalance(string(publicKey))
+	balance, err := h.accountService.CheckBalance(string(publicKey))
 	if err != nil {
 		return res, nil
 	}
-	if !balanceResponse.Ok {
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		return res, nil
-	}
-	res.FlagReset = append(res.FlagReset, flag_api_error)
-	balance := balanceResponse.Result.Balance
 	res.Content = balance
 
 	return res, nil
 }
 
-func (h *Handlers) FetchCustodialBalances(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
-
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-	symbol, _ := h.st.Where()
-	balanceType := strings.Split(symbol, "_")[0]
-
-	store := h.userdataStore
-	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
-	if err != nil {
-		return res, err
-	}
-
-	balanceResponse, err := h.accountService.CheckBalance(string(publicKey))
-	if err != nil {
-		return res, nil
-	}
-	if !balanceResponse.Ok {
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		return res, nil
-	}
-	res.FlagReset = append(res.FlagReset, flag_api_error)
-	balance := balanceResponse.Result.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
-}
-
 // ValidateRecipient validates that the given input is a valid phone number.
 func (h *Handlers) ValidateRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
@@ -806,11 +757,10 @@ func (h *Handlers) MaxAmount(ctx context.Context, sym string, input []byte) (res
 	store := h.userdataStore
 	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
 
-	balanceResp, err := h.accountService.CheckBalance(string(publicKey))
+	balance, err := h.accountService.CheckBalance(string(publicKey))
 	if err != nil {
 		return res, nil
 	}
-	balance := balanceResp.Result.Balance
 
 	res.Content = balance
 
@@ -829,25 +779,18 @@ func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte)
 	}
 
 	flag_invalid_amount, _ := h.flagManager.GetFlag("flag_invalid_amount")
-	flag_api_error, _ := h.flagManager.GetFlag("flag_api_call_error")
 
 	store := h.userdataStore
 	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
 
 	amountStr := string(input)
 
-	balanceRes, err := h.accountService.CheckBalance(string(publicKey))
-	balanceStr := balanceRes.Result.Balance
+	balanceStr, err := h.accountService.CheckBalance(string(publicKey))
 
-	if !balanceRes.Ok {
-		res.FlagSet = append(res.FlagSet, flag_api_error)
-		return res, nil
-	}
 	if err != nil {
 		return res, err
 	}
 	res.Content = balanceStr
-	res.FlagReset = append(res.FlagReset, flag_api_error)
 
 	// Parse the balance
 	balanceParts := strings.Split(balanceStr, " ")
@@ -939,6 +882,36 @@ func (h *Handlers) GetAmount(ctx context.Context, sym string, input []byte) (res
 	return res, nil
 }
 
+// QuickWithBalance retrieves the balance for a given public key from the custodial balance API endpoint before
+// gracefully exiting the session.
+func (h *Handlers) QuitWithBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	var err error
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+
+	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
+
+	code := codeFromCtx(ctx)
+	l := gotext.NewLocale(translationDir, code)
+	l.AddDomain("default")
+
+	store := h.userdataStore
+	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
+	if err != nil {
+		return res, err
+	}
+	balance, err := h.accountService.CheckBalance(string(publicKey))
+	if err != nil {
+		return res, nil
+	}
+	res.Content = l.Get("Your account balance is %s", balance)
+	res.FlagReset = append(res.FlagReset, flag_account_authorized)
+	return res, nil
+}
+
 // InitiateTransaction returns a confirmation and resets the transaction data
 // on the gdbm store.
 func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []byte) (resource.Result, error) {
@@ -972,23 +945,16 @@ func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []
 	return res, nil
 }
 
+// GetProfileInfo retrieves and formats the profile information of a user from a Gdbm backed storage.
 func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
-	var defaultValue string
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
-	language, ok := ctx.Value("Language").(lang.Language)
-	if !ok {
-		return res, fmt.Errorf("value for 'Language' is not of type lang.Language")
-	}
-	code := language.Code
-	if code == "swa" {
-		defaultValue = "Haipo"
-	} else {
-		defaultValue = "Not Provided"
-	}
+
+	// Default value when an entry is not found
+	defaultValue := "Not Provided"
 
 	// Helper function to handle nil byte slices and convert them to string
 	getEntryOrDefault := func(entry []byte, err error) string {
@@ -1025,23 +991,12 @@ func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte)
 			return res, fmt.Errorf("invalid year of birth: %v", err)
 		}
 	}
-	switch language.Code {
-	case "eng":
-		res.Content = fmt.Sprintf(
-			"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
-			name, gender, age, location, offerings,
-		)
-	case "swa":
-		res.Content = fmt.Sprintf(
-			"Jina: %s\nJinsia: %s\nUmri: %s\nEneo: %s\nUnauza: %s\n",
-			name, gender, age, location, offerings,
-		)
-	default:
-		res.Content = fmt.Sprintf(
-			"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
-			name, gender, age, location, offerings,
-		)
-	}
+
+	// Format the result
+	res.Content = fmt.Sprintf(
+		"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
+		name, gender, age, location, offerings,
+	)
 
 	return res, nil
 }

internal/handlers/ussd/menuhandler_test.go

@@ -7,15 +7,11 @@ import (
 	"log"
 	"path"
 	"testing"
-	"time"
 
-	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/db"
-	"git.defalsify.org/vise.git/lang"
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
 	"git.defalsify.org/vise.git/state"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/mocks"
 	"git.grassecon.net/urdt/ussd/internal/models"
 	"git.grassecon.net/urdt/ussd/internal/utils"
@@ -29,46 +25,10 @@ var (
 	flagsPath = path.Join(baseDir, "services", "registration", "pp.csv")
 )
 
-func TestNewHandlers(t *testing.T) {
-	fm, err := NewFlagManager(flagsPath)
-	accountService := server.TestAccountService{}
-	if err != nil {
-		t.Logf(err.Error())
-	}
-	t.Run("Valid UserDataStore", func(t *testing.T) {
-		mockStore := &mocks.MockUserDataStore{}
-		handlers, err := NewHandlers(fm.parser, mockStore, &accountService)
-		if err != nil {
-			t.Fatalf("expected no error, got %v", err)
-		}
-		if handlers == nil {
-			t.Fatal("expected handlers to be non-nil")
-		}
-		if handlers.userdataStore == nil {
-			t.Fatal("expected userdataStore to be set in handlers")
-		}
-	})
-
-	// Test case for nil userdataStore
-	t.Run("Nil UserDataStore", func(t *testing.T) {
-		appFlags := &asm.FlagParser{}
-
-		handlers, err := NewHandlers(appFlags, nil, &accountService)
-
-		if err == nil {
-			t.Fatal("expected an error, got none")
-		}
-		if handlers != nil {
-			t.Fatal("expected handlers to be nil")
-		}
-		if err.Error() != "cannot create handler with nil userdata store" {
-			t.Fatalf("expected specific error, got %v", err)
-		}
-	})
-}
-
 func TestCreateAccount(t *testing.T) {
+
 	fm, err := NewFlagManager(flagsPath)
+
 	if err != nil {
 		t.Logf(err.Error())
 	}
@@ -482,10 +442,7 @@ func TestMaxAmount(t *testing.T) {
 	sessionId := "session123"
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 	publicKey := "0xcasgatweksalw1018221"
-
-	expectedBalance := &models.BalanceResponse{
-		Ok: true,
-	}
+	expectedBalance := "0.003CELO"
 
 	// Set up the expected behavior of the mock
 	mockStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return([]byte(publicKey), nil)
@@ -501,7 +458,7 @@ func TestMaxAmount(t *testing.T) {
 	res, _ := h.MaxAmount(ctx, "max_amount", []byte("check_balance"))
 
 	//Assert that the balance that was set as the result content is what was returned by  Check Balance
-	assert.Equal(t, expectedBalance.Result.Balance, res.Content)
+	assert.Equal(t, expectedBalance, res.Content)
 
 }
 
@@ -580,10 +537,12 @@ func TestGetRecipient(t *testing.T) {
 func TestGetFlag(t *testing.T) {
 	fm, err := NewFlagManager(flagsPath)
 	expectedFlag := uint32(9)
+
 	if err != nil {
 		t.Logf(err.Error())
 	}
 	flag, err := fm.GetFlag("flag_account_created")
+
 	if err != nil {
 		t.Logf(err.Error())
 	}
@@ -877,7 +836,10 @@ func TestAuthorize(t *testing.T) {
 		{
 			name:           "Test with pin that is not a 4 digit",
 			input:          []byte("1235aqds"),
-			expectedResult: resource.Result{},
+			expectedResult: resource.Result{
+				FlagReset: []uint32{flag_account_authorized},
+				FlagSet:   []uint32{flag_incorrect_pin},
+			},
 		},
 	}
 
@@ -1053,109 +1015,53 @@ func TestVerifyPin(t *testing.T) {
 
 func TestCheckAccountStatus(t *testing.T) {
 	fm, err := NewFlagManager(flagsPath)
+
 	if err != nil {
 		t.Logf(err.Error())
 	}
+	mockDataStore := new(mocks.MockUserDataStore)
+	mockCreateAccountService := new(mocks.MockAccountService)
+
 	sessionId := "session123"
 	flag_account_success, _ := fm.GetFlag("flag_account_success")
 	flag_account_pending, _ := fm.GetFlag("flag_account_pending")
-	flag_api_error, _ := fm.GetFlag("flag_api_call_error")
 
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
+	h := &Handlers{
+		userdataStore:  mockDataStore,
+		accountService: mockCreateAccountService,
+		flagManager:    fm.parser,
+	}
 	tests := []struct {
 		name           string
 		input          []byte
-		response       *models.TrackStatusResponse
+		status         string
 		expectedResult resource.Result
 	}{
 		{
-			name:  "Test when account status is Success",
-			input: []byte("TrackingId1234"),
-			response: &models.TrackStatusResponse{
-				Ok: true,
-				Result: struct {
-					Transaction struct {
-						CreatedAt     time.Time   "json:\"createdAt\""
-						Status        string      "json:\"status\""
-						TransferValue json.Number "json:\"transferValue\""
-						TxHash        string      "json:\"txHash\""
-						TxType        string      "json:\"txType\""
-					}
-				}{
-					Transaction: models.Transaction{
-						CreatedAt:     time.Now(),
-						Status:        "SUCCESS",
-						TransferValue: json.Number("0.5"),
-						TxHash:        "0x123abc456def",
-						TxType:        "transfer",
-					},
-				},
-			},
+			name:   "Test when account status is Success",
+			input:  []byte("TrackingId1234"),
+			status: "SUCCESS",
 			expectedResult: resource.Result{
 				FlagSet:   []uint32{flag_account_success},
-				FlagReset: []uint32{flag_api_error, flag_account_pending},
-			},
-		},
-		{
-			name:  "Test when fetching  account status is not  Success",
-			input: []byte("TrackingId1234"),
-			response: &models.TrackStatusResponse{
-				Ok: false,
-			},
-			expectedResult: resource.Result{
-				FlagSet: []uint32{flag_api_error},
-			},
-		},
-		{
-			name:  "Test when checking account status api call is a SUCCESS but an account is not yet ready",
-			input: []byte("TrackingId1234"),
-			response: &models.TrackStatusResponse{
-				Ok: true,
-				Result: struct {
-					Transaction struct {
-						CreatedAt     time.Time   "json:\"createdAt\""
-						Status        string      "json:\"status\""
-						TransferValue json.Number "json:\"transferValue\""
-						TxHash        string      "json:\"txHash\""
-						TxType        string      "json:\"txType\""
-					}
-				}{
-					Transaction: models.Transaction{
-						CreatedAt:     time.Now(),
-						Status:        "IN_NETWORK",
-						TransferValue: json.Number("0.5"),
-						TxHash:        "0x123abc456def",
-						TxType:        "transfer",
-					},
-				},
-			},
-			expectedResult: resource.Result{
-				FlagSet:   []uint32{flag_account_pending},
-				FlagReset: []uint32{flag_api_error, flag_account_success},
+				FlagReset: []uint32{flag_account_pending},
 			},
 		},
 	}
+
+	typ := utils.DATA_TRACKING_ID
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			mockDataStore := new(mocks.MockUserDataStore)
-			mockCreateAccountService := new(mocks.MockAccountService)
 
-			h := &Handlers{
-				userdataStore:  mockDataStore,
-				accountService: mockCreateAccountService,
-				flagManager:    fm.parser,
-			}
-
-			status := tt.response.Result.Transaction.Status
 			// Define expected interactions with the mock
-			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_TRACKING_ID).Return(tt.input, nil)
+			mockDataStore.On("ReadEntry", ctx, sessionId, typ).Return(tt.input, nil)
 
-			mockCreateAccountService.On("CheckAccountStatus", string(tt.input)).Return(tt.response, nil)
-			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_ACCOUNT_STATUS, []byte(status)).Return(nil).Maybe()
+			mockCreateAccountService.On("CheckAccountStatus", string(tt.input)).Return(tt.status, nil)
+			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_ACCOUNT_STATUS, []byte(tt.status)).Return(nil)
 
 			// Call the method under test
-			res, _ := h.CheckAccountStatus(ctx, "check_account_status", tt.input)
+			res, _ := h.CheckAccountStatus(ctx, "check_status", tt.input)
 
 			// Assert that no errors occurred
 			assert.NoError(t, err)
@@ -1455,14 +1361,14 @@ func TestIsValidPIN(t *testing.T) {
 	}
 }
 
-func TestValidateAmount(t *testing.T) {
+func TestQuitWithBalance(t *testing.T) {
 	fm, err := NewFlagManager(flagsPath)
 
 	if err != nil {
 		t.Logf(err.Error())
 	}
-	flag_invalid_amount, _ := fm.parser.GetFlag("flag_invalid_amount")
-	flag_api_error, _ := fm.GetFlag("flag_api_call_error")
+	flag_account_authorized, _ := fm.parser.GetFlag("flag_account_authorized")
+
 	mockDataStore := new(mocks.MockUserDataStore)
 	mockCreateAccountService := new(mocks.MockAccountService)
 
@@ -1476,69 +1382,19 @@ func TestValidateAmount(t *testing.T) {
 		flagManager:    fm.parser,
 	}
 	tests := []struct {
-		name            string
-		input           []byte
-		publicKey       []byte
-		balanceResponse *models.BalanceResponse
-		expectedResult  resource.Result
+		name           string
+		input          []byte
+		publicKey      []byte
+		balance        string
+		expectedResult resource.Result
 	}{
 		{
-			name:  "Test with valid amount",
-			input: []byte("0.001"),
-			balanceResponse: &models.BalanceResponse{
-				Ok: true,
-				Result: struct {
-					Balance string      `json:"balance"`
-					Nonce   json.Number `json:"nonce"`
-				}{
-					Balance: "0.003 CELO",
-					Nonce:   json.Number("0"),
-				},
-			},
+			name:      "Test quit with balance",
+			balance:   "0.02CELO",
 			publicKey: []byte("0xrqeqrequuq"),
 			expectedResult: resource.Result{
-				Content:   "0.001",
-				FlagReset: []uint32{flag_api_error},
-			},
-		},
-		{
-			name:  "Test with amount larger than balance",
-			input: []byte("0.02"),
-			balanceResponse: &models.BalanceResponse{
-				Ok: true,
-				Result: struct {
-					Balance string      `json:"balance"`
-					Nonce   json.Number `json:"nonce"`
-				}{
-					Balance: "0.003 CELO",
-					Nonce:   json.Number("0"),
-				},
-			},
-			publicKey: []byte("0xrqeqrequuq"),
-			expectedResult: resource.Result{
-				FlagSet:   []uint32{flag_invalid_amount},
-				FlagReset: []uint32{flag_api_error},
-				Content:   "0.02",
-			},
-		},
-		{
-			name:  "Test with invalid amount",
-			input: []byte("0.02ms"),
-			balanceResponse: &models.BalanceResponse{
-				Ok: true,
-				Result: struct {
-					Balance string      `json:"balance"`
-					Nonce   json.Number `json:"nonce"`
-				}{
-					Balance: "0.003 CELO",
-					Nonce:   json.Number("0"),
-				},
-			},
-			publicKey: []byte("0xrqeqrequuq"),
-			expectedResult: resource.Result{
-				FlagSet:   []uint32{flag_invalid_amount},
-				FlagReset: []uint32{flag_api_error},
-				Content:   "0.02ms",
+				FlagReset: []uint32{flag_account_authorized},
+				Content:   fmt.Sprintf("Your account balance is %s", "0.02CELO"),
 			},
 		},
 	}
@@ -1547,7 +1403,86 @@ func TestValidateAmount(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 
 			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return(tt.publicKey, nil)
-			mockCreateAccountService.On("CheckBalance", string(tt.publicKey)).Return(tt.balanceResponse, nil)
+			mockCreateAccountService.On("CheckBalance", string(tt.publicKey)).Return(tt.balance, nil)
+
+			// Call the method under test
+			res, _ := h.QuitWithBalance(ctx, "test_quit_with_balance", tt.input)
+
+			// Assert that no errors occurred
+			assert.NoError(t, err)
+
+			//Assert that the account created flag has been set to the result
+			assert.Equal(t, res, tt.expectedResult, "Expected result should be equal to the actual result")
+
+			// Assert that expectations were met
+			mockDataStore.AssertExpectations(t)
+
+		})
+	}
+}
+
+func TestValidateAmount(t *testing.T) {
+	fm, err := NewFlagManager(flagsPath)
+
+	if err != nil {
+		t.Logf(err.Error())
+	}
+	flag_invalid_amount, _ := fm.parser.GetFlag("flag_invalid_amount")
+	mockDataStore := new(mocks.MockUserDataStore)
+	mockCreateAccountService := new(mocks.MockAccountService)
+
+	sessionId := "session123"
+
+	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
+
+	h := &Handlers{
+		userdataStore:  mockDataStore,
+		accountService: mockCreateAccountService,
+		flagManager:    fm.parser,
+	}
+	tests := []struct {
+		name           string
+		input          []byte
+		publicKey      []byte
+		balance        string
+		expectedResult resource.Result
+	}{
+		{
+			name:      "Test with valid amount",
+			input:     []byte("0.001"),
+			balance:   "0.003 CELO",
+			publicKey: []byte("0xrqeqrequuq"),
+			expectedResult: resource.Result{
+				Content: "0.001",
+			},
+		},
+		{
+			name:      "Test with amount larger than balance",
+			input:     []byte("0.02"),
+			balance:   "0.003 CELO",
+			publicKey: []byte("0xrqeqrequuq"),
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_invalid_amount},
+				Content: "0.02",
+			},
+		},
+		{
+			name:      "Test with invalid amount",
+			input:     []byte("0.02ms"),
+			balance:   "0.003 CELO",
+			publicKey: []byte("0xrqeqrequuq"),
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_invalid_amount},
+				Content: "0.02ms",
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+
+			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return(tt.publicKey, nil)
+			mockCreateAccountService.On("CheckBalance", string(tt.publicKey)).Return(tt.balance, nil)
 			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_AMOUNT, tt.input).Return(nil).Maybe()
 
 			// Call the method under test
@@ -1626,83 +1561,31 @@ func TestValidateRecipient(t *testing.T) {
 
 func TestCheckBalance(t *testing.T) {
 
+	mockDataStore := new(mocks.MockUserDataStore)
 	sessionId := "session123"
 	publicKey := "0X13242618721"
-	fm, _ := NewFlagManager(flagsPath)
-	flag_api_error, _ := fm.GetFlag("flag_api_call_error")
+	balance := "0.003 CELO"
+
+	expectedResult := resource.Result{
+		Content: "0.003 CELO",
+	}
+
+	mockCreateAccountService := new(mocks.MockAccountService)
 
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
-	tests := []struct {
-		name           string
-		balanceResonse *models.BalanceResponse
-		expectedResult resource.Result
-	}{
-		{
-			name: "Test when checking a balance is not a success",
-			balanceResonse: &models.BalanceResponse{
-				Ok: false,
-				Result: struct {
-					Balance string      `json:"balance"`
-					Nonce   json.Number `json:"nonce"`
-				}{
-					Balance: "0.003 CELO",
-					Nonce:   json.Number("0"),
-				},
-			},
-			expectedResult: resource.Result{
-				FlagSet: []uint32{flag_api_error},
-			},
-		},
-		{
-			name: "Test when checking a  balance is a success",
-			balanceResonse: &models.BalanceResponse{
-				Ok: true,
-				Result: struct {
-					Balance string      `json:"balance"`
-					Nonce   json.Number `json:"nonce"`
-				}{
-					Balance: "0.003 CELO",
-					Nonce:   json.Number("0"),
-				},
-			},
-			expectedResult: resource.Result{
-				Content:   "0.003 CELO",
-				FlagReset: []uint32{flag_api_error},
-			},
-		},
+	h := &Handlers{
+		userdataStore:  mockDataStore,
+		accountService: mockCreateAccountService,
+		//flagManager:    fm.parser,
 	}
+	//mock call operations
+	mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return([]byte(publicKey), nil)
+	mockCreateAccountService.On("CheckBalance", string(publicKey)).Return(balance, nil)
 
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
+	res, _ := h.CheckBalance(ctx, "check_balance", []byte("123456"))
 
-			mockDataStore := new(mocks.MockUserDataStore)
-			mockCreateAccountService := new(mocks.MockAccountService)
-			mockState := state.NewState(16)
-
-			// Create the Handlers instance with the mock store
-			h := &Handlers{
-				userdataStore:  mockDataStore,
-				flagManager:    fm.parser,
-				st:             mockState,
-				accountService: mockCreateAccountService,
-			}
-
-			// Set up the expected behavior of the mock
-			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return([]byte(publicKey), nil)
-			mockCreateAccountService.On("CheckBalance", string(publicKey)).Return(tt.balanceResonse, nil)
-
-			// Call the method
-			res, _ := h.CheckBalance(ctx, "check_balance", []byte(""))
-
-			// Assert that expectations were met
-			mockDataStore.AssertExpectations(t)
-
-			//Assert that the result set to content is what was expected
-			assert.Equal(t, res, tt.expectedResult, "Result should contain flags set according to user input")
-
-		})
-	}
+	assert.Equal(t, res, expectedResult, "Result should contain flag(s) that have been reset")
 
 }
 
@@ -1712,50 +1595,23 @@ func TestGetProfile(t *testing.T) {
 
 	mockDataStore := new(mocks.MockUserDataStore)
 	mockCreateAccountService := new(mocks.MockAccountService)
-	mockState := state.NewState(16)
 
 	h := &Handlers{
 		userdataStore:  mockDataStore,
 		accountService: mockCreateAccountService,
-		st:             mockState,
 	}
+	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
 	tests := []struct {
-		name         string
-		languageCode string
-		keys         []utils.DataTyp
-		profileInfo  []string
-		result       resource.Result
+		name        string
+		keys        []utils.DataTyp
+		profileInfo []string
+		result      resource.Result
 	}{
 		{
-			name:         "Test with full profile information in eng",
-			keys:         []utils.DataTyp{utils.DATA_FAMILY_NAME, utils.DATA_FIRST_NAME, utils.DATA_GENDER, utils.DATA_OFFERINGS, utils.DATA_LOCATION, utils.DATA_YOB},
-			profileInfo:  []string{"Doee", "John", "Male", "Bananas", "Kilifi", "1976"},
-			languageCode: "eng",
-			result: resource.Result{
-				Content: fmt.Sprintf(
-					"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
-					"John Doee", "Male", "48", "Kilifi", "Bananas",
-				),
-			},
-		},
-		{
-			name:         "Test with with profile information in swa ",
-			keys:         []utils.DataTyp{utils.DATA_FAMILY_NAME, utils.DATA_FIRST_NAME, utils.DATA_GENDER, utils.DATA_OFFERINGS, utils.DATA_LOCATION, utils.DATA_YOB},
-			profileInfo:  []string{"Doee", "John", "Male", "Bananas", "Kilifi", "1976"},
-			languageCode: "swa",
-			result: resource.Result{
-				Content: fmt.Sprintf(
-					"Jina: %s\nJinsia: %s\nUmri: %s\nEneo: %s\nUnauza: %s\n",
-					"John Doee", "Male", "48", "Kilifi", "Bananas",
-				),
-			},
-		},
-		{
-			name:         "Test with with profile information with language that is not yet supported",
-			keys:         []utils.DataTyp{utils.DATA_FAMILY_NAME, utils.DATA_FIRST_NAME, utils.DATA_GENDER, utils.DATA_OFFERINGS, utils.DATA_LOCATION, utils.DATA_YOB},
-			profileInfo:  []string{"Doee", "John", "Male", "Bananas", "Kilifi", "1976"},
-			languageCode: "nor",
+			name:        "Test with full profile information",
+			keys:        []utils.DataTyp{utils.DATA_FAMILY_NAME, utils.DATA_FIRST_NAME, utils.DATA_GENDER, utils.DATA_OFFERINGS, utils.DATA_LOCATION, utils.DATA_YOB},
+			profileInfo: []string{"Doee", "John", "Male", "Bananas", "Kilifi", "1976"},
 			result: resource.Result{
 				Content: fmt.Sprintf(
 					"Name: %s\nGender: %s\nAge: %s\nLocation: %s\nYou provide: %s\n",
@@ -1766,14 +1622,9 @@ func TestGetProfile(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			ctx := context.WithValue(context.Background(), "SessionId", sessionId)
-			ctx = context.WithValue(ctx, "Language", lang.Language{
-				Code: tt.languageCode,
-			})
 			for index, key := range tt.keys {
-				mockDataStore.On("ReadEntry", ctx, sessionId, key).Return([]byte(tt.profileInfo[index]), nil).Maybe()
+				mockDataStore.On("ReadEntry", ctx, sessionId, key).Return([]byte(tt.profileInfo[index]), nil)
 			}
-
 			res, _ := h.GetProfileInfo(ctx, "get_profile_info", []byte(""))
 
 			// Assert that expectations were met
@@ -1930,85 +1781,3 @@ func TestConfirmPin(t *testing.T) {
 	}
 
 }
-
-func TestFetchCustodialBalances(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 := context.WithValue(context.Background(), "SessionId", sessionId)
-
-	tests := []struct {
-		name           string
-		balanceResonse *models.BalanceResponse
-		expectedResult resource.Result
-	}{
-		{
-			name: "Test when fetch custodial balances is not a success",
-			balanceResonse: &models.BalanceResponse{
-				Ok: false,
-				Result: struct {
-					Balance string      `json:"balance"`
-					Nonce   json.Number `json:"nonce"`
-				}{
-					Balance: "0.003 CELO",
-					Nonce:   json.Number("0"),
-				},
-			},
-			expectedResult: resource.Result{
-				FlagSet: []uint32{flag_api_error},
-			},
-		},
-		{
-			name: "Test when fetch custodial balances is a success",
-			balanceResonse: &models.BalanceResponse{
-				Ok: true,
-				Result: struct {
-					Balance string      `json:"balance"`
-					Nonce   json.Number `json:"nonce"`
-				}{
-					Balance: "0.003 CELO",
-					Nonce:   json.Number("0"),
-				},
-			},
-			expectedResult: resource.Result{
-				FlagReset: []uint32{flag_api_error},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-
-			mockDataStore := new(mocks.MockUserDataStore)
-			mockCreateAccountService := new(mocks.MockAccountService)
-			mockState := state.NewState(16)
-
-			// Create the Handlers instance with the mock store
-			h := &Handlers{
-				userdataStore:  mockDataStore,
-				flagManager:    fm.parser,
-				st:             mockState,
-				accountService: mockCreateAccountService,
-			}
-
-			// Set up the expected behavior of the mock
-			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return([]byte(publicKey), nil)
-			mockCreateAccountService.On("CheckBalance", string(publicKey)).Return(tt.balanceResonse, nil)
-
-			// Call the method
-			res, _ := h.FetchCustodialBalances(ctx, "fetch_custodial_balances", []byte(""))
-
-			// Assert that expectations were met
-			mockDataStore.AssertExpectations(t)
-
-			//Assert that the result set to content is what was expected
-			assert.Equal(t, res, tt.expectedResult, "Result should contain flags set according to user input")
-
-		})
-	}
-}

internal/mocks/servicemock.go

@@ -15,12 +15,12 @@ func (m *MockAccountService) CreateAccount() (*models.AccountResponse, error) {
 	return args.Get(0).(*models.AccountResponse), args.Error(1)
 }
 
-func (m *MockAccountService) CheckBalance(publicKey string) (*models.BalanceResponse, error) {
+func (m *MockAccountService) CheckBalance(publicKey string) (string, error) {
 	args := m.Called(publicKey)
-	return args.Get(0).(*models.BalanceResponse), args.Error(1)
+	return args.String(0), args.Error(1)
 }
 
-func (m *MockAccountService) CheckAccountStatus(trackingId string) (*models.TrackStatusResponse, error) {
+func (m *MockAccountService) CheckAccountStatus(trackingId string) (string, error) {
 	args := m.Called(trackingId)
-	return args.Get(0).(*models.TrackStatusResponse), args.Error(1)
+	return args.String(0), args.Error(1)
 }

internal/models/trackstatusresponse.go

@@ -5,13 +5,6 @@ import (
 	"time"
 )
 
-type Transaction struct {
-	CreatedAt     time.Time   `json:"createdAt"`
-	Status        string      `json:"status"`
-	TransferValue json.Number `json:"transferValue"`
-	TxHash        string      `json:"txHash"`
-	TxType        string      `json:"txType"`
-}
 
 type TrackStatusResponse struct {
 	Ok     bool `json:"ok"`
@@ -24,4 +17,4 @@ type TrackStatusResponse struct {
 			TxType        string      `json:"txType"`
 		}
 	} `json:"result"`
-}
+}

internal/storage/db.go

@@ -1,43 +0,0 @@
-package storage
-
-import (
-	"context"
-
-	"git.defalsify.org/vise.git/db"
-)
-
-const (
-	DATATYPE_USERSUB = 64
-)
-
-type SubPrefixDb struct {
-	store db.Db
-	pfx []byte
-}
-
-func NewSubPrefixDb(store db.Db, pfx []byte) *SubPrefixDb {
-	return &SubPrefixDb{
-		store: store,
-		pfx: pfx,
-	}
-}
-
-func(s *SubPrefixDb) toKey(k []byte) []byte {
-        return append(s.pfx, k...)
-}
-
-func(s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
-        s.store.SetPrefix(DATATYPE_USERSUB)
-	key = s.toKey(key)
-        v, err := s.store.Get(ctx, key)
-        if err != nil {
-                return nil, err
-        }
-        return v, nil
-}
-
-func(s *SubPrefixDb) Put(ctx context.Context, key []byte, val []byte) error {
-        s.store.SetPrefix(DATATYPE_USERSUB)
-	key = s.toKey(key)
-        return s.store.Put(ctx, key, val)
-}

internal/storage/db_test.go

@@ -1,54 +0,0 @@
-package storage
-
-import (
-	"bytes"
-	"context"
-	"testing"
-
-	memdb "git.defalsify.org/vise.git/db/mem"
-)
-
-func TestSubPrefix(t *testing.T) {
-	ctx := context.Background()
-	db := memdb.NewMemDb()
-	err := db.Connect(ctx, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	sdba := NewSubPrefixDb(db, []byte("tinkywinky"))
-	err = sdba.Put(ctx, []byte("foo"), []byte("dipsy"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	r, err := sdba.Get(ctx, []byte("foo"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !bytes.Equal(r, []byte("dipsy")) {
-		t.Fatalf("expected 'dipsy', got %s", r)
-	}
-
-	sdbb := NewSubPrefixDb(db, []byte("lala"))
-	r, err = sdbb.Get(ctx, []byte("foo"))
-	if err == nil {
-		t.Fatal("expected not found")
-	}
-
-	err = sdbb.Put(ctx, []byte("foo"), []byte("pu"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	r, err = sdbb.Get(ctx, []byte("foo"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !bytes.Equal(r, []byte("pu")) {
-		t.Fatalf("expected 'pu', got %s", r)
-	}
-
-	r, err = sdba.Get(ctx, []byte("foo"))
-	if !bytes.Equal(r, []byte("dipsy")) {
-		t.Fatalf("expected 'dipsy', got %s", r)
-	}
-}

internal/storage/storage.go

@@ -5,6 +5,10 @@ import (
 	"git.defalsify.org/vise.git/persist"
 )
 
+const (
+	DATATYPE_CUSTOM = 128 
+)
+
 type Storage struct {
 	Persister *persist.Persister
 	UserdataDb db.Db	

internal/testutil/TestEngine.go

@@ -33,7 +33,7 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 		Root:       "root",
 		SessionId:  sessionId,
 		OutputSize: uint32(160),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
 	}
 
 	dbDir := ".test_state"
@@ -79,12 +79,8 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 		os.Exit(1)
 	}
 
-	if AccountService == nil {
-		AccountService = &server.AccountService{}
-	}
-
 	switch AccountService.(type) {
-	case *server.TestAccountService:
+	case *server.MockAccountService:
 		go func() {
 			eventChannel <- false
 		}()
@@ -117,5 +113,7 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 		}
 		logg.Infof("testengine storage closed")
 	}
+
+	//en = en.WithDebug(nil)
 	return en, cleanFn, eventChannel
 }

internal/testutil/offlinetest.go

@@ -1,11 +0,0 @@
-// +build !online
-
-package testutil
-
-import (
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
-)
-
-var (
-	AccountService server.AccountServiceInterface = &server.TestAccountService{}
-)

internal/testutil/onlinetest.go

@@ -1,9 +0,0 @@
-// +build online
-
-package testutil
-
-import "git.grassecon.net/urdt/ussd/internal/handlers/server"
-
-var (
-	AccountService server.AccountServiceInterface
-)

internal/testutil/tag_offline.go

@@ -0,0 +1,13 @@
+// +build !online
+
+package testutil
+
+import (
+	"git.grassecon.net/urdt/ussd/internal/handlers/server"
+)
+
+var AccountService server.AccountServiceInterface
+
+func init() {
+	AccountService = &server.MockAccountService{}
+}

internal/testutil/tag_online.go

@@ -0,0 +1,12 @@
+//go:build online
+// +build online
+
+package testutil
+
+import "git.grassecon.net/urdt/ussd/internal/handlers/server"
+
+var AccountService server.AccountServiceInterface
+
+func init() {
+	AccountService = &server.AccountService{}
+}

services/registration/amount.vis

@@ -5,7 +5,6 @@ MOUT back 0
 HALT
 LOAD validate_amount 64
 RELOAD validate_amount
-CATCH api_failure  flag_api_call_error  1
 CATCH invalid_amount flag_invalid_amount 1
 INCMP _ 0
 LOAD get_recipient 12

services/registration/api_failure

@@ -1 +0,0 @@
-Failed to connect to the custodial service.Please try again.

services/registration/api_failure.vis

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

services/registration/balances.vis

@@ -1,5 +1,4 @@
 LOAD reset_account_authorized 0
-RELOAD reset_account_authorized
 MOUT my_balance 1
 MOUT community_balance 2
 MOUT back 0

services/registration/community_balance

@@ -1 +1 @@
-{{.fetch_custodial_balances}}
+Your community balance is: 0.00SRF

services/registration/community_balance.vis

@@ -1,11 +1,5 @@
-LOAD reset_incorrect 6
-LOAD fetch_custodial_balances 0
-CATCH api_failure  flag_api_call_error  1
-MAP fetch_custodial_balances
+LOAD reset_incorrect 0
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
-MOUT back 0
-MOUT quit 9
+LOAD quit_with_balance 0
 HALT
-INCMP _ 0
-INCMP quit 9

services/registration/confirm_pin_change

@@ -1 +1 @@
-Confirm your new PIN:
+Confirm your new PIN:

services/registration/confirm_pin_change.vis

@@ -2,6 +2,4 @@ CATCH invalid_pin flag_valid_pin 0
 MOUT back 0
 HALT
 INCMP _ 0
-INCMP * pin_reset_success
-
-
+INCMP pin_reset_success * 

services/registration/confirm_pin_change_swa

@@ -1 +1 @@
-Thibitisha PIN yako mpya:
+Thibitisha PIN yako mpya:

services/registration/edit_profile.vis

@@ -18,4 +18,4 @@ INCMP select_gender 3
 INCMP enter_yob 4
 INCMP enter_location 5
 INCMP enter_offerings 6
-INCMP view_profile 7
+INCMP view_profile 7

services/registration/enter_familyname_swa

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

services/registration/enter_name.vis

@@ -7,6 +7,3 @@ HALT
 RELOAD save_firstname
 INCMP _ 0
 INCMP pin_entry *
-
-
-

services/registration/invalid_pin_swa

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

services/registration/language_changed.vis

@@ -1,3 +1,4 @@
+RELOAD reset_account_authorized
 MOUT back 0
 MOUT quit 9
 HALT

services/registration/main.vis

@@ -1,6 +1,5 @@
 LOAD check_balance 64
 RELOAD check_balance
-CATCH api_failure  flag_api_call_error  1
 MAP check_balance
 MOUT send 1
 MOUT vouchers 2

services/registration/my_balance

@@ -1 +1 @@
-{{.fetch_custodial_balances}}
+Your balance is: 0.00 SRF

services/registration/my_balance.vis

@@ -1,11 +1,5 @@
-LOAD reset_incorrect 6
-LOAD fetch_custodial_balances 0
-CATCH api_failure  flag_api_call_error  1
-MAP fetch_custodial_balances
+LOAD reset_incorrect 0
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
-MOUT back 0
-MOUT quit 9
+LOAD quit_with_balance 0
 HALT
-INCMP _ 0
-INCMP quit 9

services/registration/my_vouchers

@@ -0,0 +1 @@
+My vouchers

services/registration/my_vouchers.vis

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

services/registration/new_pin

@@ -1 +1 @@
-Enter a new four number PIN:
+Enter a new four number PIN:

services/registration/new_pin.vis

@@ -1,13 +1,10 @@
-LOAD authorize_account 12
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH old_pin flag_allow_update 0
+CATCH _ flag_allow_update 0
 MOUT back 0
 HALT
 INCMP _ 0
 LOAD save_temporary_pin 6
-LOAD verify_new_pin 0
 RELOAD save_temporary_pin
+LOAD verify_new_pin 8
 RELOAD verify_new_pin
-INCMP * confirm_pin_change
-
+CATCH incorrect_pin flag_incorrect_pin 1
+INCMP confirm_pin_change * 

services/registration/new_pin_swa

@@ -1,2 +1 @@
-Weka PIN mpya ya nne nambari: 
-
+Weka PIN mpya ya nne nambari:

services/registration/old_pin

@@ -1 +1 @@
-Enter your old PIN
+Enter your old PIN

services/registration/old_pin.vis

@@ -1,7 +1,9 @@
 LOAD reset_allow_update 0
+RELOAD reset_allow_update
 MOUT back 0
 HALT
-RELOAD reset_allow_update
+LOAD authorize_account 12
+RELOAD authorize_account
+CATCH incorrect_pin flag_incorrect_pin 1
 INCMP _ 0
 INCMP new_pin *
-

services/registration/old_pin_swa

@@ -1 +1 @@
-Weka PIN yako ya zamani:
+Weka PIN yako ya zamani:

services/registration/pin_management.vis

@@ -4,5 +4,4 @@ MOUT guard_pin 3
 MOUT back 0
 HALT
 INCMP _ 0
-INCMP old_pin  1
-
+INCMP old_pin 1

services/registration/pin_reset_mismatch

@@ -1 +1 @@
-The PIN is not a match. Try again
+The PIN is not a match. Try again

services/registration/pin_reset_mismatch.vis

@@ -3,4 +3,3 @@ MOUT quit 9
 HALT
 INCMP confirm_pin_change 1
 INCMP quit 9
-

services/registration/pin_reset_success

@@ -1 +1 @@
-Your PIN change request has been successful
+Your PIN change request has been successful

services/registration/pin_reset_success.vis

@@ -1,10 +1,8 @@
 LOAD confirm_pin_change 0
 RELOAD confirm_pin_change
-CATCH pin_reset_mismatch  flag_pin_mismatch 1
+CATCH pin_reset_mismatch flag_pin_mismatch 1
 MOUT back 0
 MOUT quit 9
 HALT
 INCMP main 0
 INCMP quit 9
-
-

services/registration/pin_reset_success_swa

@@ -1 +1 @@
-Ombi lako la kubadili PIN limefanikiwa
+Ombi lako la kubadili PIN limefanikiwa

services/registration/pp.csv

@@ -14,4 +14,3 @@ flag,flag_valid_pin,20,this is set when the given PIN is valid
 flag,flag_allow_update,21,this is set to allow a user to update their profile data
 flag,flag_single_edit,22,this is set to allow a user to edit a single profile item such as year of birth
 flag,flag_incorrect_date_format,23,this is set when the given year of birth is invalid
-flag,flag_api_call_error,25,this is set when communication  to an external service fails

services/registration/profile_update_success

@@ -1 +1 @@
-Profile updated successfully
+Profile updated successfully

services/registration/profile_update_success_swa

@@ -1 +1 @@
-Ombi la Kuweka wasifu limefanikiwa
+Ombi la Kuweka wasifu limefanikiwa

services/registration/root.vis

@@ -1,8 +1,6 @@
 CATCH select_language flag_language_set 0
 CATCH terms flag_account_created 0
 LOAD check_account_status 0
-RELOAD check_account_status
-CATCH api_failure  flag_api_call_error  1
 CATCH account_pending flag_account_pending 1
 CATCH create_pin flag_pin_set 0
 CATCH main flag_account_success 1

services/registration/select_voucher_menu

@@ -0,0 +1 @@
+Select voucher

services/registration/view_menu_swa

@@ -1 +0,0 @@
-Angalia Wasifu

services/registration/voucher_details_menu

@@ -0,0 +1 @@
+Voucher details

test_engine/group_test.json

@@ -17,19 +17,19 @@
                 },
                 {
                     "input": "1",
-                    "expectedContent": "Enter your old PIN\n\n0:Back"
+                    "expectedContent": "Enter your old PIN\n0:Back"
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Enter a new four number PIN:\n\n0:Back"
+                    "expectedContent": "Enter a new four number PIN:\n0:Back"
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Confirm your new PIN:\n\n0:Back"
+                    "expectedContent": "Confirm your new PIN:\n0:Back"
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Your PIN change request has been successful\n\n0:Back\n9:Quit"
+                    "expectedContent": "Your PIN change request has been successful\n0:Back\n9:Quit"
                 },
                 {
                     "input": "0",
@@ -74,98 +74,6 @@
                 }
             ]
         },
-        {
-            "name": "menu_my_account_check_my_balance",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Your balance is 0.003 CELO\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                     "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
-                    
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_check_community_balance",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Your community balance is 0.003 CELO\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                     "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
-                    
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
         {
             "name": "menu_my_account_edit_firstname",
             "steps": [
@@ -191,7 +99,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
                 },
                 {
                     "input": "0",
@@ -232,7 +140,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
                 },
                 {
                     "input": "0",
@@ -274,7 +182,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
                 },
                 {
                     "input": "0",
@@ -315,7 +223,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
                 },
                 {
                     "input": "0",
@@ -356,7 +264,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
                 },
                 {
                     "input": "0",
@@ -397,7 +305,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
+                    "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
                 },
                 {
                     "input": "0",

test_engine/menu_traversal_test.go

@@ -1,4 +1,4 @@
-package menutraversaltest
+package main
 
 import (
 	"bytes"
@@ -131,6 +131,82 @@ func TestAccountRegistrationRejectTerms(t *testing.T) {
 	}
 }
 
+func TestSendWithInvalidInputs(t *testing.T) {
+	en, fn, _ := testutil.TestEngine(sessionID)
+	defer fn()
+	ctx := context.Background()
+	sessions := testData
+	for _, session := range sessions {
+		groups := driver.FilterGroupsByName(session.Groups, "send_with_invalid_inputs")
+		for _, group := range groups {
+			for _, step := range group.Steps {
+				cont, err := en.Exec(ctx, []byte(step.Input))
+				if err != nil {
+					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
+					return
+				}
+				if !cont {
+					break
+				}
+				w := bytes.NewBuffer(nil)
+				if _, err := en.Flush(ctx, w); err != nil {
+					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
+				}
+
+				b := w.Bytes()
+
+				// Extract the dynamic public key from the output
+				publicKey := extractPublicKey(b)
+
+				// Replace placeholder {public_key} with the actual dynamic public key
+				expectedContent := bytes.Replace([]byte(step.ExpectedContent), []byte("{public_key}"), []byte(publicKey), -1)
+				match, err := step.MatchesExpectedContent(b)
+				if err != nil {
+					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
+				}
+				if !match {
+					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", expectedContent, b)
+				}
+			}
+		}
+	}
+}
+
+func TestMyAccount_Check_My_Balance(t *testing.T) {
+	en, fn, _ := testutil.TestEngine(sessionID)
+	defer fn()
+	ctx := context.Background()
+	sessions := testData
+	for _, session := range sessions {
+		groups := driver.FilterGroupsByName(session.Groups, "menu_my_account_check_my_balance")
+		for _, group := range groups {
+			for index, step := range group.Steps {
+				t.Logf("step %v with input %v", index, step.Input)
+				cont, err := en.Exec(ctx, []byte(step.Input))
+				if err != nil {
+					t.Errorf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
+					return
+				}
+				if !cont {
+					break
+				}
+				w := bytes.NewBuffer(nil)
+				if _, err := en.Flush(ctx, w); err != nil {
+					t.Errorf("Test case '%s' failed during Flush: %v", group.Name, err)
+				}
+				b := w.Bytes()
+				match, err := step.MatchesExpectedContent(b)
+				if err != nil {
+					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
+				}
+				if !match {
+					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
+				}
+			}
+		}
+	}
+}
+
 func TestMainMenuHelp(t *testing.T) {
 	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
@@ -201,6 +277,41 @@ func TestMainMenuQuit(t *testing.T) {
 	}
 }
 
+func TestMyAccount_Check_Community_Balance(t *testing.T) {
+	en, fn, _ := testutil.TestEngine(sessionID)
+	defer fn()
+	ctx := context.Background()
+	sessions := testData
+	for _, session := range sessions {
+		groups := driver.FilterGroupsByName(session.Groups, "menu_my_account_check_community_balance")
+		for _, group := range groups {
+			for index, step := range group.Steps {
+				t.Logf("step %v with input %v", index, step.Input)
+				cont, err := en.Exec(ctx, []byte(step.Input))
+				if err != nil {
+					t.Errorf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
+					return
+				}
+				if !cont {
+					break
+				}
+				w := bytes.NewBuffer(nil)
+				if _, err := en.Flush(ctx, w); err != nil {
+					t.Errorf("Test case '%s' failed during Flush: %v", group.Name, err)
+				}
+				b := w.Bytes()
+				match, err := step.MatchesExpectedContent(b)
+				if err != nil {
+					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
+				}
+				if !match {
+					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
+				}
+			}
+		}
+	}
+}
+
 func TestMyAccount_MyAddress(t *testing.T) {
 	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
@@ -227,7 +338,6 @@ func TestMyAccount_MyAddress(t *testing.T) {
 
 				publicKey := extractPublicKey(b)
 				expectedContent := bytes.Replace([]byte(step.ExpectedContent), []byte("{public_key}"), []byte(publicKey), -1)
-				step.ExpectedContent = string(expectedContent)
 				match, err := step.MatchesExpectedContent(b)
 				if err != nil {
 					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)

test_engine/test_setup.json

@@ -127,6 +127,72 @@
                     }
                 ]
             },
+            {
+                "name": "menu_my_account_check_my_balance",
+                "steps": [
+                    {
+                        "input": "",
+                        "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    },
+                    {
+                        "input": "3",
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    },
+                    {
+                        "input": "3",
+                        "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent": "Please enter your PIN:"
+                    },
+                    {
+                        "input": "1235",
+                        "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent": "Please enter your PIN:"
+                    },
+                    {
+                        "input": "1234",
+                        "expectedContent": "Your balance is: 0.00 SRFYour account balance is 0.003 CELO"
+                    }
+                ]
+            },
+            {
+                "name": "menu_my_account_check_community_balance",
+                "steps": [
+                    {
+                        "input": "",
+                        "expectedContent": "Balance: 0.003 CELO\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
+                    },
+                    {
+                        "input": "3",
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
+                    },
+                    {
+                        "input": "3",
+                        "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
+                    },
+                    {
+                        "input": "2",
+                        "expectedContent": "Please enter your PIN:"
+                    },
+                    {
+                        "input": "1235",
+                        "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
+                    },
+                    {
+                        "input": "1",
+                        "expectedContent": "Please enter your PIN:"
+                    },
+                    {
+                        "input": "1234",
+                        "expectedContent": "Your balance is: 0.00 SRFYour account balance is 0.003 CELO"
+                    }
+                ]
+            },
             {
                 "name": "menu_my_account_my_address",
                 "steps": [