Compare commits

..

No commits in common. "master" and "v1.4.7-rc" have entirely different histories.

2 changed files with 6 additions and 13 deletions

View File

@ -100,8 +100,8 @@ func (h *MenuHandlers) GetMpesaMaxLimit(ctx context.Context, sym string, input [
} }
// Fetch min withdrawal amount from config/env // Fetch min withdrawal amount from config/env
minWithdraw := config.MinMpesaWithdrawAmount() // float64 (20) minksh := fmt.Sprintf("%f", config.MinMpesaWithdrawAmount())
minKshFormatted, _ := store.TruncateDecimalString(fmt.Sprintf("%f", minWithdraw), 0) minKshFormatted, _ := store.TruncateDecimalString(minksh, 0)
// If SAT is the same as RAT (default USDm), // If SAT is the same as RAT (default USDm),
// or if the voucher is a stable coin // or if the voucher is a stable coin
@ -115,16 +115,9 @@ func (h *MenuHandlers) GetMpesaMaxLimit(ctx context.Context, sym string, input [
} }
activeFloat, _ := strconv.ParseFloat(string(metadata.Balance), 64) activeFloat, _ := strconv.ParseFloat(string(metadata.Balance), 64)
kshValue := activeFloat * rates.Buy ksh := fmt.Sprintf("%f", activeFloat*rates.Buy)
maxKshFormatted, _ := store.TruncateDecimalString(fmt.Sprintf("%f", kshValue), 0) maxKshFormatted, _ := store.TruncateDecimalString(ksh, 0)
// Ensure that the max is greater than the min
if kshValue < minWithdraw {
res.FlagSet = append(res.FlagSet, flag_low_swap_amount)
res.Content = l.Get("%s Ksh", maxKshFormatted)
return res, nil
}
res.Content = l.Get( res.Content = l.Get(
"Enter the amount of Mpesa to withdraw: (Min: Ksh %s, Max %s Ksh)\n", "Enter the amount of Mpesa to withdraw: (Min: Ksh %s, Max %s Ksh)\n",

View File

@ -206,8 +206,8 @@ func (h *MenuHandlers) InitiatePoolDeposit(ctx context.Context, sym string, inpu
return res, err return res, err
} }
// Call token transfer API and send the token to the pool address // Call pool deposit API
r, err := h.accountService.TokenTransfer(ctx, finalAmountStr, string(publicKey), string(activePoolAddress), poolDepositVoucher.TokenAddress) r, err := h.accountService.PoolDeposit(ctx, finalAmountStr, string(publicKey), string(activePoolAddress), poolDepositVoucher.TokenAddress)
if err != nil { if err != nil {
flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error") flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
res.FlagSet = append(res.FlagSet, flag_api_call_error) res.FlagSet = append(res.FlagSet, flag_api_call_error)