Merge pull request 'allow-stables-direct-to-mpesa' (#118) from allow-stables-direct-to-mpesa into master

Reviewed-on: #118

handlers/application/mpesa.go

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

handlers/application/pool_deposit.go

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