Merge branch 'exchange-expansion' into development

serkor1 · Jun 14, 2024 · 0da3aab · 0da3aab
2 parents 1426fb5 + 037d7db
commit 0da3aab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/R/api_mexc.R b/R/api_mexc.R
@@ -183,7 +183,11 @@ mexcDates <- function(
   #
   # If fundingrate the multiplier
   # is 1e3
+<<<<<<< HEAD
   multiplier <- 1e3 / if (futures) 1e3 else 1
+=======
+  multiplier <- 1e3 / if (futures & !grepl("fundingrate", type)) 1e3 else 1
+>>>>>>> exchange-expansion
 
   # Convert and format dates
   dates <- convert_date(

diff --git a/man/available_tickers.Rd b/man/available_tickers.Rd
diff --git a/playground/playground.R b/playground/playground.R
@@ -10,6 +10,7 @@
 rm(list = ls()); gc(); devtools::load_all()
 
 
+
 get_quote(
   ticker = "BTC-USDT",
   source = "huobi",
@@ -23,5 +24,4 @@ get_quote(
   futures = FALSE
 )
 
-
 # script end;