15 changed files with 39 additions and 61 deletions
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@ -356,6 +356,7 @@ func (h *Handlers) SaveFirstname(ctx context.Context, sym string, input []byte)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+
 	if len(input) > 0 {
 		firstName := string(input)
 		store := h.userdataStore
@ -639,6 +640,7 @@ func (h *Handlers) QuitWithHelp(ctx context.Context, sym string, input []byte) (
 	return res, nil
 }

+
 // VerifyYob verifies the length of the given input
 func (h *Handlers) VerifyYob(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
--- a/services/registration/edit_familyname_menu
+++ b/services/registration/edit_familyname_menu
@ -1 +0,0 @@
-Edit family name
--- a/services/registration/edit_familyname_menu_swa
+++ b/services/registration/edit_familyname_menu_swa
@ -1 +0,0 @@
-Weka jina la familia
--- a/services/registration/edit_profile.vis
+++ b/services/registration/edit_profile.vis
@ -2,21 +2,19 @@ LOAD reset_account_authorized 16
 LOAD reset_allow_update 0
 RELOAD reset_allow_update
 MOUT edit_name 1
-MOUT edit_familyname 2
-MOUT edit_gender 3
-MOUT edit_yob 4
-MOUT edit_location 5
-MOUT edit_offerings 6
-MOUT view 7
+MOUT edit_gender 2
+MOUT edit_yob 3
+MOUT edit_location 4
+MOUT edit_offerings 5
+MOUT view 6
 MOUT back 0
 HALT
-INCMP my_account 0
+INCMP _ 0
 LOAD set_reset_single_edit 0
 RELOAD set_reset_single_edit
 INCMP enter_name 1
-INCMP enter_familyname 2
-INCMP select_gender 3
-INCMP enter_yob 4
-INCMP enter_location 5
-INCMP enter_offerings 6
-INCMP view_profile 7
+INCMP select_gender 2
+INCMP enter_yob 3
+INCMP enter_location 4
+INCMP enter_offerings 5
+INCMP view_profile 6
--- a/services/registration/enter_familyname.vis
+++ b/services/registration/enter_familyname.vis
@ -1,9 +1,5 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD save_familyname 0
-RELOAD save_familyname
+LOAD save_firstname 0
 MOUT back 0
 HALT
-RELOAD save_familyname
 INCMP _ 0
-INCMP pin_entry *
+INCMP select_gender *
--- a/services/registration/enter_familyname_swa
+++ b/services/registration/enter_familyname_swa
@ -1 +0,0 @@
-Weka jina la familia
--- a/services/registration/enter_location.vis
+++ b/services/registration/enter_location.vis
@ -1,8 +1,9 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD save_location 0
+CATCH incorrect_date_format flag_incorrect_date_format 1
+LOAD save_yob 0
+CATCH update_success flag_allow_update 1
 MOUT back 0
 HALT
-RELOAD save_location
 INCMP _ 0
-INCMP pin_entry *
+LOAD save_location 0
+CATCH pin_entry flag_single_edit 1
+INCMP enter_offerings *
--- a/services/registration/enter_name.vis
+++ b/services/registration/enter_name.vis
@ -1,12 +1,4 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD save_firstname 0
-RELOAD save_firstname 
 MOUT back 0
 HALT
-RELOAD save_firstname
 INCMP _ 0
-INCMP pin_entry *
-
-
-
+INCMP enter_familyname *
--- a/services/registration/enter_offerings.vis
+++ b/services/registration/enter_offerings.vis
@ -1,8 +1,8 @@
+LOAD save_location 0
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD save_offerings 0
+CATCH update_success flag_allow_update 1
 MOUT back 0
 HALT
-RELOAD save_offerings
+LOAD save_offerings 0
 INCMP _ 0
 INCMP pin_entry *
--- a/services/registration/enter_yob.vis
+++ b/services/registration/enter_yob.vis
@ -1,10 +1,9 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD save_yob 0
+LOAD save_gender 0
+CATCH update_success flag_allow_update 1
 MOUT back 0
 HALT
-LOAD verify_yob 0
-CATCH incorrect_date_format flag_incorrect_date_format 1
-RELOAD save_yob
 INCMP _ 0
-INCMP pin_entry *
+LOAD verify_yob 8
+LOAD save_yob 0
+CATCH pin_entry flag_single_edit 1
+INCMP enter_location *
--- a/services/registration/my_account.vis
+++ b/services/registration/my_account.vis
@ -7,7 +7,7 @@ MOUT pin_options 5
 MOUT my_address 6
 MOUT back 0
 HALT
-INCMP main 0
+INCMP _ 0
 INCMP edit_profile 1
 INCMP change_language 2
 INCMP balances 3
--- a/services/registration/profile_update_success
+++ b/services/registration/profile_update_success
@ -1 +0,0 @@
-Profile updated successfully
--- a/services/registration/profile_update_success.vis
+++ b/services/registration/profile_update_success.vis
@ -1,5 +0,0 @@
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP edit_profile 0
-INCMP quit 9
--- a/services/registration/profile_update_success_swa
+++ b/services/registration/profile_update_success_swa
@ -1 +0,0 @@
-Ombi la Kuweka wasifu limefanikiwa
--- a/services/registration/select_gender.vis
+++ b/services/registration/select_gender.vis
@ -1,13 +1,13 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD save_gender 0
+LOAD save_familyname 0
+CATCH update_success flag_allow_update 1
 MOUT male 1
 MOUT female 2
 MOUT unspecified 3
 MOUT back 0
 HALT
-RELOAD save_gender
+LOAD save_gender 0
+CATCH pin_entry flag_single_edit 1
 INCMP _ 0
-INCMP pin_entry *
-
-
+INCMP enter_yob 1
+INCMP enter_yob 2
+INCMP enter_yob 3