internal/handlers/server/accountservice.go

@@ -187,13 +187,19 @@ func (as *AccountService) CreateAccount() (*OKResponse, *ErrResponse) {
 	}
 }
 
-func (tas *TestAccountService) CreateAccount() (*OKResponse, *ErrResponse) {
+func (tas *TestAccountService) CreateAccount() (*models.AccountResponse, error) {
-	return &OKResponse{
+	return &models.AccountResponse{
-		Ok:          true,
+		Ok: true,
-		Description: "Account creation request received successfully",
+		Result: struct {
-		Result:      map[string]any{"publicKey": "0x48ADca309b5085852207FAaf2816eD72B52F527C", "trackingId": "28ebe84d-b925-472c-87ae-bbdfa1fb97be"},
+			CustodialId json.Number `json:"custodialId"`
+			PublicKey   string      `json:"publicKey"`
+			TrackingId  string      `json:"trackingId"`
+		}{
+			CustodialId: json.Number("182"),
+			PublicKey:   "0x48ADca309b5085852207FAaf2816eD72B52F527C",
+			TrackingId:  "28ebe84d-b925-472c-87ae-bbdfa1fb97be",
+		},
 	}, nil
-
 }
 
 func (tas *TestAccountService) CheckBalance(publicKey string) (*models.BalanceResponse, error) {
@@ -212,16 +218,6 @@ func (tas *TestAccountService) CheckBalance(publicKey string) (*models.BalanceRe
 	return balanceResponse, nil
 }
 
-func (tas *TestAccountService) TrackAccountStatus(publicKey string) (*OKResponse, *ErrResponse) {
-	return &OKResponse{
-		Ok:          true,
-		Description: "Account creation succeeded",
-		Result: map[string]any{
-			"active": true,
-		},
-	}, nil
-}
-
 func (tas *TestAccountService) CheckAccountStatus(trackingId string) (*models.TrackStatusResponse, error) {
 	trackResponse := &models.TrackStatusResponse{
 		Ok: true,

internal/handlers/ussd/menuhandler_test.go

@@ -1082,7 +1082,7 @@ func TestCheckAccountStatus(t *testing.T) {
 			input: []byte("TrackingId1234"),
 			serverResponse: &server.OKResponse{
 				Ok:          true,
-				Description: "Account creation succeeded",
+				Description: "Account creation successed",
 				Result: map[string]any{
 					"active": true,
 				},
@@ -1137,7 +1137,7 @@ func TestCheckAccountStatus(t *testing.T) {
 			},
 			serverResponse: &server.OKResponse{
 				Ok:          true,
-				Description: "Account creation succeeded",
+				Description: "Account creation successed",
 				Result: map[string]any{
 					"active": false,
 				},