20 changed files with 92 additions and 79 deletions
--- a/go.mod
+++ b/go.mod
@ -3,7 +3,7 @@ module git.grassecon.net/urdt/ussd
 go 1.23.0

 require (
-	git.defalsify.org/vise.git v0.2.1-0.20241209194740-26fc82a76ede
+	git.defalsify.org/vise.git v0.2.1-0.20241122120231-9e9ee5bdfa7a
 	github.com/alecthomas/assert/v2 v2.2.2
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/grassrootseconomics/eth-custodial v1.3.0-beta
--- a/go.sum
+++ b/go.sum
@ -1,7 +1,5 @@
 git.defalsify.org/vise.git v0.2.1-0.20241122120231-9e9ee5bdfa7a h1:LvGKktk0kUnuRN3nF9r15D8OoV0sFaMmQr52kGq2gtE=
 git.defalsify.org/vise.git v0.2.1-0.20241122120231-9e9ee5bdfa7a/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
-git.defalsify.org/vise.git v0.2.1-0.20241209194740-26fc82a76ede h1:BtooQZJDYEgeRKqv8RSxYSbW5jh0UIFJ6zRMEZZn0sc=
-git.defalsify.org/vise.git v0.2.1-0.20241209194740-26fc82a76ede/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
 github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
 github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
 github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@ -732,7 +732,9 @@ func (h *Handlers) ResetIncorrectPin(ctx context.Context, sym string, input []by
 // Setback sets the flag_back_set flag when the navigation is back
 func (h *Handlers) SetBack(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
-	if h.st.Back() {
+	//TODO:
+	//Add check if the navigation is lateral nav instead of checking the input.
+	if string(input) == "0" {
 		flag_back_set, _ := h.flagManager.GetFlag("flag_back_set")
 		res.FlagSet = append(res.FlagSet, flag_back_set)
 	}
--- a/services/registration/edit_family_name.vis
+++ b/services/registration/edit_family_name.vis
@ -1,7 +1,18 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_familyname flag_allow_update 1
 LOAD get_current_profile_info 0
 RELOAD get_current_profile_info
 MAP get_current_profile_info
 MOUT back 0
 HALT
-INCMP _ 0
-INCMP edit_family_name_next *
+RELOAD set_back 
+CATCH _ flag_back_set 1
+LOAD save_familyname 64
+RELOAD save_familyname
+CATCH pin_entry flag_familyname_set 1
+CATCH select_gender flag_gender_set 0
+CATCH edit_yob flag_yob_set 0
+CATCH edit_location flag_location_set 0
+CATCH edit_offerings flag_offerings_set 0
+CATCH pin_entry flag_familyname_set 0
+INCMP select_gender *
--- a/services/registration/edit_family_name_next.vis
+++ b/services/registration/edit_family_name_next.vis
@ -1,11 +0,0 @@
-LOAD save_familyname 32
-RELOAD save_familyname
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_familyname flag_allow_update 1
-RELOAD set_back
-CATCH _ flag_back_set 1
-CATCH pin_entry flag_familyname_set 1
-CATCH select_gender flag_gender_set 0
-CATCH edit_yob flag_yob_set 0
-CATCH edit_location flag_location_set 0
-CATCH pin_entry flag_familyname_set 0
--- a/services/registration/edit_first_name.vis
+++ b/services/registration/edit_first_name.vis
@ -1,7 +1,18 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_firstname flag_allow_update 1
 LOAD get_current_profile_info 0
 RELOAD get_current_profile_info
 MAP get_current_profile_info
 MOUT back 0
 HALT
-INCMP _ 0
-INCMP edit_first_name_next *
+RELOAD set_back 
+CATCH _ flag_back_set 1
+LOAD save_firstname 128
+RELOAD save_firstname
+CATCH pin_entry flag_firstname_set 1
+CATCH edit_family_name flag_familyname_set 0
+CATCH edit_gender flag_gender_set 0
+CATCH edit_yob flag_yob_set 0
+CATCH edit_location flag_location_set 0
+CATCH edit_offerings flag_offerings_set 0
+CATCH pin_entry flag_firstname_set 0
--- a/services/registration/edit_first_name_next.vis
+++ b/services/registration/edit_first_name_next.vis
@ -1,12 +0,0 @@
-LOAD save_firstname 64
-RELOAD save_firstname
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_firstname flag_allow_update 1
-RELOAD set_back
-CATCH _ flag_back_set 1
-CATCH pin_entry flag_firstname_set 1
-CATCH edit_family_name flag_familyname_set 0
-CATCH select_gender flag_gender_set 0
-CATCH edit_yob flag_yob_set 0
-CATCH edit_location flag_location_set 0
-CATCH pin_entry flag_firstname_set 0
--- a/services/registration/edit_location.vis
+++ b/services/registration/edit_location.vis
@ -1,7 +1,15 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_location flag_allow_update 1
 LOAD get_current_profile_info 0
 RELOAD get_current_profile_info
+LOAD save_location 16
 MOUT back 0
 HALT
+RELOAD set_back 
+CATCH _ flag_back_set 1
+RELOAD save_location
 INCMP _ 0
-INCMP edit_location_next *
-
+CATCH pin_entry flag_location_set 1
+CATCH edit_offerings flag_offerings_set 0
+CATCH pin_entry flag_location_set 0
+INCMP edit_offerings *
--- a/services/registration/edit_location_next.vis
+++ b/services/registration/edit_location_next.vis
@ -1,8 +0,0 @@
-LOAD save_location 16
-RELOAD save_location
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_location flag_allow_update 1
-RELOAD set_back
-CATCH _ flag_back_set 1
-CATCH pin_entry flag_location_set 1
-CATCH edit_offerings flag_offerings_set 0
--- a/services/registration/edit_offerings.vis
+++ b/services/registration/edit_offerings.vis
@ -1,7 +1,14 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_offerings flag_allow_update 1
 LOAD get_current_profile_info 0
 RELOAD get_current_profile_info
+LOAD save_offerings 8
 MOUT back 0
 HALT
+RELOAD set_back 
+CATCH _ flag_back_set 1
+RELOAD save_offerings
 INCMP _ 0
-INCMP edit_offerings_next *
-
+CATCH pin_entry flag_offerings_set 1
+CATCH pin_entry flag_offerings_set 0
+INCMP update_profile_items *
--- a/services/registration/edit_offerings_next.vis
+++ b/services/registration/edit_offerings_next.vis
@ -1,8 +0,0 @@
-LOAD save_offerings 8
-RELOAD save_offerings
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_offerings flag_allow_update 1
-RELOAD set_back 
-CATCH _ flag_back_set 1
-CATCH pin_entry flag_offerings_set 1
-MOVE update_profile_items 
--- a/services/registration/edit_yob.vis
+++ b/services/registration/edit_yob.vis
@ -1,7 +1,19 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_yob flag_allow_update 1
 LOAD get_current_profile_info 0
 RELOAD get_current_profile_info
 MAP get_current_profile_info
 MOUT back 0
 HALT
-INCMP _ 0
-INCMP edit_yob_next *
+RELOAD set_back 
+CATCH _ flag_back_set 1
+LOAD verify_yob 6
+RELOAD verify_yob
+CATCH incorrect_date_format flag_incorrect_date_format 1
+LOAD save_yob 32
+RELOAD save_yob
+CATCH pin_entry flag_yob_set 1
+CATCH edit_location flag_location_set 0
+CATCH edit_offerings flag_offerings_set 0
+CATCH pin_entry flag_yob_set 0
+INCMP edit_location *
--- a/services/registration/edit_yob_next.vis
+++ b/services/registration/edit_yob_next.vis
@ -1,13 +0,0 @@
-LOAD save_yob 16
-LOAD verify_yob 8
-RELOAD verify_yob
-RELOAD save_yob
-CATCH incorrect_date_format flag_incorrect_date_format 1
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_yob flag_allow_update 1
-RELOAD set_back
-CATCH _ flag_back_set 1
-CATCH pin_entry flag_yob_set 1
-CATCH edit_location flag_location_set 0
-CATCH edit_offerings flag_offerings_set 0
-CATCH pin_entry flag_yob_set 0
--- a/services/registration/incorrect_date_format.vis
+++ b/services/registration/incorrect_date_format.vis
@ -2,5 +2,5 @@ LOAD reset_incorrect_date_format 8
 MOUT retry 1
 MOUT quit 9
 HALT
-INCMP ^ 1
+INCMP _ 1
 INCMP quit 9
--- a/services/registration/select_gender.vis
+++ b/services/registration/select_gender.vis
@ -1,3 +1,5 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH profile_update_success flag_allow_update 1
 LOAD get_current_profile_info 0
 RELOAD get_current_profile_info
 MOUT male 1
--- a/services/registration/set_female.vis
+++ b/services/registration/set_female.vis
@ -1,3 +1,10 @@
-LOAD save_gender 16
+LOAD save_gender 32
 RELOAD save_gender
-MOVE set_gender_next
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_gender flag_allow_update 1
+CATCH pin_entry flag_gender_set 1
+CATCH edit_yob flag_yob_set 0
+CATCH edit_location flag_location_set 0
+CATCH edit_offerings flag_offerings_set 0
+CATCH pin_entry flag_gender_set 0
+MOVE edit_yob
--- a/services/registration/set_gender_next
+++ b/services/registration/set_gender_next
@ -1 +0,0 @@
-Select gender
--- a/services/registration/set_gender_next.vis
+++ b/services/registration/set_gender_next.vis
@ -1,6 +0,0 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_gender flag_allow_update 1
-CATCH pin_entry flag_gender_set 1
-CATCH edit_yob flag_yob_set 0
-CATCH edit_location flag_location_set 0
-CATCH edit_offerings flag_offerings_set 0
--- a/services/registration/set_male.vis
+++ b/services/registration/set_male.vis
@ -1,3 +1,10 @@
 LOAD save_gender 16
 RELOAD save_gender
-MOVE set_gender_next
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_gender flag_allow_update 1
+CATCH pin_entry flag_gender_set 1
+CATCH edit_yob flag_yob_set 0
+CATCH edit_location flag_location_set 0
+CATCH edit_offerings flag_offerings_set 0
+CATCH pin_entry flag_gender_set 0
+MOVE edit_yob
--- a/services/registration/set_unspecified.vis
+++ b/services/registration/set_unspecified.vis
@ -1,3 +1,10 @@
-LOAD save_gender 16
+LOAD save_gender 8
 RELOAD save_gender
-MOVE set_gender_next
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_gender flag_allow_update 1
+CATCH pin_entry flag_gender_set 1
+CATCH edit_yob flag_yob_set 0
+CATCH edit_location flag_location_set 0
+CATCH edit_offerings flag_offerings_set 0
+CATCH pin_entry flag_gender_set 0
+MOVE edit_yob