Merge pull request 'send with swap' (#102) from send-with-swap into master

Reviewed-on: #102

handlers/application/send.go

@@ -335,8 +335,8 @@ func (h *MenuHandlers) MaxAmount(ctx context.Context, sym string, input []byte)
 	// Format the active balance amount to 2 decimal places
 	formattedBalance, _ := store.TruncateDecimalString(string(activeBal), 2)
 
-	// If normal transaction, return balance
+	// If normal transaction, or if the sym is max_amount, return balance
-	if string(transactionType) == "normal" {
+	if string(transactionType) == "normal" || sym == "max_amount" {
 		res.FlagReset = append(res.FlagReset, flag_swap_transaction)
 
 		res.Content = l.Get("Maximum amount: %s %s\nEnter amount:", formattedBalance, string(activeSym))
@@ -789,7 +789,7 @@ func (h *MenuHandlers) TransactionSwapPreview(ctx context.Context, sym string, i
 		return res, err
 	}
 
-	res.Content = fmt.Sprintf(
+	res.Content = l.Get(
 		"%s will receive %s %s",
 		string(recipientPhoneNumber), qouteAmount, swapData.ActiveSwapToSym,
 	)

handlers/local.go

@@ -86,6 +86,7 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("transaction_reset", appHandlers.TransactionReset)
 	ls.DbRs.AddLocalFunc("invite_valid_recipient", appHandlers.InviteValidRecipient)
 	ls.DbRs.AddLocalFunc("max_amount", appHandlers.MaxAmount)
+	ls.DbRs.AddLocalFunc("credit_max_amount", appHandlers.MaxAmount)
 	ls.DbRs.AddLocalFunc("validate_amount", appHandlers.ValidateAmount)
 	ls.DbRs.AddLocalFunc("reset_transaction_amount", appHandlers.ResetTransactionAmount)
 	ls.DbRs.AddLocalFunc("get_recipient", appHandlers.GetRecipient)

services/registration/amount.vis

@@ -4,9 +4,6 @@ RELOAD max_amount
 MAP max_amount
 MOUT back 0
 HALT
-LOAD clear_trans_type_flag 6
-RELOAD clear_trans_type_flag
-CATCH transaction_swap flag_swap_transaction 1
 LOAD validate_amount 64
 RELOAD validate_amount
 CATCH api_failure flag_api_call_error 1

services/registration/credit_amount

@@ -0,0 +1 @@
+{{.credit_max_amount}}

services/registration/credit_amount.vis

@@ -0,0 +1,18 @@
+LOAD reset_transaction_amount 10
+LOAD credit_max_amount 160
+RELOAD credit_max_amount
+MAP credit_max_amount
+MOUT back 0
+HALT
+LOAD clear_trans_type_flag 6
+RELOAD clear_trans_type_flag
+CATCH transaction_swap flag_swap_transaction 1
+LOAD validate_amount 64
+RELOAD validate_amount
+CATCH api_failure flag_api_call_error 1
+CATCH invalid_amount flag_invalid_amount 1
+INCMP _ 0
+LOAD get_recipient 0
+LOAD get_sender 64
+LOAD get_amount 32
+INCMP transaction_pin *

services/registration/credit_amount_swa

@@ -0,0 +1 @@
+{{.credit_max_amount}}

services/registration/credit_send

@@ -0,0 +1 @@
+Enter recipient's phone number/address/alias:

services/registration/credit_send.vis

@@ -0,0 +1,12 @@
+LOAD transaction_reset 0
+RELOAD transaction_reset
+CATCH no_voucher flag_no_active_voucher 1
+MOUT back 0
+HALT
+LOAD validate_recipient 50
+RELOAD validate_recipient
+CATCH api_failure flag_api_call_error  1
+CATCH invalid_recipient flag_invalid_recipient 1
+CATCH invite_recipient flag_invalid_recipient_with_invite 1
+INCMP _ 0
+INCMP credit_amount *

services/registration/credit_send_menu

@@ -0,0 +1 @@
+Credit-Send

services/registration/credit_send_menu_swa

@@ -0,0 +1 @@
+Tuma-Mkopo

services/registration/credit_send_swa

@@ -0,0 +1 @@
+Weka nambari ya simu/anwani/lakabu:

services/registration/locale/swa/default.po

@@ -50,5 +50,7 @@ msgid "Maximum amount: %s %s\nEnter amount:"
 msgstr "Kiwango cha juu: %s %s\nWeka kiwango:"
 
 msgid "Credit Available: %s %s\n(You can swap up to %s %s -> %s %s).\nEnter %s amount:"
-msgstr "Kiwango kinachopatikana: %s %s\n(Unaweza kubadilisha hadi %s %s -> %s %s)\nWeka %s kiwango:"
+msgstr "Kiwango kinachopatikana: %s %s\n(Unaweza kubadilisha hadi %s %s -> %s %s)\nWeka kiwango cha %s:"
 
+msgid "%s will receive %s %s"
+msgstr "%s atapokea %s %s"

services/registration/main.vis

@@ -7,18 +7,20 @@ LOAD check_balance 128
 RELOAD check_balance
 MAP check_balance
 MOUT send 1
-MOUT swap 2
+MOUT credit_send 2
-MOUT vouchers 3
+MOUT swap 3
-MOUT select_pool 4
+MOUT vouchers 4
-MOUT account 5
+MOUT select_pool 5
-MOUT help 6
+MOUT account 6
+MOUT help 7
 MOUT quit 9
 HALT
 INCMP send 1
-INCMP swap_to_list 2
+INCMP credit_send 2
-INCMP my_vouchers 3
+INCMP swap_to_list 3
-INCMP select_pool 4
+INCMP my_vouchers 4
-INCMP my_account 5
+INCMP select_pool 5
-INCMP help 6
+INCMP my_account 6
+INCMP help 7
 INCMP quit 9
 INCMP . *

services/registration/select_pool.vis

@@ -1,5 +1,6 @@
 CATCH no_voucher flag_no_active_voucher 1
 LOAD get_pools 0
+RELOAD get_pools
 MAP get_pools
 LOAD get_default_pool 20
 RELOAD get_default_pool

services/registration/send_swa

@@ -1 +1 @@
-Weka nambari ya simu:
+Weka nambari ya simu/Anwani/Lakabu:

services/registration/transaction_swap_swa

@@ -0,0 +1,3 @@
+{{.transaction_swap_preview}}
+
+Tafadhali weka PIN yako kudhibitisha: