Compare commits
No commits in common. "8dc203d111f1bf288fc187cde9132de42ae8860c" and "71496d0015d95c30ce3bf46a2e681f2c25e348cb" have entirely different histories.
8dc203d111
...
71496d0015
@ -2940,12 +2940,6 @@ func (h *MenuHandlers) SwapPreview(ctx context.Context, sym string, input []byte
|
|||||||
logg.ErrorCtxf(ctx, "failed to write swap amount entry with", "key", storedb.DATA_ACTIVE_SWAP_AMOUNT, "value", finalAmountStr, "error", err)
|
logg.ErrorCtxf(ctx, "failed to write swap amount entry with", "key", storedb.DATA_ACTIVE_SWAP_AMOUNT, "value", finalAmountStr, "error", err)
|
||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
// store the user's input amount in the temporary value
|
|
||||||
err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(inputStr))
|
|
||||||
if err != nil {
|
|
||||||
logg.ErrorCtxf(ctx, "failed to write swap amount entry with", "key", storedb.DATA_ACTIVE_SWAP_AMOUNT, "value", finalAmountStr, "error", err)
|
|
||||||
return res, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// call the API to get the quote
|
// call the API to get the quote
|
||||||
r, err := h.accountService.GetPoolSwapQuote(ctx, finalAmountStr, swapData.PublicKey, swapData.ActiveSwapFromAddress, swapData.ActivePoolAddress, swapData.ActiveSwapToAddress)
|
r, err := h.accountService.GetPoolSwapQuote(ctx, finalAmountStr, swapData.PublicKey, swapData.ActiveSwapFromAddress, swapData.ActivePoolAddress, swapData.ActiveSwapToAddress)
|
||||||
@ -3021,7 +3015,7 @@ func (h *MenuHandlers) InitiateSwap(ctx context.Context, sym string, input []byt
|
|||||||
|
|
||||||
res.Content = l.Get(
|
res.Content = l.Get(
|
||||||
"Your request has been sent. You will receive an SMS when your %s %s has been swapped for %s.",
|
"Your request has been sent. You will receive an SMS when your %s %s has been swapped for %s.",
|
||||||
swapData.TemporaryValue,
|
swapAmountStr,
|
||||||
swapData.ActiveSwapFromSym,
|
swapData.ActiveSwapFromSym,
|
||||||
swapData.ActiveSwapToSym,
|
swapData.ActiveSwapToSym,
|
||||||
)
|
)
|
||||||
|
|||||||
@ -22,7 +22,6 @@ type SwapData struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type SwapPreviewData struct {
|
type SwapPreviewData struct {
|
||||||
TemporaryValue string
|
|
||||||
PublicKey string
|
PublicKey string
|
||||||
ActiveSwapMaxAmount string
|
ActiveSwapMaxAmount string
|
||||||
ActiveSwapFromDecimal string
|
ActiveSwapFromDecimal string
|
||||||
@ -66,7 +65,6 @@ func ReadSwapData(ctx context.Context, store DataStore, sessionId string) (SwapD
|
|||||||
func ReadSwapPreviewData(ctx context.Context, store DataStore, sessionId string) (SwapPreviewData, error) {
|
func ReadSwapPreviewData(ctx context.Context, store DataStore, sessionId string) (SwapPreviewData, error) {
|
||||||
data := SwapPreviewData{}
|
data := SwapPreviewData{}
|
||||||
fieldToKey := map[string]storedb.DataTyp{
|
fieldToKey := map[string]storedb.DataTyp{
|
||||||
"TemporaryValue": storedb.DATA_TEMPORARY_VALUE,
|
|
||||||
"PublicKey": storedb.DATA_PUBLIC_KEY,
|
"PublicKey": storedb.DATA_PUBLIC_KEY,
|
||||||
"ActiveSwapMaxAmount": storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT,
|
"ActiveSwapMaxAmount": storedb.DATA_ACTIVE_SWAP_MAX_AMOUNT,
|
||||||
"ActiveSwapFromDecimal": storedb.DATA_ACTIVE_DECIMAL,
|
"ActiveSwapFromDecimal": storedb.DATA_ACTIVE_DECIMAL,
|
||||||
@ -177,14 +175,10 @@ func GetSwapToVoucherData(ctx context.Context, store DataStore, sessionId string
|
|||||||
// UpdateSwapToVoucherData updates the active swap to voucher data in the DataStore.
|
// UpdateSwapToVoucherData updates the active swap to voucher data in the DataStore.
|
||||||
func UpdateSwapToVoucherData(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenDetails) error {
|
func UpdateSwapToVoucherData(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenDetails) error {
|
||||||
logg.TraceCtxf(ctx, "UpdateSwapToVoucherData", "data", data)
|
logg.TraceCtxf(ctx, "UpdateSwapToVoucherData", "data", data)
|
||||||
|
|
||||||
// Convert TokenDecimals (uint8) to string
|
|
||||||
tokenDecimalsStr := strconv.FormatUint(uint64(data.TokenDecimals), 10)
|
|
||||||
|
|
||||||
// Active swap to voucher data entries
|
// Active swap to voucher data entries
|
||||||
activeEntries := map[storedb.DataTyp][]byte{
|
activeEntries := map[storedb.DataTyp][]byte{
|
||||||
storedb.DATA_ACTIVE_SWAP_TO_SYM: []byte(data.TokenSymbol),
|
storedb.DATA_ACTIVE_SWAP_TO_SYM: []byte(data.TokenSymbol),
|
||||||
storedb.DATA_ACTIVE_SWAP_TO_DECIMAL: []byte(tokenDecimalsStr),
|
storedb.DATA_ACTIVE_SWAP_TO_DECIMAL: []byte{data.TokenDecimals},
|
||||||
storedb.DATA_ACTIVE_SWAP_TO_ADDRESS: []byte(data.TokenAddress),
|
storedb.DATA_ACTIVE_SWAP_TO_ADDRESS: []byte(data.TokenAddress),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user