retain the original amount and use it for the transfer once the swap is performed

Reviewed-on: #113

.gitignore

@@ -8,3 +8,4 @@ id_*
 *.gdbm
 *.log
 user-data
+**/*/vise-asm

handlers/application/pools.go

@@ -3,6 +3,7 @@ package application
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/resource"
@@ -104,6 +105,7 @@ func (h *MenuHandlers) GetDefaultPool(ctx context.Context, sym string, input []b
 
 // ViewPool retrieves the pool details from the user store
 // and displays it to the user for them to select it.
+// if the data does not exist, it calls the API to get the pool details
 func (h *MenuHandlers) ViewPool(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	sessionId, ok := ctx.Value("SessionId").(string)
@@ -131,8 +133,11 @@ func (h *MenuHandlers) ViewPool(ctx context.Context, sym string, input []byte) (
 	if poolData == nil {
 		flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
 
+		// convert to uppercase before the call
+		poolSymbol := strings.ToUpper(inputStr)
+
 		// no match found. Call the API using the inputStr as the symbol
-		poolResp, err := h.accountService.RetrievePoolDetails(ctx, inputStr)
+		poolResp, err := h.accountService.RetrievePoolDetails(ctx, poolSymbol)
 		if err != nil {
 			res.FlagSet = append(res.FlagSet, flag_api_call_error)
 			return res, nil

handlers/application/send.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"math/big"
 	"strconv"
 	"strings"
 	"time"
@@ -258,6 +259,7 @@ func (h *MenuHandlers) TransactionReset(ctx context.Context, sym string, input [
 
 	flag_invalid_recipient, _ := h.flagManager.GetFlag("flag_invalid_recipient")
 	flag_invalid_recipient_with_invite, _ := h.flagManager.GetFlag("flag_invalid_recipient_with_invite")
+
 	store := h.userdataStore
 	err = store.WriteEntry(ctx, sessionId, storedb.DATA_AMOUNT, []byte(""))
 	if err != nil {
@@ -336,28 +338,13 @@ 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, or if the sym is send_max_amount, return balance
-	if string(transactionType) == "normal" || sym == "send_max_amount" {
+	// If normal transaction return balance
+	if string(transactionType) == "normal" {
 		res.FlagReset = append(res.FlagReset, flag_swap_transaction)
-
 		res.Content = l.Get("Maximum amount: %s %s\nEnter amount:", formattedBalance, string(activeSym))
-
 		return res, nil
 	}
 
-	res.FlagSet = append(res.FlagSet, flag_swap_transaction)
-
-	// Get the recipient's phone number to read other data items
-	recipientPhoneNumber, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_RECIPIENT_PHONE_NUMBER)
-	if err != nil {
-		// invalid state
-		return res, err
-	}
-	recipientActiveSym, recipientActiveAddress, recipientActiveDecimal, err := h.getRecipientData(ctx, string(recipientPhoneNumber))
-	if err != nil {
-		return res, err
-	}
-
 	// Resolve active pool address
 	activePoolAddress, err := h.resolveActivePoolAddress(ctx, sessionId)
 	if err != nil {
@@ -372,16 +359,31 @@ func (h *MenuHandlers) MaxAmount(ctx context.Context, sym string, input []byte)
 			logg.ErrorCtxf(ctx, "failed on CheckTokenInPool", "error", err)
 			return res, nil
 		}
+
 		res.FlagReset = append(res.FlagReset, flag_swap_transaction)
 		res.Content = l.Get("Maximum amount: %s %s\nEnter amount:", formattedBalance, string(activeSym))
 		return res, nil
 	}
 
+	// Get the recipient's phone number to read other data items
+	recipientPhoneNumber, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_RECIPIENT_PHONE_NUMBER)
+	if err != nil {
+		// invalid state
+		return res, err
+	}
+	recipientActiveSym, recipientActiveAddress, recipientActiveDecimal, err := h.getRecipientData(ctx, string(recipientPhoneNumber))
+	if err != nil {
+		return res, err
+	}
+
 	// retrieve the max credit send amounts
 	maxSAT, maxRAT, err := h.calculateSendCreditLimits(ctx, activePoolAddress, activeAddress, recipientActiveAddress, publicKey, activeDecimal, recipientActiveDecimal)
 	if err != nil {
-		res.FlagSet = append(res.FlagSet, flag_api_call_error)
+		// if an error (such as Swap rates not found for the speficied pool and tokens), fall back to a normal transaction
 		logg.ErrorCtxf(ctx, "failed on calculateSendCreditLimits", "error", err)
+		res.FlagReset = append(res.FlagReset, flag_swap_transaction)
+		res.Content = l.Get("Maximum amount: %s %s\nEnter amount:", formattedBalance, string(activeSym))
+
 		return res, nil
 	}
 
@@ -413,6 +415,9 @@ func (h *MenuHandlers) MaxAmount(ctx context.Context, sym string, input []byte)
 		return res, err
 	}
 
+	// only set the flag once all checks pass
+	res.FlagSet = append(res.FlagSet, flag_swap_transaction)
+
 	res.Content = l.Get(
 		"Credit Available: %s %s\n(You can swap up to %s %s -> %s %s).\nEnter %s amount:",
 		maxRAT,
@@ -753,8 +758,19 @@ func (h *MenuHandlers) TransactionSwapPreview(ctx context.Context, sym string, i
 		return res, err
 	}
 
+	// multiply by 1.015 (i.e. * 1015 / 1000)
+	amountInt, ok := new(big.Int).SetString(finalAmountStr, 10)
+	if !ok {
+		return res, fmt.Errorf("invalid amount: %s", finalAmountStr)
+	}
+
+	amountInt.Mul(amountInt, big.NewInt(1015))
+	amountInt.Div(amountInt, big.NewInt(1000))
+
+	scaledFinalAmountStr := amountInt.String()
+
 	// call the credit send API to get the reverse quote
-	r, err := h.accountService.GetCreditSendReverseQuote(ctx, swapData.ActivePoolAddress, swapData.ActiveSwapFromAddress, swapData.ActiveSwapToAddress, finalAmountStr)
+	r, err := h.accountService.GetCreditSendReverseQuote(ctx, swapData.ActivePoolAddress, swapData.ActiveSwapFromAddress, swapData.ActiveSwapToAddress, scaledFinalAmountStr)
 	if err != nil {
 		flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
 		res.FlagSet = append(res.FlagSet, flag_api_call_error)
@@ -766,23 +782,23 @@ func (h *MenuHandlers) TransactionSwapPreview(ctx context.Context, sym string, i
 	sendInputAmount := r.InputAmount   // amount of SAT that should be swapped
 	sendOutputAmount := r.OutputAmount // amount of RAT that will be received
 
-	// store the sendOutputAmount as the final amount (that will be sent)
-	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_AMOUNT, []byte(sendOutputAmount))
+	// store the finalAmountStr as the final amount (that will be sent after the swap)
+	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_AMOUNT, []byte(finalAmountStr))
 	if err != nil {
 		logg.ErrorCtxf(ctx, "failed to write output amount value entry with", "key", storedb.DATA_AMOUNT, "value", sendOutputAmount, "error", err)
 		return res, err
 	}
 
 	// Scale down the quoted output amount
-	quoteAmountStr := store.ScaleDownBalance(sendOutputAmount, swapData.ActiveSwapToDecimal)
+	// quoteAmountStr := store.ScaleDownBalance(sendOutputAmount, swapData.ActiveSwapToDecimal)
 
 	// Format the qouteAmount amount to 2 decimal places
-	qouteAmount, _ := store.TruncateDecimalString(quoteAmountStr, 2)
+	// qouteAmount, _ := store.TruncateDecimalString(quoteAmountStr, 2)
 
 	// store the qouteAmount in the temporary value
-	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(qouteAmount))
+	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(inputStr))
 	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to write temporary qouteAmount entry with", "key", storedb.DATA_TEMPORARY_VALUE, "value", qouteAmount, "error", err)
+		logg.ErrorCtxf(ctx, "failed to write temporary inputStr entry with", "key", storedb.DATA_TEMPORARY_VALUE, "value", inputStr, "error", err)
 		return res, err
 	}
 
@@ -795,7 +811,7 @@ func (h *MenuHandlers) TransactionSwapPreview(ctx context.Context, sym string, i
 
 	res.Content = l.Get(
 		"%s will receive %s %s",
-		string(recipientPhoneNumber), qouteAmount, swapData.ActiveSwapToSym,
+		string(recipientPhoneNumber), inputStr, swapData.ActiveSwapToSym,
 	)
 
 	return res, nil

services/registration/credit_amount.vis

@@ -1,4 +1,5 @@
 LOAD reset_transaction_amount 10
+RELOAD reset_transaction_amount
 LOAD credit_max_amount 160
 RELOAD credit_max_amount
 CATCH api_failure flag_api_call_error 1
@@ -10,7 +11,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

services/registration/credit_send_menu

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

services/registration/credit_send_menu_swa

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

services/registration/main.vis

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

services/registration/send

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

services/registration/send.vis

@@ -1,12 +0,0 @@
-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 amount *

services/registration/send_swa

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