16 changed files with 18 additions and 20 deletions
--- a/devtools/lang/main.go
+++ b/devtools/lang/main.go
@ -15,7 +15,7 @@ import (
 const (
 	changeHeadSrc = `LOAD reset_account_authorized 0
-LOAD reset_incorrect_pin 0
+LOAD reset_incorrect 0
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
 `
--- a/handlers/local.go
+++ b/handlers/local.go
@ -91,7 +91,7 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("get_recipient", appHandlers.GetRecipient)
 	ls.DbRs.AddLocalFunc("get_sender", appHandlers.GetSender)
 	ls.DbRs.AddLocalFunc("get_amount", appHandlers.GetAmount)
-	ls.DbRs.AddLocalFunc("reset_incorrect_pin", appHandlers.ResetIncorrectPin)
+	ls.DbRs.AddLocalFunc("reset_incorrect", appHandlers.ResetIncorrectPin)
 	ls.DbRs.AddLocalFunc("save_firstname", appHandlers.SaveFirstname)
 	ls.DbRs.AddLocalFunc("save_familyname", appHandlers.SaveFamilyname)
 	ls.DbRs.AddLocalFunc("save_gender", appHandlers.SaveGender)
@ -130,7 +130,7 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("confirm_new_alias", appHandlers.ConfirmNewAlias)
 	ls.DbRs.AddLocalFunc("check_account_created", appHandlers.CheckAccountCreated)
 	ls.DbRs.AddLocalFunc("reset_api_call_failure", appHandlers.ResetApiCallFailure)
-	ls.DbRs.AddLocalFunc("swap_to_list", appHandlers.LoadSwapToList)
+    ls.DbRs.AddLocalFunc("swap_to_list", appHandlers.LoadSwapToList)
 	ls.DbRs.AddLocalFunc("swap_max_limit", appHandlers.SwapMaxLimit)
 	ls.DbRs.AddLocalFunc("swap_preview", appHandlers.SwapPreview)
 	ls.DbRs.AddLocalFunc("initiate_swap", appHandlers.InitiateSwap)
--- a/services/registration/change_language.vis
+++ b/services/registration/change_language.vis
@ -1,5 +1,5 @@
 LOAD reset_account_authorized 0
-LOAD reset_incorrect_pin 0
+LOAD reset_incorrect 0
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
 MOUT english 1
--- a/services/registration/community_balance.vis
+++ b/services/registration/community_balance.vis
@ -1,4 +1,4 @@
-LOAD reset_incorrect_pin 6
+LOAD reset_incorrect 6
 LOAD fetch_community_balance 0
 CATCH api_failure flag_api_call_error 1
 MAP fetch_community_balance
--- a/services/registration/incorrect_pin
+++ b/services/registration/incorrect_pin
@ -1 +1 @@
-Incorrect PIN. You have: {{.reset_incorrect_pin}} remaining attempt(s).
+Incorrect PIN. You have: {{.reset_incorrect}} remaining attempt(s).
--- a/services/registration/incorrect_pin.vis
+++ b/services/registration/incorrect_pin.vis
@ -1,6 +1,6 @@
-LOAD reset_incorrect_pin 0
+LOAD reset_incorrect 0
-RELOAD reset_incorrect_pin
+RELOAD reset_incorrect
-MAP reset_incorrect_pin
+MAP reset_incorrect
 CATCH blocked_account flag_account_blocked 1
 MOUT retry 1
 MOUT quit 9
--- a/services/registration/incorrect_pin_swa
+++ b/services/registration/incorrect_pin_swa
@ -1 +1 @@
-PIN ulioeka sio sahihi, una majaribio: {{.reset_incorrect_pin}} yaliyobaki
+PIN ulioeka sio sahihi, una majaribio: {{.reset_incorrect}} yaliyobaki
--- a/services/registration/my_balance.vis
+++ b/services/registration/my_balance.vis
@ -1,4 +1,4 @@
-LOAD reset_incorrect_pin 6
+LOAD reset_incorrect 6
 LOAD check_balance 0
 CATCH api_failure flag_api_call_error 1
 MAP check_balance
--- a/services/registration/old_pin.vis
+++ b/services/registration/old_pin.vis
@ -1,4 +1,4 @@
-RELOAD reset_incorrect_pin
+RELOAD reset_incorrect
 MOUT back 0
 HALT
 INCMP _ 0
--- a/services/registration/pin_management.vis
+++ b/services/registration/pin_management.vis
@ -2,7 +2,7 @@ LOAD set_back 6
 LOAD authorize_account 16
 LOAD reset_allow_update 4
 LOAD save_temporary_pin 1
-LOAD reset_incorrect_pin 0
+LOAD reset_incorrect 0
 LOAD reset_invalid_pin 6
 MOUT change_pin 1
 MOUT reset_pin 2
--- a/services/registration/swap_initiated.vis
+++ b/services/registration/swap_initiated.vis
@ -1,5 +1,3 @@
-LOAD reset_incorrect_pin 6
+LOAD reset_incorrect 6
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH _ flag_account_authorized 0
 LOAD initiate_swap 0
 HALT
--- a/services/registration/swap_preview.vis
+++ b/services/registration/swap_preview.vis
@ -7,6 +7,7 @@ LOAD authorize_account 6
 HALT
 RELOAD authorize_account
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH . flag_account_authorized 0
 INCMP _ 0
 INCMP quit 9
 INCMP swap_initiated *
--- a/services/registration/swap_to_list.vis
+++ b/services/registration/swap_to_list.vis
@ -1,4 +1,3 @@
 CATCH no_voucher flag_no_active_voucher 1
 LOAD swap_to_list 0
 RELOAD swap_to_list
 MAP swap_to_list
--- a/services/registration/transaction_initiated.vis
+++ b/services/registration/transaction_initiated.vis
@ -1,4 +1,4 @@
-LOAD reset_incorrect_pin 6
+LOAD reset_incorrect 6
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH _ flag_account_authorized 0
 RELOAD get_amount
--- a/services/registration/view_profile.vis
+++ b/services/registration/view_profile.vis
@ -1,6 +1,6 @@
 LOAD get_profile_info 0
 MAP get_profile_info 
-LOAD reset_incorrect_pin 6
+LOAD reset_incorrect 6
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
 MOUT back 0
--- a/services/registration/voucher_set.vis
+++ b/services/registration/voucher_set.vis
@ -1,4 +1,4 @@
-LOAD reset_incorrect_pin 6
+LOAD reset_incorrect 6
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH _ flag_account_authorized 0
 LOAD set_voucher 12
		`@ -1 +1 @@`
			`Incorrect PIN. You have: {{.reset_incorrect_pin}} remaining attempt(s).`				`Incorrect PIN. You have: {{.reset_incorrect}} remaining attempt(s).`
		`@ -1 +1 @@`
			`PIN ulioeka sio sahihi, una majaribio: {{.reset_incorrect_pin}} yaliyobaki`				`PIN ulioeka sio sahihi, una majaribio: {{.reset_incorrect}} yaliyobaki`