cmd/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"flag"
@@ -28,11 +27,6 @@ const (
 	USERFLAG_INVALID_RECIPIENT
 	USERFLAG_INVALID_RECIPIENT_WITH_INVITE
 	USERFLAG_INCORRECTPIN
-	USERFLAG_UNLOCKFORUPDATE
-	USERFLAG_INVALID_AMOUNT
-	USERFLAG_QUERYPIN
-	USERFLAG_VALIDPIN
-	USERFLAG_INVALIDPIN
 )
 
 const (
@@ -391,39 +385,6 @@ func (fsd *fsData) transaction_reset(ctx context.Context, sym string, input []by
 	return res, nil
 }
 
-func (fsd *fsData) reset_transaction_amount(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	fp := fsd.path + "_data"
-
-	jsonData, err := os.ReadFile(fp)
-	if err != nil {
-		return res, err
-	}
-
-	var accountData map[string]string
-	err = json.Unmarshal(jsonData, &accountData)
-	if err != nil {
-		return res, err
-	}
-
-	// reset the amount
-	accountData["Amount"] = ""
-
-	updatedJsonData, err := json.Marshal(accountData)
-	if err != nil {
-		return res, err
-	}
-
-	err = os.WriteFile(fp, updatedJsonData, 0644)
-	if err != nil {
-		return res, err
-	}
-
-	res.FlagReset = append(res.FlagReset, USERFLAG_INVALID_AMOUNT)
-
-	return res, nil
-}
-
 func (fsd *fsData) max_amount(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	res := resource.Result{}
 
@@ -450,10 +411,9 @@ func (fsd *fsData) validate_amount(ctx context.Context, sym string, input []byte
 		return res, err
 	}
 
-	if amount != "0" {
+	// mimic invalid amount check
-		// mimic invalid amount
+	if amount == "0" {
-		if amount == "00" {
+		// res.FlagSet = []uint32{invalidAmount}
-			res.FlagSet = append(res.FlagSet, USERFLAG_INVALID_AMOUNT)
 		res.Content = amount
 
 		return res, nil
@@ -473,9 +433,6 @@ func (fsd *fsData) validate_amount(ctx context.Context, sym string, input []byte
 		return res, err
 	}
 
-		return res, nil
-	}
-
 	return res, nil
 }
 
@@ -555,62 +512,6 @@ func (fsd *fsData) quitWithBalance(ctx context.Context, sym string, input []byte
 	return res, nil
 }
 
-func (fsd *fsData) save_pin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	accountPIN := string(input)
-	fp := fsd.path + "_data"
-
-	jsonData, err := os.ReadFile(fp)
-	if err != nil {
-		return res, err
-	}
-
-	var accountData map[string]string
-	err = json.Unmarshal(jsonData, &accountData)
-	if err != nil {
-		return res, err
-	}
-
-	accountData["AccountPIN"] = accountPIN
-
-	updatedJsonData, err := json.Marshal(accountData)
-	if err != nil {
-		return res, err
-	}
-
-	err = os.WriteFile(fp, updatedJsonData, 0644)
-	if err != nil {
-		return res, err
-	}
-
-	return res, nil
-}
-
-func (fsd *fsData) verify_pin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	res := resource.Result{}
-	fp := fsd.path + "_data"
-
-	jsonData, err := os.ReadFile(fp)
-	if err != nil {
-		return res, err
-	}
-
-	var accountData map[string]string
-	err = json.Unmarshal(jsonData, &accountData)
-	if err != nil {
-		return res, err
-	}
-
-	if bytes.Equal(input, []byte(accountData["AccountPIN"])) {
-		res.FlagSet = []uint32{USERFLAG_VALIDPIN}
-		res.FlagReset = []uint32{USERFLAG_INVALIDPIN}
-	} else {
-		res.FlagSet = []uint32{USERFLAG_INVALIDPIN}
-	}
-
-	return res, nil
-}
-
 var (
 	scriptDir = path.Join("services", "registration")
 )
@@ -628,7 +529,7 @@ func main() {
 	fmt.Fprintf(os.Stderr, "starting session at symbol '%s' using resource dir: %s\n", root, dir)
 
 	ctx := context.Background()
-	st := state.NewState(15)
+	st := state.NewState(9)
 	st.UseDebug()
 	state.FlagDebugger.Register(USERFLAG_LANGUAGE_SET, "LANGUAGE_CHANGE")
 	state.FlagDebugger.Register(USERFLAG_ACCOUNT_CREATED, "ACCOUNT_CREATED")
@@ -672,8 +573,6 @@ func main() {
 	}
 	rfs.AddLocalFunc("select_language", fs.SetLanguageSelected)
 	rfs.AddLocalFunc("create_account", fs.create_account)
-	rfs.AddLocalFunc("save_pin", fs.save_pin)
-	rfs.AddLocalFunc("verify_pin", fs.verify_pin)
 	rfs.AddLocalFunc("check_identifier", fs.checkIdentifier)
 	rfs.AddLocalFunc("check_account_status", fs.check_account_status)
 	rfs.AddLocalFunc("unlock_account", fs.unLock)
@@ -683,7 +582,6 @@ func main() {
 	rfs.AddLocalFunc("transaction_reset", fs.transaction_reset)
 	rfs.AddLocalFunc("max_amount", fs.max_amount)
 	rfs.AddLocalFunc("validate_amount", fs.validate_amount)
-	rfs.AddLocalFunc("reset_transaction_amount", fs.reset_transaction_amount)
 	rfs.AddLocalFunc("get_recipient", fs.get_recipient)
 	rfs.AddLocalFunc("get_sender", fs.get_sender)
 	rfs.AddLocalFunc("reset_incorrect", fs.ResetIncorrectPin)

services/registration/account_creation.vis

@@ -1,4 +1,4 @@
-RELOAD verify_pin
+LOAD create_account 0
-CATCH create_pin_mismatch 20 1
 LOAD quit 0
 HALT
+

services/registration/amount.vis

@@ -1,4 +1,3 @@
-LOAD reset_transaction_amount 0
 RELOAD validate_recipient
 CATCH invalid_recipient 13 1
 LOAD max_amount 10

services/registration/amount_swa

@@ -1,2 +0,0 @@
-Kiwango cha juu: {{.max_amount}}
-Weka kiwango:

services/registration/confirm_create_pin

@@ -1 +0,0 @@
-Enter your four number PIN again:

services/registration/confirm_create_pin.vis

@@ -1,4 +0,0 @@
-LOAD save_pin 0
-HALT
-LOAD verify_pin 8
-INCMP account_creation *

services/registration/confirm_create_pin_swa

@@ -1 +0,0 @@
-Weka PIN yako tena:

services/registration/create_pin

@@ -1 +0,0 @@
-Please enter a new four number PIN for your account:

services/registration/create_pin.vis

@@ -1,5 +0,0 @@
-LOAD create_account 0
-MOUT exit 0
-HALT
-LOAD save_pin 0
-INCMP confirm_create_pin *

services/registration/create_pin_mismatch

@@ -1 +0,0 @@
-The PIN is not a match. Try again

services/registration/create_pin_mismatch.vis

@@ -1,5 +0,0 @@
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP confirm_create_pin 1
-INCMP quit 9

services/registration/create_pin_mismatch_swa

@@ -1 +0,0 @@
-PIN uliyoweka haifanani. Jaribu tena

services/registration/create_pin_swa

@@ -1 +0,0 @@
-Tafadhali weka PIN mpya yenye nambari nne kwa akaunti yako:

services/registration/exit_menu

@@ -1 +0,0 @@
-Exit

services/registration/exit_menu_swa

@@ -1 +0,0 @@
-Ondoka

services/registration/invalid_amount

@@ -1 +0,0 @@
-Amount {{.validate_amount}} is invalid, please try again:

services/registration/invalid_amount.vis

@@ -1,7 +0,0 @@
-MAP validate_amount
-RELOAD reset_transaction_amount
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP amount 1
-INCMP quit 9

services/registration/invalid_amount_swa

@@ -1 +0,0 @@
-Kiwango {{.validate_amount}} sio sahihi, tafadhali weka tena:

services/registration/terms.vis

@@ -3,5 +3,5 @@ RELOAD select_language
 MOUT yes 0
 MOUT no 1
 HALT
-INCMP create_pin 0
+INCMP account_creation 0
 INCMP _ *

services/registration/transaction_pin.vis

@@ -1,6 +1,5 @@
 RELOAD validate_amount
 MAP validate_amount
-CATCH invalid_amount 17 1
 RELOAD get_recipient
 MAP get_recipient
 RELOAD get_sender