From 9cf1cbe4250f93ed77eacd58558101a3d21c70fa Mon Sep 17 00:00:00 2001
From: Carlosokumu <carlosokumu254@gmail.com>
Date: Wed, 20 Nov 2024 16:36:18 +0300
Subject: [PATCH 01/32] add swahili translation for catch node

---
 services/registration/_catch_swa | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 services/registration/_catch_swa

diff --git a/services/registration/_catch_swa b/services/registration/_catch_swa
new file mode 100644
index 0000000..3affebd
--- /dev/null
+++ b/services/registration/_catch_swa
@@ -0,0 +1 @@
+Tatizo la kimtambo limetokea,tafadhali jaribu tena baadaye.
\ No newline at end of file

From d20700ca7411cc9a9eaf88f40d92c56ec8d3551c Mon Sep 17 00:00:00 2001
From: Carlosokumu <carlosokumu254@gmail.com>
Date: Wed, 20 Nov 2024 16:39:50 +0300
Subject: [PATCH 02/32] fix size limit error

---
 services/registration/main.vis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/registration/main.vis b/services/registration/main.vis
index 7e1c9bf..7a27808 100644
--- a/services/registration/main.vis
+++ b/services/registration/main.vis
@@ -1,6 +1,6 @@
 LOAD set_default_voucher 8
 RELOAD set_default_voucher
-LOAD check_balance 64
+LOAD check_balance 128
 RELOAD check_balance
 LOAD check_vouchers 10
 RELOAD check_vouchers

From 451b15fb6b19fd27cc754f8509f2ef72ace38f9c Mon Sep 17 00:00:00 2001
From: Carlosokumu <carlosokumu254@gmail.com>
Date: Wed, 20 Nov 2024 17:13:14 +0300
Subject: [PATCH 03/32] explicit set_language reload

---
 services/registration/set_eng.vis | 1 +
 services/registration/set_swa.vis | 1 +
 2 files changed, 2 insertions(+)

diff --git a/services/registration/set_eng.vis b/services/registration/set_eng.vis
index 662fd2d..b66a1b7 100644
--- a/services/registration/set_eng.vis
+++ b/services/registration/set_eng.vis
@@ -1,3 +1,4 @@
 LOAD set_language 6
+RELOAD set_language
 CATCH terms flag_account_created 0
 MOVE language_changed
diff --git a/services/registration/set_swa.vis b/services/registration/set_swa.vis
index 662fd2d..b66a1b7 100644
--- a/services/registration/set_swa.vis
+++ b/services/registration/set_swa.vis
@@ -1,3 +1,4 @@
 LOAD set_language 6
+RELOAD set_language
 CATCH terms flag_account_created 0
 MOVE language_changed

From 7880294c6f9589bcad2da618945e786e7d42c35a Mon Sep 17 00:00:00 2001
From: Carlosokumu <carlosokumu254@gmail.com>
Date: Wed, 20 Nov 2024 17:14:25 +0300
Subject: [PATCH 04/32] set eng as default language

---
 internal/handlers/ussd/menuhandler.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index d8e6fa0..a58e344 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -154,7 +154,8 @@ func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (r
 	code := strings.Split(symbol, "_")[1]
 
 	if !utils.IsValidISO639(code) {
-		return res, nil
+		//Fallback to english instead? 
+		code = "eng"
 	}
 	res.FlagSet = append(res.FlagSet, state.FLAG_LANG)
 	res.Content = code

From 9b89462797be98f0477f1d7ea316a092cdd4791b Mon Sep 17 00:00:00 2001
From: Carlosokumu <carlosokumu254@gmail.com>
Date: Thu, 21 Nov 2024 11:21:16 +0300
Subject: [PATCH 05/32] add function to check validity of provided yob

---
 internal/utils/age.go | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/internal/utils/age.go b/internal/utils/age.go
index 6b040e7..59056a8 100644
--- a/internal/utils/age.go
+++ b/internal/utils/age.go
@@ -1,6 +1,9 @@
 package utils
 
-import "time"
+import (
+	"strconv"
+	"time"
+)
 
 // CalculateAge calculates the age based on a given birthdate and the current date in the format dd/mm/yy
 // It adjusts for cases where the current date is before the birthday in the current year.
@@ -25,11 +28,29 @@ func CalculateAge(birthdate, today time.Time) int {
 // It subtracts the YOB from the current year to determine the age.
 //
 // Parameters:
-//   yob: The year of birth as an integer.
+//
+//	yob: The year of birth as an integer.
 //
 // Returns:
-//   The calculated age as an integer.
+//
+//	The calculated age as an integer.
 func CalculateAgeWithYOB(yob int) int {
-    currentYear := time.Now().Year()
-    return currentYear - yob
-}
\ No newline at end of file
+	currentYear := time.Now().Year()
+	return currentYear - yob
+}
+
+
+//IsValidYob checks if the provided yob can be considered valid 
+func IsValidYOb(yob string) bool {
+	currentYear := time.Now().Year()
+	yearOfBirth, err := strconv.ParseInt(yob, 10, 64)
+	if err != nil {
+		return false
+	}
+	if yearOfBirth >= 1900 && int(yearOfBirth) <= currentYear {
+		return true
+	} else {
+		return false
+	}
+
+}

From 8925e26c4c85aec07702322925cefb608609228d Mon Sep 17 00:00:00 2001
From: Carlosokumu <carlosokumu254@gmail.com>
Date: Thu, 21 Nov 2024 11:25:47 +0300
Subject: [PATCH 06/32] refactor check for valid yob

---
 internal/handlers/ussd/menuhandler.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index a58e344..eeca3fd 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -154,7 +154,7 @@ func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (r
 	code := strings.Split(symbol, "_")[1]
 
 	if !utils.IsValidISO639(code) {
-		//Fallback to english instead? 
+		//Fallback to english instead?
 		code = "eng"
 	}
 	res.FlagSet = append(res.FlagSet, state.FLAG_LANG)
@@ -764,12 +764,11 @@ func (h *Handlers) VerifyYob(ctx context.Context, sym string, input []byte) (res
 		return res, nil
 	}
 
-	if len(date) == 4 {
+	if utils.IsValidYOb(date) {
 		res.FlagReset = append(res.FlagReset, flag_incorrect_date_format)
 	} else {
 		res.FlagSet = append(res.FlagSet, flag_incorrect_date_format)
 	}
-
 	return res, nil
 }
 

From d1e9340ea9888acd1bbc7dbb0dc4f9e71b6c6004 Mon Sep 17 00:00:00 2001
From: Carlosokumu <carlosokumu254@gmail.com>
Date: Thu, 21 Nov 2024 13:03:43 +0300
Subject: [PATCH 07/32] add voucher details

---
 models/voucher_data_result.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/models/voucher_data_result.go b/models/voucher_data_result.go
index c9f0b74..9a10831 100644
--- a/models/voucher_data_result.go
+++ b/models/voucher_data_result.go
@@ -1,8 +1,10 @@
 package models
 
 type VoucherDataResult struct {
-	TokenName     string `json:"tokenName"`
-	TokenSymbol   string `json:"tokenSymbol"`
-	TokenDecimals int    `json:"tokenDecimals"`
-	SinkAddress   string `json:"sinkAddress"`
+	TokenName      string `json:"tokenName"`
+	TokenSymbol    string `json:"tokenSymbol"`
+	TokenDecimals  int    `json:"tokenDecimals"`
+	SinkAddress    string `json:"sinkAddress"`
+	TokenCommodity string `json:"tokenCommodity"`
+	TokenLocation  string `json:"tokenLocation"`
 }

From b8d938d3aa99ddecd999a2a68cf6b326b8f9b71f Mon Sep 17 00:00:00 2001
From: Carlosokumu <carlosokumu254@gmail.com>
Date: Thu, 21 Nov 2024 13:04:19 +0300
Subject: [PATCH 08/32] add voucher details

---
 internal/handlers/ussd/menuhandler.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index d8e6fa0..8f206e3 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -1626,10 +1626,9 @@ func (h *Handlers) GetVoucherDetails(ctx context.Context, sym string, input []by
 		return res, nil
 	}
 
-	tokenSymbol := voucherData.TokenSymbol
-	tokenName := voucherData.TokenName
-
-	res.Content = fmt.Sprintf("%s %s", tokenSymbol, tokenName)
+	res.Content = fmt.Sprintf(
+		"name: %s\nsymbol: %s\ncommodity: %s\nlocation: %s", voucherData.TokenName, voucherData.TokenSymbol, voucherData.TokenCommodity, voucherData.TokenLocation,
+	)
 
 	return res, nil
 }

From 07df450b3c66e71caba203476e2678f880e57916 Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Thu, 21 Nov 2024 15:15:15 +0300
Subject: [PATCH 09/32] include labels to define the symbol and balance while
 selecting a voucher

---
 internal/handlers/ussd/menuhandler.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index eeca3fd..bb63209 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -1570,7 +1570,7 @@ func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (r
 	}
 
 	res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
-	res.Content = fmt.Sprintf("%s\n%s", metadata.TokenSymbol, metadata.Balance)
+	res.Content = fmt.Sprintf("Symbol: %s\nBalance: %s", metadata.TokenSymbol, metadata.Balance)
 
 	return res, nil
 }

From 1174500e3fce4d0621924d936370eac2d63ea9ad Mon Sep 17 00:00:00 2001
From: Carlosokumu <carlosokumu254@gmail.com>
Date: Thu, 21 Nov 2024 15:19:36 +0300
Subject: [PATCH 10/32] add test for  voucher details

---
 internal/handlers/ussd/menuhandler_test.go | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go
index 51693df..2559a54 100644
--- a/internal/handlers/ussd/menuhandler_test.go
+++ b/internal/handlers/ussd/menuhandler_test.go
@@ -2024,3 +2024,44 @@ func TestSetVoucher(t *testing.T) {
 
 	assert.Equal(t, string(tempData.TokenSymbol), res.Content)
 }
+
+func TestGetVoucherDetails(t *testing.T) {
+
+	ctx, store := InitializeTestStore(t)
+	fm, err := NewFlagManager(flagsPath)
+	if err != nil {
+		t.Logf(err.Error())
+	}
+	mockAccountService := new(mocks.MockAccountService)
+
+	sessionId := "session123"
+	ctx = context.WithValue(ctx, "SessionId", sessionId)
+	expectedResult := resource.Result{}
+
+	tokA_AAddress := "0x0000000000000000000000000000000000000000"
+
+	h := &Handlers{
+		userdataStore:  store,
+		flagManager:    fm.parser,
+		accountService: mockAccountService,
+	}
+	err = store.WriteEntry(ctx, sessionId, common.DATA_ACTIVE_ADDRESS, []byte(tokA_AAddress))
+	if err != nil {
+		t.Fatal(err)
+	}
+	tokenDetails := &models.VoucherDataResult{
+		TokenName:      "Token A",
+		TokenSymbol:    "TOKA",
+		TokenLocation:  "Kilifi,Kenya",
+		TokenCommodity: "Farming",
+	}
+	expectedResult.Content = fmt.Sprintf(
+		"name: %s\nsymbol: %s\ncommodity: %s\nlocation: %s", tokenDetails.TokenName, tokenDetails.TokenSymbol, tokenDetails.TokenCommodity, tokenDetails.TokenLocation,
+	)
+	mockAccountService.On("VoucherData", string(tokA_AAddress)).Return(tokenDetails, nil)
+
+	res, err := h.GetVoucherDetails(ctx, "SessionId", []byte(""))
+	assert.NoError(t, err)
+	assert.Equal(t, expectedResult, res)
+
+}

From b9ff467c0cb12b539c472c42a778e510a7570508 Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Thu, 21 Nov 2024 15:51:04 +0300
Subject: [PATCH 11/32] use the correct balance

---
 services/registration/my_balance_swa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/registration/my_balance_swa b/services/registration/my_balance_swa
index 9c3a7c7..afae8c1 100644
--- a/services/registration/my_balance_swa
+++ b/services/registration/my_balance_swa
@@ -1 +1 @@
-Salio lako ni: 0.00 SRF
\ No newline at end of file
+{{.check_balance}}
\ No newline at end of file

From e30bc177e96f0cba203c72c03065e854eb93a753 Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Thu, 21 Nov 2024 15:52:07 +0300
Subject: [PATCH 12/32] fixed typo and added a new translation

---
 services/registration/locale/swa/default.po | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/services/registration/locale/swa/default.po b/services/registration/locale/swa/default.po
index aa033b5..4bf876b 100644
--- a/services/registration/locale/swa/default.po
+++ b/services/registration/locale/swa/default.po
@@ -13,7 +13,7 @@ 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."
+msgid "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."
@@ -23,4 +23,7 @@ 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"
+msgstr "Salio la Kikundi: 0.00"
+
+msgid "Symbol: %s\nBalance: %s"
+msgstr "Sarafu: %s\nSalio: %s"

From 7ce50398d1b829535f59a6f0e60c5c1c1c822c2b Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Thu, 21 Nov 2024 15:54:00 +0300
Subject: [PATCH 13/32] use the language translation instead of hardcoded eng

---
 internal/handlers/ussd/menuhandler.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index bb63209..98baf9d 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -817,7 +817,8 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 		return res, err
 	}
 
-	res.Content = l.Get("Balance: %s\n", fmt.Sprintf("%s %s", activeBal, activeSym))
+	balStr := fmt.Sprintf("%s %s", activeBal, activeSym)
+	res.Content = l.Get("Balance: %s\n", balStr)
 
 	return res, nil
 }
@@ -1546,6 +1547,10 @@ func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (r
 		return res, fmt.Errorf("missing session")
 	}
 
+	code := codeFromCtx(ctx)
+	l := gotext.NewLocale(translationDir, code)
+	l.AddDomain("default")
+
 	flag_incorrect_voucher, _ := h.flagManager.GetFlag("flag_incorrect_voucher")
 
 	inputStr := string(input)
@@ -1570,7 +1575,7 @@ func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (r
 	}
 
 	res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
-	res.Content = fmt.Sprintf("Symbol: %s\nBalance: %s", metadata.TokenSymbol, metadata.Balance)
+	res.Content = l.Get("Symbol: %s\nBalance: %s", metadata.TokenSymbol, metadata.Balance)
 
 	return res, nil
 }

From 9847433e0ad64cc33d216df5830e7fd925334ca7 Mon Sep 17 00:00:00 2001
From: Carlosokumu <carlosokumu254@gmail.com>
Date: Fri, 22 Nov 2024 11:30:13 +0300
Subject: [PATCH 14/32] use _ for back navigation

---
 services/registration/edit_profile.vis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/registration/edit_profile.vis b/services/registration/edit_profile.vis
index af20e0f..cca6be6 100644
--- a/services/registration/edit_profile.vis
+++ b/services/registration/edit_profile.vis
@@ -11,7 +11,7 @@ MOUT edit_offerings 6
 MOUT view 7
 MOUT back 0
 HALT
-INCMP my_account 0
+INCMP _ 0
 INCMP edit_first_name 1
 INCMP edit_family_name 2
 INCMP select_gender 3

From 00c0445eed5e0e437907d90d125702194fbf2c92 Mon Sep 17 00:00:00 2001
From: Carlosokumu <carlosokumu254@gmail.com>
Date: Thu, 28 Nov 2024 11:28:00 +0300
Subject: [PATCH 15/32] show name without depending on family name being set

---
 internal/handlers/ussd/menuhandler.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index a0b7bd1..dfd046d 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -1391,10 +1391,14 @@ func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte)
 	// Construct the full name
 	name := defaultValue
 	if familyName != defaultValue {
-		if firstName == defaultValue {
-			name = familyName
-		} else {
+		if firstName != defaultValue {
 			name = firstName + " " + familyName
+		} else {
+			name = familyName
+		}
+	} else {
+		if firstName != defaultValue {
+			name = firstName
 		}
 	}
 

From c46f41e25f1a213e4d9ef0c0abcee2ee20f0256c Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Fri, 29 Nov 2024 14:47:22 +0300
Subject: [PATCH 16/32] Format the balance to 2 decimal places

---
 internal/handlers/ussd/menuhandler.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index dfd046d..bb0c9d8 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -811,7 +811,16 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 		return res, err
 	}
 
-	balStr := fmt.Sprintf("%s %s", activeBal, activeSym)
+	// Convert activeBal from []byte to float64
+	balFloat, err := strconv.ParseFloat(string(activeBal), 64)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to parse activeBal as float", "value", string(activeBal), "error", err)
+		return res, err
+	}
+
+	// Format to 2 decimal places
+	balStr := fmt.Sprintf("%.2f %s", balFloat, activeSym)
+
 	res.Content = l.Get("Balance: %s\n", balStr)
 
 	return res, nil

From aab6660edd2ac4b6004f50aeb1ee19d788c8e58b Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Fri, 29 Nov 2024 15:39:27 +0300
Subject: [PATCH 17/32] Capitalize menu items

---
 menutraversal_test/group_test.json    | 8 ++++----
 menutraversal_test/test_setup.json    | 8 ++++----
 services/registration/english_menu    | 1 +
 services/registration/incorrect_pin   | 2 +-
 services/registration/invalid_pin_swa | 2 +-
 services/registration/kiswahili_menu  | 1 +
 services/registration/next_menu       | 1 +
 services/registration/next_menu_swa   | 1 +
 services/registration/no_menu         | 2 +-
 services/registration/no_menu_swa     | 2 +-
 services/registration/prev_menu       | 1 +
 services/registration/prev_menu_swa   | 1 +
 services/registration/yes_menu        | 2 +-
 services/registration/yes_menu_swa    | 2 +-
 14 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 services/registration/english_menu
 create mode 100644 services/registration/kiswahili_menu
 create mode 100644 services/registration/next_menu
 create mode 100644 services/registration/next_menu_swa
 create mode 100644 services/registration/prev_menu
 create mode 100644 services/registration/prev_menu_swa

diff --git a/menutraversal_test/group_test.json b/menutraversal_test/group_test.json
index 52fab59..7985b22 100644
--- a/menutraversal_test/group_test.json
+++ b/menutraversal_test/group_test.json
@@ -54,7 +54,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -62,7 +62,7 @@
                 },
                 {
                     "input": "1234",
-                    "expectedContent": "Select language:\n0:english\n1:kiswahili"
+                    "expectedContent": "Select language:\n0:English\n1:Kiswahili"
                 },
                 {
                     "input": "0",
@@ -95,7 +95,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -141,7 +141,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
diff --git a/menutraversal_test/test_setup.json b/menutraversal_test/test_setup.json
index 4d8414f..1f9d61d 100644
--- a/menutraversal_test/test_setup.json
+++ b/menutraversal_test/test_setup.json
@@ -7,11 +7,11 @@
                 "steps": [
                     {
                         "input": "",
-                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:english\n1:kiswahili"
+                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:English\n1:Kiswahili"
                     },
                     {
                         "input": "0",
-                        "expectedContent": "Do you agree to terms and conditions?\n0:yes\n1:no"
+                        "expectedContent": "Do you agree to terms and conditions?\n0:Yes\n1:No"
                     },
                     {
                         "input": "0",
@@ -40,11 +40,11 @@
                 "steps": [
                     {
                         "input": "",
-                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:english\n1:kiswahili"
+                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:English\n1:Kiswahili"
                     },
                     {
                         "input": "0",
-                        "expectedContent": "Do you agree to terms and conditions?\n0:yes\n1:no"
+                        "expectedContent": "Do you agree to terms and conditions?\n0:Yes\n1:No"
                     },
                     {
                         "input": "1",
diff --git a/services/registration/english_menu b/services/registration/english_menu
new file mode 100644
index 0000000..3d38949
--- /dev/null
+++ b/services/registration/english_menu
@@ -0,0 +1 @@
+English
\ No newline at end of file
diff --git a/services/registration/incorrect_pin b/services/registration/incorrect_pin
index d11ab54..7fcf610 100644
--- a/services/registration/incorrect_pin
+++ b/services/registration/incorrect_pin
@@ -1 +1 @@
-Incorrect pin
\ No newline at end of file
+Incorrect PIN
\ No newline at end of file
diff --git a/services/registration/invalid_pin_swa b/services/registration/invalid_pin_swa
index 1817570..7512242 100644
--- a/services/registration/invalid_pin_swa
+++ b/services/registration/invalid_pin_swa
@@ -1 +1 @@
-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.
diff --git a/services/registration/kiswahili_menu b/services/registration/kiswahili_menu
new file mode 100644
index 0000000..e4d88a5
--- /dev/null
+++ b/services/registration/kiswahili_menu
@@ -0,0 +1 @@
+Kiswahili
\ No newline at end of file
diff --git a/services/registration/next_menu b/services/registration/next_menu
new file mode 100644
index 0000000..e2e838e
--- /dev/null
+++ b/services/registration/next_menu
@@ -0,0 +1 @@
+Next
\ No newline at end of file
diff --git a/services/registration/next_menu_swa b/services/registration/next_menu_swa
new file mode 100644
index 0000000..6511e40
--- /dev/null
+++ b/services/registration/next_menu_swa
@@ -0,0 +1 @@
+Mbele
\ No newline at end of file
diff --git a/services/registration/no_menu b/services/registration/no_menu
index 54299a4..289cc91 100644
--- a/services/registration/no_menu
+++ b/services/registration/no_menu
@@ -1 +1 @@
-no
\ No newline at end of file
+No
\ No newline at end of file
diff --git a/services/registration/no_menu_swa b/services/registration/no_menu_swa
index 3e6885e..a9d6b8d 100644
--- a/services/registration/no_menu_swa
+++ b/services/registration/no_menu_swa
@@ -1 +1 @@
-la
\ No newline at end of file
+La
\ No newline at end of file
diff --git a/services/registration/prev_menu b/services/registration/prev_menu
new file mode 100644
index 0000000..72d90d8
--- /dev/null
+++ b/services/registration/prev_menu
@@ -0,0 +1 @@
+Prev
\ No newline at end of file
diff --git a/services/registration/prev_menu_swa b/services/registration/prev_menu_swa
new file mode 100644
index 0000000..e5a3e45
--- /dev/null
+++ b/services/registration/prev_menu_swa
@@ -0,0 +1 @@
+Nyuma
\ No newline at end of file
diff --git a/services/registration/yes_menu b/services/registration/yes_menu
index 396a0ba..3fdfb3d 100644
--- a/services/registration/yes_menu
+++ b/services/registration/yes_menu
@@ -1 +1 @@
-yes
\ No newline at end of file
+Yes
\ No newline at end of file
diff --git a/services/registration/yes_menu_swa b/services/registration/yes_menu_swa
index c5231fb..542d3c3 100644
--- a/services/registration/yes_menu_swa
+++ b/services/registration/yes_menu_swa
@@ -1 +1 @@
-ndio
\ No newline at end of file
+Ndio
\ No newline at end of file

From 6b23c284e5c72bf7f1e517b31a3cb46fa256b1cd Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Sat, 30 Nov 2024 15:24:14 +0300
Subject: [PATCH 18/32] check vouchers before checking the balance

---
 services/registration/main.vis | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/registration/main.vis b/services/registration/main.vis
index 7e1c9bf..beb2d7c 100644
--- a/services/registration/main.vis
+++ b/services/registration/main.vis
@@ -1,10 +1,10 @@
 LOAD set_default_voucher 8
 RELOAD set_default_voucher
-LOAD check_balance 64
-RELOAD check_balance
 LOAD check_vouchers 10
 RELOAD check_vouchers
-CATCH api_failure  flag_api_call_error  1
+LOAD check_balance 64
+RELOAD check_balance
+CATCH api_failure flag_api_call_error  1
 MAP check_balance
 MOUT send 1
 MOUT vouchers 2

From 7a86b2ad3bb6b310b13f3faeda7bde9f587a16ea Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Sat, 30 Nov 2024 15:26:13 +0300
Subject: [PATCH 19/32] updated the UpdateVoucherData description

---
 common/vouchers.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/vouchers.go b/common/vouchers.go
index 81ca55f..c542084 100644
--- a/common/vouchers.go
+++ b/common/vouchers.go
@@ -151,7 +151,7 @@ func GetTemporaryVoucherData(ctx context.Context, store DataStore, sessionId str
 	return data, nil
 }
 
-// UpdateVoucherData sets the active voucher data in the DataStore.
+// UpdateVoucherData updates 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

From 54c1fe51ef66e66a5a927b50c7bc99bc48b0aec6 Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Sat, 30 Nov 2024 15:28:21 +0300
Subject: [PATCH 20/32] update the active voucher data when checking the
 current vouchers

---
 internal/handlers/ussd/menuhandler.go | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index 8d3b928..4b7fc7a 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -25,6 +25,7 @@ import (
 	"gopkg.in/leonelquinteros/gotext.v1"
 
 	"git.grassecon.net/urdt/ussd/internal/storage"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 )
 
 var (
@@ -1534,6 +1535,38 @@ func (h *Handlers) CheckVouchers(ctx context.Context, sym string, input []byte)
 		return res, nil
 	}
 
+	// check the current active sym and update the data
+	activeSym, _ := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_SYM)
+	if activeSym != nil {
+		activeSymStr := string(activeSym)
+
+		// Find the matching voucher data
+		var activeData *dataserviceapi.TokenHoldings
+		for _, voucher := range vouchersResp {
+			if voucher.TokenSymbol == activeSymStr {
+				activeData = &voucher
+				break
+			}
+		}
+
+		if activeData == nil {
+			logg.ErrorCtxf(ctx, "activeSym not found in vouchers", "activeSym", activeSymStr)
+			return res, fmt.Errorf("activeSym %s not found in vouchers", activeSymStr)
+		}
+
+		// Scale down the balance
+		scaledBalance := common.ScaleDownBalance(activeData.Balance, activeData.TokenDecimals)
+
+		// Update the balance field with the scaled value
+		activeData.Balance = scaledBalance
+
+		// Pass the matching voucher data to UpdateVoucherData
+		if err := common.UpdateVoucherData(ctx, h.userdataStore, sessionId, activeData); err != nil {
+			logg.ErrorCtxf(ctx, "failed on UpdateVoucherData", "error", err)
+			return res, err
+		}
+	}
+
 	data := common.ProcessVouchers(vouchersResp)
 
 	// Store all voucher data

From aa7497573e7c0d07eebd6d1e278c7af3ea34825d Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Sat, 30 Nov 2024 15:29:28 +0300
Subject: [PATCH 21/32] removed unused code

---
 internal/handlers/ussd/menuhandler.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index 4b7fc7a..ff9d11e 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -10,7 +10,6 @@ import (
 	"strings"
 
 	"git.defalsify.org/vise.git/asm"
-	"github.com/grassrootseconomics/eth-custodial/pkg/api"
 
 	"git.defalsify.org/vise.git/cache"
 	"git.defalsify.org/vise.git/db"
@@ -32,8 +31,6 @@ var (
 	logg           = logging.NewVanilla().WithDomain("ussdmenuhandler")
 	scriptDir      = path.Join("services", "registration")
 	translationDir = path.Join(scriptDir, "locale")
-	okResponse     *api.OKResponse
-	errResponse    *api.ErrResponse
 )
 
 // Define the regex patterns as constants

From 0091fbcabbc5d9e6e6d91bdbb6218e888d542496 Mon Sep 17 00:00:00 2001
From: Carlosokumu <carlosokumu254@gmail.com>
Date: Mon, 2 Dec 2024 08:55:24 +0300
Subject: [PATCH 22/32] fix: looped navigation

---
 services/registration/edit_profile.vis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/registration/edit_profile.vis b/services/registration/edit_profile.vis
index cca6be6..af20e0f 100644
--- a/services/registration/edit_profile.vis
+++ b/services/registration/edit_profile.vis
@@ -11,7 +11,7 @@ MOUT edit_offerings 6
 MOUT view 7
 MOUT back 0
 HALT
-INCMP _ 0
+INCMP my_account 0
 INCMP edit_first_name 1
 INCMP edit_family_name 2
 INCMP select_gender 3

From c2019267d1a77f55a4ae6f373416a5c80a93ef36 Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Mon, 2 Dec 2024 13:26:46 +0300
Subject: [PATCH 23/32] capitalize the voucher descriptions

---
 internal/handlers/ussd/menuhandler.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index 8f206e3..5bc95bc 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -1627,7 +1627,7 @@ func (h *Handlers) GetVoucherDetails(ctx context.Context, sym string, input []by
 	}
 
 	res.Content = fmt.Sprintf(
-		"name: %s\nsymbol: %s\ncommodity: %s\nlocation: %s", voucherData.TokenName, voucherData.TokenSymbol, voucherData.TokenCommodity, voucherData.TokenLocation,
+		"Name: %s\nSymbol: %s\nCommodity: %s\nLocation: %s", voucherData.TokenName, voucherData.TokenSymbol, voucherData.TokenCommodity, voucherData.TokenLocation,
 	)
 
 	return res, nil

From ef3a3d6717c98a17516281e04f271c8fb6e712fd Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Mon, 2 Dec 2024 13:30:33 +0300
Subject: [PATCH 24/32] updated the TestGetVoucherDetails

---
 internal/handlers/ussd/menuhandler_test.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go
index 2559a54..6f1d57a 100644
--- a/internal/handlers/ussd/menuhandler_test.go
+++ b/internal/handlers/ussd/menuhandler_test.go
@@ -2026,7 +2026,6 @@ func TestSetVoucher(t *testing.T) {
 }
 
 func TestGetVoucherDetails(t *testing.T) {
-
 	ctx, store := InitializeTestStore(t)
 	fm, err := NewFlagManager(flagsPath)
 	if err != nil {
@@ -2056,12 +2055,11 @@ func TestGetVoucherDetails(t *testing.T) {
 		TokenCommodity: "Farming",
 	}
 	expectedResult.Content = fmt.Sprintf(
-		"name: %s\nsymbol: %s\ncommodity: %s\nlocation: %s", tokenDetails.TokenName, tokenDetails.TokenSymbol, tokenDetails.TokenCommodity, tokenDetails.TokenLocation,
+		"Name: %s\nSymbol: %s\nCommodity: %s\nLocation: %s", tokenDetails.TokenName, tokenDetails.TokenSymbol, tokenDetails.TokenCommodity, tokenDetails.TokenLocation,
 	)
 	mockAccountService.On("VoucherData", string(tokA_AAddress)).Return(tokenDetails, nil)
 
 	res, err := h.GetVoucherDetails(ctx, "SessionId", []byte(""))
 	assert.NoError(t, err)
 	assert.Equal(t, expectedResult, res)
-
 }

From 406bd84875c7828e67942a0330ff5ecd7383b42c Mon Sep 17 00:00:00 2001
From: lash <dev@holbrook.no>
Date: Mon, 2 Dec 2024 14:53:18 +0000
Subject: [PATCH 25/32] Always reset persister in handler

---
 internal/handlers/ussd/menuhandler.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index 87760bd..a93d637 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -114,6 +114,9 @@ func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource
 		logg.WarnCtxf(ctx, "handler init called before it is ready or more than once", "state", h.st, "cache", h.ca)
 		return r, nil
 	}
+	defer func() {
+		h.pe = nil
+	}()
 
 	h.st = h.pe.GetState()
 	h.ca = h.pe.GetMemory()
@@ -133,7 +136,6 @@ func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource
 		logg.ErrorCtxf(ctx, "perister fail in handler", "state", h.st, "cache", h.ca)
 		return r, fmt.Errorf("cannot get state and memory for handler")
 	}
-	h.pe = nil
 
 	logg.DebugCtxf(ctx, "handler has been initialized", "state", h.st, "cache", h.ca)
 

From ff3f049226b45d395c1d6976909d299b3427aee9 Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Tue, 3 Dec 2024 13:31:30 +0300
Subject: [PATCH 26/32] updated the CheckAliasAddress mock

---
 internal/testutil/mocks/servicemock.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/testutil/mocks/servicemock.go b/internal/testutil/mocks/servicemock.go
index 521cfa0..59d7205 100644
--- a/internal/testutil/mocks/servicemock.go
+++ b/internal/testutil/mocks/servicemock.go
@@ -49,6 +49,6 @@ func (m *MockAccountService) TokenTransfer(ctx context.Context, amount, from, to
 }
 
 func (m *MockAccountService) CheckAliasAddress(ctx context.Context, alias string) (*dataserviceapi.AliasAddress, error) {
-	args := m.Called()
+	args := m.Called(alias)
 	return args.Get(0).(*dataserviceapi.AliasAddress), args.Error(1)
 }

From e979742424f8b5526c7669a87f1ea8622d37110e Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Tue, 3 Dec 2024 13:32:18 +0300
Subject: [PATCH 27/32] resolved error in the TestValidateRecipient

---
 internal/handlers/ussd/menuhandler_test.go | 28 ++++++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go
index 6f1d57a..c2629c4 100644
--- a/internal/handlers/ussd/menuhandler_test.go
+++ b/internal/handlers/ussd/menuhandler_test.go
@@ -1498,10 +1498,10 @@ func TestValidateRecipient(t *testing.T) {
 	}{
 		{
 			name:  "Test with invalid recepient",
-			input: []byte("9234adf5"),
+			input: []byte("7?1234"),
 			expectedResult: resource.Result{
 				FlagSet: []uint32{flag_invalid_recipient},
-				Content: "9234adf5",
+				Content: "7?1234",
 			},
 		},
 		{
@@ -1517,22 +1517,40 @@ func TestValidateRecipient(t *testing.T) {
 			input:          []byte("0711223344"),
 			expectedResult: resource.Result{},
 		},
+		{
+			name:           "Test with address",
+			input:          []byte("0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9"),
+			expectedResult: resource.Result{},
+		},
+		{
+			name:           "Test with alias recepient",
+			input:          []byte("alias123"),
+			expectedResult: resource.Result{},
+		},
 	}
 
 	// store a public key for the valid recipient
-	err = store.WriteEntry(ctx, "0711223344", common.DATA_PUBLIC_KEY, []byte(publicKey))
+	err = store.WriteEntry(ctx, "+254711223344", common.DATA_PUBLIC_KEY, []byte(publicKey))
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			mockAccountService := new(mocks.MockAccountService)
 			// Create the Handlers instance
 			h := &Handlers{
-				flagManager:   fm.parser,
-				userdataStore: store,
+				flagManager:    fm.parser,
+				userdataStore:  store,
+				accountService: mockAccountService,
 			}
 
+			aliasResponse := &dataserviceapi.AliasAddress{
+				Address: "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
+			}
+
+			mockAccountService.On("CheckAliasAddress", string(tt.input)).Return(aliasResponse, nil)
+
 			// Call the method
 			res, err := h.ValidateRecipient(ctx, "validate_recepient", tt.input)
 

From 10586baf0d514692ffa3d3db0d5a7b6d23ef5b7c Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Tue, 3 Dec 2024 13:35:14 +0300
Subject: [PATCH 28/32] resolved error in the TestCheckBalance

---
 internal/handlers/ussd/menuhandler_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go
index c2629c4..6dfdcb8 100644
--- a/internal/handlers/ussd/menuhandler_test.go
+++ b/internal/handlers/ussd/menuhandler_test.go
@@ -1582,7 +1582,7 @@ func TestCheckBalance(t *testing.T) {
 			publicKey:      "0X98765432109",
 			activeSym:      "ETH",
 			activeBal:      "1.5",
-			expectedResult: resource.Result{Content: "Balance: 1.5 ETH\n"},
+			expectedResult: resource.Result{Content: "Balance: 1.50 ETH\n"},
 			expectError:    false,
 		},
 	}

From 0f21b0181358dc718ed619bd9d3505a32690d627 Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Tue, 3 Dec 2024 13:37:00 +0300
Subject: [PATCH 29/32] resolved error in the TestViewVoucher

---
 internal/handlers/ussd/menuhandler_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go
index 6dfdcb8..d7cd855 100644
--- a/internal/handlers/ussd/menuhandler_test.go
+++ b/internal/handlers/ussd/menuhandler_test.go
@@ -2008,7 +2008,7 @@ func TestViewVoucher(t *testing.T) {
 
 	res, err := h.ViewVoucher(ctx, "view_voucher", []byte("1"))
 	assert.NoError(t, err)
-	assert.Equal(t, res.Content, "SRF\n100")
+	assert.Equal(t, res.Content, "Symbol: SRF\nBalance: 100")
 }
 
 func TestSetVoucher(t *testing.T) {

From ba430a5849030c3fd4581c6596c8947ecff160e0 Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Tue, 3 Dec 2024 14:10:05 +0300
Subject: [PATCH 30/32] add a separate function to handle ConstructName

---
 internal/handlers/ussd/menuhandler.go | 13 +------------
 internal/utils/name.go                | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 internal/utils/name.go

diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index 6bc00ec..acd3dd4 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -1398,18 +1398,7 @@ func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte)
 	offerings := getEntryOrDefault(store.ReadEntry(ctx, sessionId, common.DATA_OFFERINGS))
 
 	// Construct the full name
-	name := defaultValue
-	if familyName != defaultValue {
-		if firstName != defaultValue {
-			name = firstName + " " + familyName
-		} else {
-			name = familyName
-		}
-	} else {
-		if firstName != defaultValue {
-			name = firstName
-		}
-	}
+	name := utils.ConstructName(firstName, familyName, defaultValue)
 
 	// Calculate age from year of birth
 	age := defaultValue
diff --git a/internal/utils/name.go b/internal/utils/name.go
new file mode 100644
index 0000000..4665d02
--- /dev/null
+++ b/internal/utils/name.go
@@ -0,0 +1,17 @@
+package utils
+
+func ConstructName(firstName, familyName, defaultValue string) string {
+    name := defaultValue
+    if familyName != defaultValue {
+        if firstName != defaultValue {
+            name = firstName + " " + familyName
+        } else {
+            name = familyName
+        }
+    } else {
+        if firstName != defaultValue {
+            name = firstName
+        }
+    }
+    return name
+}
\ No newline at end of file

From d40a4a171ff1bb84b7cc299e13f3b04836cdb9bd Mon Sep 17 00:00:00 2001
From: alfred-mk <alfredmwaik@gmail.com>
Date: Tue, 3 Dec 2024 14:12:47 +0300
Subject: [PATCH 31/32] formatted code

---
 internal/utils/name.go | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/internal/utils/name.go b/internal/utils/name.go
index 4665d02..ea403d5 100644
--- a/internal/utils/name.go
+++ b/internal/utils/name.go
@@ -1,17 +1,17 @@
 package utils
 
 func ConstructName(firstName, familyName, defaultValue string) string {
-    name := defaultValue
-    if familyName != defaultValue {
-        if firstName != defaultValue {
-            name = firstName + " " + familyName
-        } else {
-            name = familyName
-        }
-    } else {
-        if firstName != defaultValue {
-            name = firstName
-        }
-    }
-    return name
-}
\ No newline at end of file
+	name := defaultValue
+	if familyName != defaultValue {
+		if firstName != defaultValue {
+			name = firstName + " " + familyName
+		} else {
+			name = familyName
+		}
+	} else {
+		if firstName != defaultValue {
+			name = firstName
+		}
+	}
+	return name
+}

From d516584d905292df237a153d41de8182c6c599ce Mon Sep 17 00:00:00 2001
From: lash <dev@holbrook.no>
Date: Tue, 3 Dec 2024 16:16:46 +0000
Subject: [PATCH 32/32] Clear persister from handler in outer code aswell

---
 internal/handlers/base.go             | 3 +++
 internal/handlers/ussd/menuhandler.go | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/internal/handlers/base.go b/internal/handlers/base.go
index 4d2aa4c..755cca4 100644
--- a/internal/handlers/base.go
+++ b/internal/handlers/base.go
@@ -55,6 +55,9 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
 	}
 
 	f.hn = f.hn.WithPersister(rqs.Storage.Persister)
+	defer func() {
+		f.hn.Exit()
+	}()
 	eni := f.GetEngine(rqs.Config, f.rs, rqs.Storage.Persister)
 	en, ok := eni.(*engine.DefaultEngine)
 	if !ok {
diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index a79d054..5c1caff 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -113,7 +113,7 @@ func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource
 		return r, nil
 	}
 	defer func() {
-		h.pe = nil
+		h.Exit()
 	}()
 
 	h.st = h.pe.GetState()
@@ -140,6 +140,10 @@ func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource
 	return r, nil
 }
 
+func (h *Handlers) Exit() {
+	h.pe = nil
+}
+
 // SetLanguage sets the language across the menu
 func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result