internal/handlers/ussd/menuhandler.go

@@ -641,10 +641,6 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 		return res, fmt.Errorf("missing session")
 	}
 
-	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 {
@@ -661,8 +657,7 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 	}
 	res.FlagReset = append(res.FlagReset, flag_api_error)
 	balance := balanceResponse.Result.Balance
-
+	res.Content = balance
-	res.Content = l.Get("Balance: %s\n", balance)
 
 	return res, nil
 }
@@ -902,7 +897,7 @@ func (h *Handlers) GetRecipient(ctx context.Context, sym string, input []byte) (
 	return res, nil
 }
 
-// GetSender returns the sessionId (phoneNumber)
+// GetSender retrieves the public key from the Gdbm Db
 func (h *Handlers) GetSender(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 
@@ -911,7 +906,10 @@ func (h *Handlers) GetSender(ctx context.Context, sym string, input []byte) (res
 		return res, fmt.Errorf("missing session")
 	}
 
-	res.Content = string(sessionId)
+	store := h.userdataStore
+	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
+
+	res.Content = string(publicKey)
 
 	return res, nil
 }
@@ -948,12 +946,13 @@ func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []
 	// TODO
 	// Use the amount, recipient and sender to call the API and initialize the transaction
 	store := h.userdataStore
+	publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
 
 	amount, _ := store.ReadEntry(ctx, sessionId, utils.DATA_AMOUNT)
 
 	recipient, _ := store.ReadEntry(ctx, sessionId, utils.DATA_RECIPIENT)
 
-	res.Content = l.Get("Your request has been sent. %s will receive %s from %s.", string(recipient), string(amount), string(sessionId))
+	res.Content = l.Get("Your request has been sent. %s will receive %s from %s.", string(recipient), string(amount), string(publicKey))
 
 	account_authorized_flag, err := h.flagManager.GetFlag("flag_account_authorized")
 	if err != nil {

internal/handlers/ussd/menuhandler_test.go

@@ -516,8 +516,12 @@ func TestGetSender(t *testing.T) {
 	mockStore := new(mocks.MockUserDataStore)
 
 	// Define test data
-	sessionId := "254712345678"
+	sessionId := "session123"
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
+	publicKey := "0xcasgatweksalw1018221"
+
+	// Set up the expected behavior of the mock
+	mockStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return([]byte(publicKey), nil)
 
 	// Create the Handlers instance with the mock store
 	h := &Handlers{
@@ -525,10 +529,11 @@ func TestGetSender(t *testing.T) {
 	}
 
 	// Call the method
-	res, _ := h.GetSender(ctx, "get_sender", []byte(""))
+	res, _ := h.GetSender(ctx, "max_amount", []byte("check_balance"))
+
+	//Assert that the public key from readentry operation  is what was set as the result content.
+	assert.Equal(t, publicKey, res.Content)
 
-	//Assert that the sessionId is what was set as the result content.
-	assert.Equal(t, sessionId, res.Content)
 }
 
 func TestGetAmount(t *testing.T) {
@@ -1292,7 +1297,7 @@ func TestResetInvalidAmount(t *testing.T) {
 }
 
 func TestInitiateTransaction(t *testing.T) {
-	sessionId := "254712345678"
+	sessionId := "session123"
 
 	fm, err := NewFlagManager(flagsPath)
 
@@ -1315,26 +1320,30 @@ func TestInitiateTransaction(t *testing.T) {
 	tests := []struct {
 		name           string
 		input          []byte
+		PublicKey      []byte
 		Recipient      []byte
 		Amount         []byte
 		status         string
 		expectedResult resource.Result
 	}{
 		{
-			name:      "Test initiate transaction",
+			name:      "Test amount reset",
-			Amount:    []byte("0.002 CELO"),
+			PublicKey: []byte("0x1241527192"),
+			Amount:    []byte("0.002CELO"),
 			Recipient: []byte("0x12415ass27192"),
 			expectedResult: resource.Result{
 				FlagReset: []uint32{account_authorized_flag},
-				Content:   "Your request has been sent. 0x12415ass27192 will receive 0.002 CELO from 254712345678.",
+				Content:   "Your request has been sent. 0x12415ass27192 will receive 0.002CELO from 0x1241527192.",
 			},
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			// Define expected interactions with the mock
+			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_PUBLIC_KEY).Return(tt.PublicKey, nil)
 			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_AMOUNT).Return(tt.Amount, nil)
 			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_RECIPIENT).Return(tt.Recipient, nil)
+			//mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_AMOUNT, []byte("")).Return(nil)
 
 			// Call the method under test
 			res, _ := h.InitiateTransaction(ctx, "transaction_reset_amount", tt.input)
@@ -1347,8 +1356,10 @@ func TestInitiateTransaction(t *testing.T) {
 
 			// Assert that expectations were met
 			mockDataStore.AssertExpectations(t)
+
 		})
 	}
+
 }
 
 func TestQuit(t *testing.T) {
@@ -1627,6 +1638,7 @@ func TestValidateRecipient(t *testing.T) {
 }
 
 func TestCheckBalance(t *testing.T) {
+
 	sessionId := "session123"
 	publicKey := "0X13242618721"
 	fm, _ := NewFlagManager(flagsPath)
@@ -1656,7 +1668,7 @@ func TestCheckBalance(t *testing.T) {
 			},
 		},
 		{
-			name: "Test when checking a balance is a success",
+			name: "Test when checking a  balance is a success",
 			balanceResonse: &models.BalanceResponse{
 				Ok: true,
 				Result: struct {
@@ -1668,7 +1680,7 @@ func TestCheckBalance(t *testing.T) {
 				},
 			},
 			expectedResult: resource.Result{
-				Content:   "Balance: 0.003 CELO\n",
+				Content:   "0.003 CELO",
 				FlagReset: []uint32{flag_api_error},
 			},
 		},
@@ -1701,8 +1713,10 @@ func TestCheckBalance(t *testing.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")
+
 		})
 	}
+
 }
 
 func TestGetProfile(t *testing.T) {

services/registration/locale/swa/default.po

@@ -7,8 +7,6 @@ msgstr "Ombi lako limetumwa. %s atapokea %s kutoka kwa %s."
 msgid "Thank you for using Sarafu. Goodbye!"
 msgstr "Asante kwa kutumia huduma ya Sarafu. Kwaheri!"
 
+
 msgid "For more help,please call: 0757628885"
 msgstr "Kwa usaidizi zaidi,piga: 0757628885"
-
-msgid "Balance: %s\n"
-msgstr "Salio: %s\n"

services/registration/main

@@ -1 +1 @@
-{{.check_balance}}
+Balance: {{.check_balance}}

services/registration/main_swa

@@ -1 +1 @@
-{{.check_balance}}
+Salio: {{.check_balance}}