Fix all these conflicts

7 files changed, 25 insertions, 204 deletions

diff --git a/openbb_terminal/dashboards/voila/chains.ipynb b/openbb_terminal/dashboards/voila/chains.ipynb
index e99983e50c0..037b1ddaa66 100644
--- a/openbb_terminal/dashboards/voila/chains.ipynb
+++ b/openbb_terminal/dashboards/voila/chains.ipynb
@@ -64,7 +64,7 @@
     "            xanchor=\"center\",\n",
     "            yanchor=\"top\",\n",
     "        ),\n",
-    "    )\n"
+    "    )"
    ]
   },
   {
diff --git a/openbb_terminal/miscellaneous/i18n/en.yml b/openbb_terminal/miscellaneous/i18n/en.yml
index 9e12be98722..8f6d520e212 100644
--- a/openbb_terminal/miscellaneous/i18n/en.yml
+++ b/openbb_terminal/miscellaneous/i18n/en.yml
@@ -751,7 +751,7 @@ en:
   economy/balance: Show Government defict or surplus in capital income and expenditures
   economy/revenue: Show Government revenue based on tax income
   economy/spending: Show Government spending as indicator of size of government
-  economy/trust: Show Government trust based on surveys regarding confidence in the government  
+  economy/trust: Show Government trust based on surveys regarding confidence in the government
   economy/_database_: Databases
   economy/_stored: Stored datasets
   economy/overview: show a market overview of either indices, bonds or currencies
diff --git a/openbb_terminal/miscellaneous/stocks/options/high_iv.ini b/openbb_terminal/miscellaneous/stocks/options/high_iv.ini
index 0fb16644274..0a865fb1f99 100644
--- a/openbb_terminal/miscellaneous/stocks/options/high_iv.ini
+++ b/openbb_terminal/miscellaneous/stocks/options/high_iv.ini
@@ -4,7 +4,7 @@
 
 # tickers [string]: a list of space or comma separated tickers to restrict or exclude them from the query.
 # E.g. "GME" or for multiples "AMC,BB,GME".
-tickers = 
+tickers =
 
 # exclude [true|false]: if true, then tickers are excluded. If false, the search is restricted to these tickers.
 exclude =
@@ -25,25 +25,25 @@ otm = true
 min-ask-bid =
 
 # max-ask-bid [float]: maximum spread between bid and ask.
-max-ask-bid = 
+max-ask-bid =
 
 # min-exp [int]: minimum days until expiration.
 min-exp =
 
 # max-exp [int]: maximum days until expiration.
-max-exp = 
+max-exp =
 
 # min-price [float]: minimum option premium.
-min-price = 
+min-price =
 
 # max-price [float]: maximum option premium.
 max-price =
 
 #min-strike [float]: minimum option strike.
-min-strike = 
+min-strike =
 
 #max-strike [float]: maximum option strike.
-max-strike = 
+max-strike =
 
 # calls [true|false]: select call options.
 calls = true
@@ -76,10 +76,10 @@ min-myield =
 max-myield =
 
 # min-delta [float]: minimum delta greek.
-min-delta = 
+min-delta =
 
 # max-delta [float]: maximum delta greek.
-max-delta = 
+max-delta =
 
 # min-gamma [float]: minimum gamma greek.
 min-gamma =
@@ -103,7 +103,7 @@ max-vega =
 min-iv = 1.00
 
 #max-iv [float]: maximum implied volatility.
-max-iv = 
+max-iv =
 
 #min-oi [float]: minimum open interest.
 min-oi = 10
@@ -118,7 +118,7 @@ min-volume = 10
 max-volume =
 
 #min-voi [float]: minimum volume / oi ratio.
-min-voi = 
+min-voi =
 
 #max-voi [float]: maximum volume / oi ratio.
 max-voi =
@@ -151,8 +151,8 @@ min-price-20d =
 max-price-20d =
 min-volume-20d =
 max-volume-20d =
-min-iv-20d = 
-max-iv-20d = 
+min-iv-20d =
+max-iv-20d =
 min-delta-20d =
 max-delta-20d =
 min-gamma-20d =
diff --git a/openbb_terminal/miscellaneous/stocks/options/iv_below_20day.ini b/openbb_terminal/miscellaneous/stocks/options/iv_below_20day.ini
index ca2153a983f..f121959a319 100644
--- a/openbb_terminal/miscellaneous/stocks/options/iv_below_20day.ini
+++ b/openbb_terminal/miscellaneous/stocks/options/iv_below_20day.ini
@@ -100,19 +100,19 @@ min-vega =
 max-vega =
 
 #min-iv [float]: minimum implied volatility.
-min-iv = 
+min-iv = 1.00
 
 #max-iv [float]: maximum implied volatility.
 max-iv = 
 
 #min-oi [float]: minimum open interest.
-min-oi = 1
+min-oi = 10
 
 #max-oi[float]: maximum open interest
 max-oi =
 
 #min-volume [float]: minimum volume.
-min-volume = 
+min-volume = 10
 
 #max-volume [float]: maximum volume.
 max-volume =
diff --git a/tests/openbb_terminal/stocks/options/ini/spy_30_delta.ini b/tests/openbb_terminal/stocks/options/ini/spy_30_delta.ini
index 9808f91a146..9ca3565c7c4 100644
--- a/tests/openbb_terminal/stocks/options/ini/spy_30_delta.ini
+++ b/tests/openbb_terminal/stocks/options/ini/spy_30_delta.ini
@@ -25,13 +25,13 @@ otm = true
 min-ask-bid =
 
 # max-ask-bid [float]: maximum spread between bid and ask.
-max-ask-bid = 
+max-ask-bid =
 
 # min-exp [int]: minimum days until expiration.
 min-exp =
 
 # max-exp [int]: maximum days until expiration.
-max-exp = 
+max-exp =
 
 # min-price [float]: minimum option premium.
 min-price =
@@ -43,7 +43,7 @@ max-price =
 min-strike = 280
 
 #max-strike [float]: maximum option strike.
-max-strike = 
+max-strike =
 
 # calls [true|false]: select call options.
 calls = true
@@ -100,10 +100,10 @@ min-vega =
 max-vega =
 
 #min-iv [float]: minimum implied volatility.
-min-iv = 
+min-iv =
 
 #max-iv [float]: maximum implied volatility.
-max-iv = 
+max-iv =
 
 #min-oi [float]: minimum open interest.
 min-oi = 10
@@ -118,7 +118,7 @@ min-volume = 100
 max-volume =
 
 #min-voi [float]: minimum volume / oi ratio.
-min-voi = 
+min-voi =
 
 #max-voi [float]: maximum volume / oi ratio.
 max-voi =
@@ -138,7 +138,7 @@ max-cap =
 #     "v_desc", "v_asc": volume, descending / ascending.
 #     "ρ_desc", "ρ_asc": rho, descending / ascending.
 
-order-by =  
+order-by =
 
 # limit [int]: number of results (max 50).
 limit =
diff --git a/tests/openbb_terminal/stocks/options/ini/template.ini b/tests/openbb_terminal/stocks/options/ini/template.ini
deleted file mode 100644
index ab73c0c59fc..00000000000
--- a/tests/openbb_terminal/stocks/options/ini/template.ini
+++ /dev/null
@@ -1,179 +0,0 @@
-# Author of preset: OpenBB Terminal
-# Description: This is just a sample. The user that adds the preset can add a description for what type of stocks these filters are being used.
-[FILTER]
-
-# tickers [string]: a list of space or comma separated tickers to restrict or exclude them from the query.
-# E.g. "GME" or for multiples "AMC","BB","GME".
-tickers =
-
-# exclude [true|false]: if true, then tickers are excluded. If false, the search is restricted to these tickers.
-exclude =
-
-# min-diff [int]: minimum difference in percentage between strike and stock price.
-min-diff =
-
-# max-diff [int]: maximum difference in percentage between strike and stock price.
-max-diff =
-
-# itm [bool]: select in the money options.
-itm = true
-
-# otm [bool]: select out of the money options.
-otm = true
-
-# min-ask-bid [float]: minimum spread between bid and ask.
-min-ask-bid =
-
-# max-ask-bid [float]: maximum spread between bid and ask.
-max-ask-bid =
-
-# min-exp [int]: minimum days until expiration.
-min-exp =
-
-# max-exp [int]: maximum days until expiration.
-max-exp =
-
-# min-price [float]: minimum option premium.
-min-price =
-
-# max-price [float]: maximum option premium.
-max-price =
-
-#min-strike [float]: minimum option strike.
-min-strike =
-
-#max-strike [float]: maximum option strike.
-max-strike =
-
-# calls [true|false]: select call options.
-calls = true
-
-# puts [true|false]: select put options.
-puts = true
-
-# stock [true|false]: select normal stocks.
-stock =
-
-# etf [true|false]: select etf options.
-etf =
-
-# min-sto [float]: minimum option price / stock price ratio.
-min-sto =
-
-# max-sto [float]: maximum option price / stock price ratio.
-max-sto =
-
-# min-yield [float]: minimum premium / strike price ratio.
-min-yield =
-
-# max-yield [float]: maximum premium / strike price ratio.
-max-yield =
-
-# min-myield [float]: minimum yield per month until expiration date.
-min-myield =
-
-# max-myield [float]: maximum yield per month until expiration date.
-max-myield =
-
-# min-delta [float]: minimum delta greek.
-min-delta =
-
-# max-delta [float]: maximum delta greek.
-max-delta =
-
-# min-gamma [float]: minimum gamma greek.
-min-gamma =
-
-# max-gamma [float]: maximum gamma greek.
-max-gamma =
-
-# min-theta [float]: minimum theta greek.
-min-theta =
-
-# max-theta [float]: maximum theta greek.
-max-theta =
-
-# min-vega [float]: minimum vega greek.
-min-vega =
-
-# max-vega [float]: maximum vega greek.
-max-vega =
-
-#min-iv [float]: minimum implied volatility.
-min-iv =
-
-#max-iv [float]: maximum implied volatility.
-max-iv =
-
-#min-oi [float]: minimum open interest.
-min-oi =
-
-#max-oi[float]: maximum open interest
-max-oi =
-
-#min-volume [float]: minimum volume.
-min-volume =
-
-#max-volume [float]: maximum volume.
-max-volume =
-
-#min-voi [float]: minimum volume / oi ratio.
-min-voi =
-
-#max-voi [float]: maximum volume / oi ratio.
-max-voi =
-
-# min-cap [float]: minimum market capitalization (in billions USD).
-min-cap =
-
-# max-cap [float]: maximum market capitalization (in billions USD).
-max-cap =
-
-# order-by [default: e_desc]: how to order results, possible values:
-#     e_desc, e_asc: expiration, descending / ascending.
-#     iv_desc, iv_asc: implied volatility, descending / ascending.
-#     lp_desc, lp_asc: lastprice, descending / ascending.
-#     md_desc, md_asc: current stock price, descending / ascending.
-order-by =
-
-# limit [int]: number of results (max 50).
-limit =
-
-# active [true|false]: if set to true, restricts to options for which volume, open interest, ask, and bid are all > 0.
-active =
-
-# [float|int] deviation from the 20 day average
-min-price-20d =
-max-price-20d =
-min-volume-20d =
-max-volume-20d =
-min-iv-20d =
-max-iv-20d =
-min-delta-20d =
-max-delta-20d =
-min-gamma-20d =
-max-gamma-20d =
-min-theta-20d =
-max-theta-20d =
-min-vega-20d =
-max-vega-20d =
-min-rho-20d =
-max-rho-20d =
-
-# [float|int] deviation from the 100 day average
-min-price-100d =
-max-price-100d =
-min-volume-100d =
-max-volume-100d =
-min-iv-100d =
-max-iv-100d =
-min-delta-100d =
-max-delta-100d =
-min-gamma-100d =
-max-gamma-100d =
-min-theta-100d =
-max-theta-100d =
-min-vega-100d =
-max-vega-100d =
-min-rho-100d =
-max-rho-100d =
diff --git a/website/content/terminal/usage/guides/data.md b/website/content/terminal/usage/guides/data.md
index 76800f9f1bc..37c53680b54 100644
--- a/website/content/terminal/usage/guides/data.md
+++ b/website/content/terminal/usage/guides/data.md
@@ -30,7 +30,7 @@ This folder contains all things user-created. For example:
 
 ## Exporting Files
 
-Within many of the functionalities, we offer the capability to export to Excel (xlsx and csv) or JSON. This can be demonstrated with the `--export` argument, e.g. if you wish to export to `xlsx` you would add `--export xlsx`. 
+Within many of the functionalities, we offer the capability to export to Excel (xlsx and csv) or JSON. This can be demonstrated with the `--export` argument, e.g. if you wish to export to `xlsx` you would add `--export xlsx`.
 
 For example, if you wish to download market data you can do so from the stocks menu with the following: