From e7c04f349e75c5b44b2129a441438c80fae44885 Mon Sep 17 00:00:00 2001
From: Herklos <herklos@drakkar.software>
Date: Tue, 3 Feb 2026 14:53:30 +0100
Subject: [PATCH] [Service][Web] Add prediction market web distribution

Signed-off-by: Herklos <herklos@drakkar.software>
---
 .../Interfaces/web_interface/api/__init__.py  |   3 +
 .../web_interface/controllers/__init__.py     |   3 +
 .../market_making/configuration.py            |   3 +-
 .../prediction_market/__init__.py             |  35 ++
 .../prediction_market/configuration.py        | 192 +++++++++++
 .../prediction_market/dashboard.py            |  65 ++++
 .../Interfaces/web_interface/enums.py         |   4 +
 .../flask_util/browsing_data_provider.py      |   1 +
 .../web_interface/models/configuration.py     | 153 ++++++++-
 .../models/distributions/__init__.py          |   7 +
 .../market_making/configuration.py            | 155 +--------
 .../prediction_market/__init__.py             |  27 ++
 .../prediction_market/configuration.py        |  50 +++
 .../web_interface/models/json_schemas.py      |  25 +-
 .../prediction_market/js/configuration.js     | 307 ++++++++++++++++++
 .../prediction_market/js/dashboard.js         |  22 ++
 .../web_interface/static/js/common/util.js    |  17 +
 .../prediction_market/configuration.html      | 128 ++++++++
 .../prediction_market/dashboard.html          | 100 ++++++
 .../prediction_market/footer.html             |  18 +
 .../prediction_market/interfaces.html         | 118 +++++++
 .../prediction_market/navbar.html             |  57 ++++
 .../prediction_market/portfolio.html          | 117 +++++++
 .../web_interface/templates/layout.html       |   4 +
 .../polymarket/ccxt/polymarket_async.py       |  28 +-
 .../polymarket/ccxt/polymarket_sync.py        |  28 +-
 .../polymarket/polymarket_exchange.py         |  11 +
 .../Exchange/polymarket/script/download.py    |   2 +-
 .../Mode/index_trading_mode/index_trading.py  |  45 ++-
 .../rebalancer/futures_rebalancer.py          |  14 +-
 .../rebalancer/spot_rebalancer.py             |  11 +-
 .../tests/test_index_trading_mode.py          |  42 +++
 .../config/ProfileCopyTradingMode.json        |   4 +-
 .../profile_distribution.py                   |   2 +-
 .../ProfileCopyTradingMode.json               |   3 +-
 .../modes/channel/abstract_mode_consumer.py   |   2 +-
 36 files changed, 1621 insertions(+), 182 deletions(-)
 create mode 100644 packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/prediction_market/__init__.py
 create mode 100644 packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/prediction_market/configuration.py
 create mode 100644 packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/prediction_market/dashboard.py
 create mode 100644 packages/tentacles/Services/Interfaces/web_interface/models/distributions/prediction_market/__init__.py
 create mode 100644 packages/tentacles/Services/Interfaces/web_interface/models/distributions/prediction_market/configuration.py
 create mode 100644 packages/tentacles/Services/Interfaces/web_interface/static/distributions/prediction_market/js/configuration.js
 create mode 100644 packages/tentacles/Services/Interfaces/web_interface/static/distributions/prediction_market/js/dashboard.js
 create mode 100644 packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/configuration.html
 create mode 100644 packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/dashboard.html
 create mode 100644 packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/footer.html
 create mode 100644 packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/interfaces.html
 create mode 100644 packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/navbar.html
 create mode 100644 packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/portfolio.html

diff --git a/packages/tentacles/Services/Interfaces/web_interface/api/__init__.py b/packages/tentacles/Services/Interfaces/web_interface/api/__init__.py
index 82b238a803..e6e9028e96 100644
--- a/packages/tentacles/Services/Interfaces/web_interface/api/__init__.py
+++ b/packages/tentacles/Services/Interfaces/web_interface/api/__init__.py
@@ -45,6 +45,9 @@ def register(distribution: octobot.enums.OctoBotDistribution):
     elif distribution is octobot.enums.OctoBotDistribution.MARKET_MAKING:
         pass
 
+    elif distribution is octobot.enums.OctoBotDistribution.PREDICTION_MARKET:
+        pass
+
     # common routes
     tentacles.Services.Interfaces.web_interface.api.config.register(blueprint)
     tentacles.Services.Interfaces.web_interface.api.exchanges.register(blueprint)
diff --git a/packages/tentacles/Services/Interfaces/web_interface/controllers/__init__.py b/packages/tentacles/Services/Interfaces/web_interface/controllers/__init__.py
index 1a093f8830..d27ffd114a 100644
--- a/packages/tentacles/Services/Interfaces/web_interface/controllers/__init__.py
+++ b/packages/tentacles/Services/Interfaces/web_interface/controllers/__init__.py
@@ -39,6 +39,7 @@
 import tentacles.Services.Interfaces.web_interface.controllers.welcome
 import tentacles.Services.Interfaces.web_interface.controllers.robots
 import tentacles.Services.Interfaces.web_interface.controllers.distributions.market_making
+import tentacles.Services.Interfaces.web_interface.controllers.distributions.prediction_market
 import tentacles.Services.Interfaces.web_interface.controllers.dsl
 
 
@@ -63,6 +64,8 @@ def register(blueprint, distribution: octobot.enums.OctoBotDistribution):
         tentacles.Services.Interfaces.web_interface.controllers.dsl.register(blueprint)
     elif distribution is octobot.enums.OctoBotDistribution.MARKET_MAKING:
         tentacles.Services.Interfaces.web_interface.controllers.distributions.market_making.register(blueprint)
+    elif distribution is octobot.enums.OctoBotDistribution.PREDICTION_MARKET:
+        tentacles.Services.Interfaces.web_interface.controllers.distributions.prediction_market.register(blueprint)
     # common routes
     tentacles.Services.Interfaces.web_interface.controllers.octobot_authentication.register(blueprint)
     tentacles.Services.Interfaces.web_interface.controllers.robots.register(blueprint)
diff --git a/packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/market_making/configuration.py b/packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/market_making/configuration.py
index f10f6c6932..824b5ba8ba 100644
--- a/packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/market_making/configuration.py
+++ b/packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/market_making/configuration.py
@@ -23,6 +23,7 @@
 import tentacles.Services.Interfaces.web_interface.models as models
 import tentacles.Services.Interfaces.web_interface.util as util
 import tentacles.Services.Interfaces.web_interface.flask_util as flask_util
+import tentacles.Services.Interfaces.web_interface.enums as enums
 import octobot_trading.api as trading_api
 
 
@@ -51,7 +52,7 @@ def configuration():
             'distributions/market_making/configuration.html',
             selected_exchange=enabled_exchanges[0] if enabled_exchanges else (config_exchanges[0][models.NAME] if config_exchanges else None),
             config_exchanges=config_exchanges,
-            exchanges_schema=models.get_json_exchanges_schema(models.get_tested_exchange_list()),
+            exchanges_schema=models.get_json_exchanges_schema(models.get_tested_exchange_list(), enums.ExchangeConnectionType.API_KEY),
 
             selected_pair=first_symbol_pair,
 
diff --git a/packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/prediction_market/__init__.py b/packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/prediction_market/__init__.py
new file mode 100644
index 0000000000..e40b7e6ed7
--- /dev/null
+++ b/packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/prediction_market/__init__.py
@@ -0,0 +1,35 @@
+#  Drakkar-Software OctoBot-Interfaces
+#  Copyright (c) Drakkar-Software, All rights reserved.
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library.
+import tentacles.Services.Interfaces.web_interface.controllers.portfolio
+import tentacles.Services.Interfaces.web_interface.controllers.logs
+import tentacles.Services.Interfaces.web_interface.controllers.dashboard
+import tentacles.Services.Interfaces.web_interface.controllers.tentacles_config
+import tentacles.Services.Interfaces.web_interface.controllers.distributions.prediction_market.dashboard
+import tentacles.Services.Interfaces.web_interface.controllers.distributions.prediction_market.configuration
+
+
+def register(blueprint):
+    tentacles.Services.Interfaces.web_interface.controllers.portfolio.register(blueprint)
+    tentacles.Services.Interfaces.web_interface.controllers.logs.register(blueprint)
+    tentacles.Services.Interfaces.web_interface.controllers.dashboard.register(blueprint)
+    tentacles.Services.Interfaces.web_interface.controllers.tentacles_config.register(blueprint)
+    tentacles.Services.Interfaces.web_interface.controllers.distributions.prediction_market.dashboard.register(blueprint)
+    tentacles.Services.Interfaces.web_interface.controllers.distributions.prediction_market.configuration.register(blueprint)
+
+
+__all__ = [
+    "register",
+]
diff --git a/packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/prediction_market/configuration.py b/packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/prediction_market/configuration.py
new file mode 100644
index 0000000000..6ad96c3eb1
--- /dev/null
+++ b/packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/prediction_market/configuration.py
@@ -0,0 +1,192 @@
+#  Drakkar-Software OctoBot-Interfaces
+#  Copyright (c) Drakkar-Software, All rights reserved.
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library.
+import flask
+
+import octobot_commons.logging as commons_logging
+import octobot_services.constants as services_constants
+import octobot_services.interfaces.util as interfaces_util
+import tentacles.Services.Interfaces.web_interface.constants as constants
+import tentacles.Services.Interfaces.web_interface.login as login
+import tentacles.Services.Interfaces.web_interface.models as models
+import tentacles.Services.Interfaces.web_interface.models.distributions.prediction_market as models_prediction_market
+import tentacles.Services.Interfaces.web_interface.enums as enums
+import tentacles.Services.Interfaces.web_interface.util as util
+import tentacles.Services.Interfaces.web_interface.flask_util as flask_util
+import octobot_trading.api as trading_api
+
+
+def register(blueprint):
+    @blueprint.route('/configuration')
+    @blueprint.route('/configuration/<profile_id>')
+    @login.login_required_when_activated
+    def configuration(profile_id=None):
+        requested_profile_id = profile_id
+        current_profile = models.get_current_profile()
+        
+        if requested_profile_id and requested_profile_id != current_profile.profile_id:
+            # Show profile switch UI for non-current profile
+            requested_profile = models.get_profile(requested_profile_id)
+            return flask.render_template(
+                'distributions/prediction_market/configuration.html',
+                show_profile_switch=True,
+                requested_profile=requested_profile,
+                current_profile=current_profile,
+                current_profile_id=requested_profile_id,
+                display_intro=False,
+            )
+        
+        # Show normal configuration for current profile
+        display_intro = flask_util.BrowsingDataProvider.instance().get_and_unset_is_first_display(
+            flask_util.BrowsingDataProvider.get_distribution_key(
+                models.get_distribution(),
+                flask_util.BrowsingDataProvider.CONFIGURATION,
+            )
+        )
+        display_config = interfaces_util.get_edited_config()
+        enabled_exchanges = trading_api.get_enabled_exchanges_names(display_config)
+        config_symbols = models.get_enabled_trading_pairs()
+        first_symbol_pair = next(iter(config_symbols)) if config_symbols else []
+        config_exchanges = models.get_json_exchange_config(display_config)
+        trading_mode = models.get_config_activated_trading_mode()
+        media_url = flask.url_for("tentacle_media", _external=True)
+        tentacle_docs = ""
+        trading_mode_name = trading_mode.get_name() if trading_mode else "Missing trading mode"
+        if trading_mode:
+            tentacle_docs = models.get_tentacle_documentation(trading_mode.get_name(), media_url)
+        return flask.render_template(
+            'distributions/prediction_market/configuration.html',
+            show_profile_switch=False,
+            selected_exchange=enabled_exchanges[0] if enabled_exchanges else (config_exchanges[0][models.NAME] if config_exchanges else None),
+            config_exchanges=config_exchanges,
+            exchanges_schema=models.get_json_exchanges_schema(models.get_tested_exchange_list(), enums.ExchangeConnectionType.WALLET),
+
+            selected_pair=first_symbol_pair,
+            trading_mode_name=trading_mode_name,
+            tentacle_docs=tentacle_docs,
+
+            simulated_portfolio=models.get_json_simulated_portfolio(display_config),
+            portfolio_schema=models.JSON_PORTFOLIO_SCHEMA,
+            trading_simulator_schema=models.JSON_TRADING_SIMULATOR_SCHEMA,
+            config_trading_simulator=models.get_json_trading_simulator_config(display_config),
+            reference_market=interfaces_util.get_reference_market(),
+
+            current_profile_id=current_profile.profile_id,
+            display_intro=display_intro,
+        )
+
+    @blueprint.route('/interfaces')
+    @login.login_required_when_activated
+    def interfaces():
+        display_config = interfaces_util.get_edited_config()
+
+        # service lists
+        service_list = models_prediction_market.get_prediction_market_services()
+        services_config = {
+            service: config
+            for service, config in display_config[services_constants.CONFIG_CATEGORY_SERVICES].items()
+            if service in service_list
+        }
+        notifiers_list = models.get_notifiers_list()
+
+        return flask.render_template(
+            'distributions/prediction_market/interfaces.html',
+            config_notifications=display_config[
+             services_constants.CONFIG_CATEGORY_NOTIFICATION],
+            config_services=services_config,
+            services_list=service_list,
+            notifiers_list=notifiers_list,
+        )
+
+
+
+    @blueprint.route('/interface_config', methods=['POST'])
+    @login.login_required_when_activated
+    def interface_config():
+        next_url = flask.request.args.get("next", None)
+        request_data = flask.request.get_json()
+        success = True
+        response = ""
+        err_message = ""
+
+        if request_data:
+            # remove elements from global config if any to remove
+            removed_elements_key = "removed_elements"
+            if removed_elements_key in request_data and request_data[removed_elements_key]:
+                update_success, err_message = models.update_global_config(request_data[removed_elements_key], delete=True)
+                success = success and update_success
+            else:
+                request_data[removed_elements_key] = ""
+
+            # update global config if required
+            if constants.GLOBAL_CONFIG_KEY in request_data and request_data[constants.GLOBAL_CONFIG_KEY]:
+                success, err_message = models.update_global_config(request_data[constants.GLOBAL_CONFIG_KEY])
+            else:
+                request_data[constants.GLOBAL_CONFIG_KEY] = ""
+
+            response = {
+                "global_updated_config": request_data[constants.GLOBAL_CONFIG_KEY],
+                removed_elements_key: request_data[removed_elements_key]
+            }
+
+        if success:
+            if request_data.get("restart_after_save", False):
+                models.schedule_delayed_command(models.restart_bot)
+            if next_url is not None:
+                return flask.redirect(next_url)
+            return util.get_rest_reply(flask.jsonify(response))
+        else:
+            return util.get_rest_reply(flask.jsonify(err_message), 500)
+
+    @blueprint.route('/configuration', methods=['POST'])
+    @login.login_required_when_activated
+    def save_prediction_market_config():
+        request_data = flask.request.get_json()
+        success = False
+        response = "Restart to apply."
+        err_message = None
+        try:
+            models_prediction_market.save_prediction_market_configuration(
+                request_data["exchange"],
+                request_data["tradingPair"],
+                request_data["exchangesConfig"],
+                request_data["tradingSimulatorConfig"],
+                request_data["simulatedPortfolioConfig"],
+                request_data["tradingModeName"],
+                request_data["tradingModeConfig"],
+            )
+            success = True
+        except Exception as e:
+            err_message = f"Failed to save prediction market configuration: {e.__class__.__name__}: {e}"
+            commons_logging.get_logger("save_prediction_market_config").exception(
+                e, True, f"{err_message} ({e.__class__.__name__})"
+            )
+        if success:
+            return util.get_rest_reply(flask.jsonify(response))
+        else:
+            return util.get_rest_reply(flask.jsonify(err_message), 500)
+
+    @blueprint.route('/profile')
+    @login.login_required_when_activated
+    def profile():
+        selected_profile = flask.request.args.get("select", None)
+        next_url = flask.request.args.get("next", flask.url_for('configuration'))
+        if selected_profile is not None and selected_profile != models.get_current_profile().profile_id:
+            models.select_profile(selected_profile)
+            current_profile = models.get_current_profile()
+            flask.flash(
+                f"Selected the {current_profile.name} profile", "success"
+            )
+        return flask.redirect(next_url)
diff --git a/packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/prediction_market/dashboard.py b/packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/prediction_market/dashboard.py
new file mode 100644
index 0000000000..b5f3ed787a
--- /dev/null
+++ b/packages/tentacles/Services/Interfaces/web_interface/controllers/distributions/prediction_market/dashboard.py
@@ -0,0 +1,65 @@
+#  Drakkar-Software OctoBot-Interfaces
+#  Copyright (c) Drakkar-Software, All rights reserved.
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library.
+import flask
+
+import octobot_commons.authentication as authentication
+import octobot_services.interfaces.util as interfaces_util
+import tentacles.Services.Interfaces.web_interface.login as login
+import tentacles.Services.Interfaces.web_interface.models as models
+import tentacles.Services.Interfaces.web_interface.flask_util as flask_util
+import octobot.constants as constants
+import octobot_commons.constants
+import octobot_commons.enums
+
+
+def register(blueprint):
+    @blueprint.route("/")
+    @blueprint.route("/home")
+    @login.login_required_when_activated
+    def home():
+        if flask.request.args.get("reset_tutorials", "False").lower() == "true":
+            flask_util.BrowsingDataProvider.instance().set_first_displays(True)
+        if models.accepted_terms():
+            display_intro = flask_util.BrowsingDataProvider.instance().get_and_unset_is_first_display(
+                flask_util.BrowsingDataProvider.get_distribution_key(
+                    models.get_distribution(),
+                    flask_util.BrowsingDataProvider.HOME,
+                )
+            )
+            all_time_frames = models.get_all_watched_time_frames()
+            display_time_frame = models.get_display_timeframe()
+            display_orders = models.get_display_orders()
+            sandbox_exchanges = models.get_sandbox_exchanges()
+            reference_market = interfaces_util.get_reference_market()
+            might_have_positions = models.has_futures_exchange()
+            return flask.render_template(
+                'distributions/prediction_market/dashboard.html',
+                display_intro=display_intro,
+                reference_unit=reference_market,
+                reference_market=reference_market,
+                display_time_frame=display_time_frame,
+                display_orders=display_orders,
+                all_time_frames=all_time_frames,
+                sandbox_exchanges=sandbox_exchanges,
+                might_have_positions=might_have_positions,
+            )
+        else:
+            return flask.redirect(flask.url_for("terms"))
+
+    @blueprint.route("/welcome")
+    def welcome():
+        # used in terms page
+        return flask.redirect(flask.url_for("home"))
diff --git a/packages/tentacles/Services/Interfaces/web_interface/enums.py b/packages/tentacles/Services/Interfaces/web_interface/enums.py
index 6a17b69323..f9ed58938c 100644
--- a/packages/tentacles/Services/Interfaces/web_interface/enums.py
+++ b/packages/tentacles/Services/Interfaces/web_interface/enums.py
@@ -34,3 +34,7 @@ class ColorModes(enum.Enum):
     LIGHT = "light"
     DARK = "dark"
     DEFAULT = "light"
+
+class ExchangeConnectionType(enum.Enum):
+    API_KEY = "api_key"
+    WALLET = "wallet"
diff --git a/packages/tentacles/Services/Interfaces/web_interface/flask_util/browsing_data_provider.py b/packages/tentacles/Services/Interfaces/web_interface/flask_util/browsing_data_provider.py
index 3755862d32..fdd516d806 100644
--- a/packages/tentacles/Services/Interfaces/web_interface/flask_util/browsing_data_provider.py
+++ b/packages/tentacles/Services/Interfaces/web_interface/flask_util/browsing_data_provider.py
@@ -31,6 +31,7 @@
 _PREFIX_BY_DISTRIBUTION = {
     octobot.enums.OctoBotDistribution.DEFAULT.value: "",
     octobot.enums.OctoBotDistribution.MARKET_MAKING.value: "mm:",
+    octobot.enums.OctoBotDistribution.PREDICTION_MARKET.value: "pm:",
 }
 
 
diff --git a/packages/tentacles/Services/Interfaces/web_interface/models/configuration.py b/packages/tentacles/Services/Interfaces/web_interface/models/configuration.py
index 3608b6c466..b2b5f315ac 100644
--- a/packages/tentacles/Services/Interfaces/web_interface/models/configuration.py
+++ b/packages/tentacles/Services/Interfaces/web_interface/models/configuration.py
@@ -44,10 +44,12 @@
 import octobot_commons.enums as commons_enums
 import octobot_commons.databases as commons_databases
 import octobot_commons.configuration as configuration
+import octobot_commons.dict_util as dict_util
 import octobot_commons.tentacles_management as tentacles_management
 import octobot_commons.time_frame_manager as time_frame_manager
 import octobot_commons.authentication as authentication
 import octobot_commons.symbols as commons_symbols
+import octobot_commons.symbols as symbol_utils
 import octobot_commons.display as display
 import octobot_commons.errors as commons_errors
 import octobot_commons.aiohttp_util as aiohttp_util
@@ -61,6 +63,8 @@
 import octobot.databases_util as octobot_databases_util
 import tentacles.Services.Interfaces.web_interface.constants as constants
 import tentacles.Services.Interfaces.web_interface.models as models
+import tentacles.Services.Interfaces.web_interface.models.json_schemas as json_schemas
+import tentacles.Services.Interfaces.web_interface.models.trading as models_trading
 import tentacles.Services.Interfaces.web_interface.plugins as web_plugins
 
 NAME_KEY = "name"
@@ -696,7 +700,8 @@ def get_config_activated_evaluators(tentacles_setup_config=None):
 
 def has_futures_exchange():
     for exchange_manager in get_live_trading_enabled_exchange_managers():
-        if trading_api.get_exchange_type(exchange_manager) is trading_enums.ExchangeTypes.FUTURE:
+        exchange_type = trading_api.get_exchange_type(exchange_manager)
+        if exchange_type is trading_enums.ExchangeTypes.FUTURE or exchange_type is trading_enums.ExchangeTypes.OPTION:
             return True
     return False
 
@@ -1555,4 +1560,148 @@ def get_live_trading_enabled_exchange_managers():
         for exchange_manager in trading_api.get_exchange_managers_from_exchange_ids(trading_api.get_exchange_ids())
         if not trading_api.get_is_backtesting(exchange_manager)
         and trading_api.is_trader_existing_and_enabled(exchange_manager)
-    ]
\ No newline at end of file
+    ]
+
+
+def save_distribution_configuration(
+    trading_mode_name: str,
+    trading_mode_configuration: dict,
+    enabled_exchange: typing.Optional[str],
+    trading_pair: typing.Optional[str],
+    exchange_configurations: list[dict],
+    trading_simulator_configuration: dict,
+    simulated_portfolio_configuration: list[dict],
+    exchanges_to_enable: typing.Optional[list[str]] = None,
+) -> None:
+    _save_distribution_tentacle_config(trading_mode_name, trading_mode_configuration)
+    _save_distribution_user_config(
+        enabled_exchange, trading_pair, exchange_configurations,
+        trading_simulator_configuration, simulated_portfolio_configuration,
+        exchanges_to_enable,
+    )
+
+
+def _save_distribution_user_config(
+    enabled_exchange: typing.Optional[str],
+    trading_pair: typing.Optional[str],
+    exchange_configurations: list[dict],
+    trading_simulator_configuration: dict,
+    simulated_portfolio_configuration: list[dict],
+    exchanges_to_enable: typing.Optional[list[str]] = None,
+) -> None:
+    current_edited_config = interfaces_util.get_edited_config(dict_only=False)
+
+    # exchanges: regenerate the whole configuration
+    exchange_config_update = json_schemas.json_exchange_config_to_config(
+        exchange_configurations, False
+    )
+    if exchange_config_update and enabled_exchange not in exchange_config_update:
+        # removed enabled exchange from exchange configs: use 1st exchange instead
+        enabled_exchange = next(iter(exchange_config_update))
+
+    # Determine which exchanges to enable
+    if exchanges_to_enable is None:
+        exchanges_to_enable = [enabled_exchange] if enabled_exchange else []
+    
+    for exchange in exchanges_to_enable:
+        if exchange and exchange in exchange_config_update:
+            # only enable selected exchanges, force spot trading
+            exchange_config_update[exchange].update({
+                commons_constants.CONFIG_ENABLED_OPTION: True,
+                commons_constants.CONFIG_EXCHANGE_TYPE: commons_constants.CONFIG_EXCHANGE_SPOT,
+            })
+    
+    current_exchanges_config = copy.deepcopy(current_edited_config.config[commons_constants.CONFIG_EXCHANGES])
+    # nested_update_dict to keep nested key/val that might have been in previous config but are not in update
+    # don't pass current_exchanges_config directly to really delete exchanges
+    updated_exchange_config = {
+        exchange: exchange_config
+        for exchange, exchange_config in current_exchanges_config.items()
+        if exchange in exchange_config_update
+    }
+    dict_util.nested_update_dict(updated_exchange_config, exchange_config_update)
+
+    # currencies: regenerate the whole configuration
+    updated_currencies_config = {
+        trading_pair: {
+            commons_constants.CONFIG_ENABLED_OPTION: True,
+            commons_constants.CONFIG_CRYPTO_PAIRS: [trading_pair]
+        }
+    } if trading_pair else {}
+
+    # trader simulator
+    simulated_enabled = trading_simulator_configuration[commons_constants.CONFIG_ENABLED_OPTION]
+    updated_simulator_config = copy.deepcopy(current_edited_config.config[commons_constants.CONFIG_SIMULATOR])
+    previous_simulated_portfolio = copy.deepcopy(
+        updated_simulator_config.get(commons_constants.CONFIG_STARTING_PORTFOLIO)
+    )
+    simulator_config_update = {
+        **trading_simulator_configuration, **{
+            commons_constants.CONFIG_STARTING_PORTFOLIO: json_schemas.json_simulated_portfolio_to_config(
+                simulated_portfolio_configuration
+            )
+        }
+    }
+    updated_portfolio = simulator_config_update[commons_constants.CONFIG_STARTING_PORTFOLIO]
+    changed_portfolio = _filter_distribution_0_values(previous_simulated_portfolio) != _filter_distribution_0_values(updated_portfolio)
+    # replace portfolio to allow asset removal (otherwise nested_update_dict will never remove assets)
+    updated_simulator_config[commons_constants.CONFIG_STARTING_PORTFOLIO] = updated_portfolio
+    dict_util.nested_update_dict(updated_simulator_config, simulator_config_update)
+
+    # real trader
+    updated_trader_config = copy.deepcopy(current_edited_config.config[commons_constants.CONFIG_TRADER])
+    # only update the "enabled" state
+    updated_trader_config[commons_constants.CONFIG_ENABLED_OPTION] = not simulated_enabled
+
+    # trading
+    updated_trading_config = copy.deepcopy(current_edited_config.config[commons_constants.CONFIG_TRADING])
+    if trading_pair:
+        # only update the reference market
+        updated_trading_config[commons_constants.CONFIG_TRADER_REFERENCE_MARKET] = (
+            symbol_utils.parse_symbol(trading_pair).quote
+        )
+
+    update = {
+        commons_constants.CONFIG_CRYPTO_CURRENCIES: updated_currencies_config,
+        commons_constants.CONFIG_EXCHANGES: updated_exchange_config,
+        commons_constants.CONFIG_TRADING: updated_trading_config,
+        commons_constants.CONFIG_TRADER: updated_trader_config,
+        commons_constants.CONFIG_SIMULATOR: updated_simulator_config,
+    }
+    # apply & save changes
+    current_edited_config.config.update(update)
+    current_edited_config.save()
+    _get_distribution_logger().info(
+        f"Configuration updated. Current profile: {current_edited_config.profile.name}"
+    )
+    if changed_portfolio:
+        _get_distribution_logger().info("Simulated portfolio changed: resetting simulated portfolio content.")
+        models_trading.clear_exchanges_portfolio_history(simulated_only=True)
+
+
+def _save_distribution_tentacle_config(
+    trading_mode_name: str,
+    trading_mode_configuration: dict,
+) -> None:
+    tentacle_class = tentacles_manager_api.get_tentacle_class_from_string(trading_mode_name)
+    tentacles_manager_api.update_tentacle_config(
+        interfaces_util.get_edited_tentacles_config(),
+        tentacle_class,
+        trading_mode_configuration,
+        keep_existing=False,
+    )
+    _get_distribution_logger().info(
+        f"{trading_mode_name} configuration updated."
+    )
+
+
+def _filter_distribution_0_values(elements: dict) -> dict:
+    return {
+        key: val
+        for key, val in elements.items()
+        if val
+    }
+
+
+def _get_distribution_logger():
+    return bot_logging.get_logger("DistributionConfigurationModel")
diff --git a/packages/tentacles/Services/Interfaces/web_interface/models/distributions/__init__.py b/packages/tentacles/Services/Interfaces/web_interface/models/distributions/__init__.py
index c4d9b52fdb..e0b4f6a83f 100644
--- a/packages/tentacles/Services/Interfaces/web_interface/models/distributions/__init__.py
+++ b/packages/tentacles/Services/Interfaces/web_interface/models/distributions/__init__.py
@@ -15,13 +15,20 @@
 #  License along with this library.
 
 from tentacles.Services.Interfaces.web_interface.models.distributions import market_making
+from tentacles.Services.Interfaces.web_interface.models.distributions import prediction_market
 
 from tentacles.Services.Interfaces.web_interface.models.distributions.market_making import (
     save_market_making_configuration,
     get_market_making_services,
 )
+from tentacles.Services.Interfaces.web_interface.models.distributions.prediction_market import (
+    save_prediction_market_configuration,
+    get_prediction_market_services,
+)
 
 __all__ = [
     "save_market_making_configuration",
     "get_market_making_services",
+    "save_prediction_market_configuration",
+    "get_prediction_market_services",
 ]
diff --git a/packages/tentacles/Services/Interfaces/web_interface/models/distributions/market_making/configuration.py b/packages/tentacles/Services/Interfaces/web_interface/models/distributions/market_making/configuration.py
index 374ab70922..b2f10ac053 100644
--- a/packages/tentacles/Services/Interfaces/web_interface/models/distributions/market_making/configuration.py
+++ b/packages/tentacles/Services/Interfaces/web_interface/models/distributions/market_making/configuration.py
@@ -13,23 +13,12 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library.
-import copy
 import typing
 
-import octobot_commons.constants as commons_constants
-import octobot_commons.symbols as symbol_utils
-import octobot_commons.dict_util as dict_util
-import octobot_commons.logging as commons_logging
-import octobot_services.interfaces.util as interfaces_util
-import octobot_tentacles_manager.api
-
-import tentacles.Services.Interfaces.web_interface.models.json_schemas as json_schemas
 import tentacles.Services.Interfaces.web_interface.models.configuration as models_configuration
-import tentacles.Services.Interfaces.web_interface.models.trading as models_trading
 import tentacles.Trading.Mode.market_making_trading_mode.market_making_trading as market_making_trading
 
 
-_LOGGER_NAME = "MMConfigurationModel"
 _MM_SERVICES = [
     "telegram", "web"
 ]
@@ -43,13 +32,24 @@ def save_market_making_configuration(
     trading_mode_name: str,
     trading_mode_configuration: dict,
 ) -> None:
-    _save_tentacle_config(trading_mode_name, trading_mode_configuration)
     reference_exchange = trading_mode_configuration.get(
         market_making_trading.MarketMakingTradingMode.REFERENCE_EXCHANGE
     )
-    _save_user_config(
-        enabled_exchange, reference_exchange, trading_pair, exchange_configurations,
-        trading_simulator_configuration, simulated_portfolio_configuration,
+    exchanges_to_enable = [
+        exchange
+        for exchange in (enabled_exchange, reference_exchange)
+        if exchange and exchange != market_making_trading.MarketMakingTradingMode.LOCAL_EXCHANGE_PRICE
+    ]
+    
+    models_configuration.save_distribution_configuration(
+        trading_mode_name=trading_mode_name,
+        trading_mode_configuration=trading_mode_configuration,
+        enabled_exchange=enabled_exchange,
+        trading_pair=trading_pair,
+        exchange_configurations=exchange_configurations,
+        trading_simulator_configuration=trading_simulator_configuration,
+        simulated_portfolio_configuration=simulated_portfolio_configuration,
+        exchanges_to_enable=exchanges_to_enable,
     )
 
 
@@ -59,128 +59,3 @@ def get_market_making_services() -> dict:
         for name, service in models_configuration.get_services_list().items()
         if name in _MM_SERVICES
     }
-
-
-def _save_user_config(
-    enabled_exchange: typing.Optional[str],
-    reference_exchange: typing.Optional[str],
-    trading_pair: typing.Optional[str],
-    exchange_configurations: list[dict],
-    trading_simulator_configuration: dict,
-    simulated_portfolio_configuration: list[dict],
-) -> None:
-    current_edited_config = interfaces_util.get_edited_config(dict_only=False)
-
-    # exchanges: regenerate the whole configuration
-    exchange_config_update = json_schemas.json_exchange_config_to_config(
-        exchange_configurations, False
-    )
-    if exchange_config_update and enabled_exchange not in exchange_config_update:
-        # removed enabled exchange from exchange configs: use 1st exchange instead
-        enabled_exchange = next(iter(exchange_config_update))
-
-    for exchange in (enabled_exchange, reference_exchange):
-        if (
-            exchange
-            and exchange != market_making_trading.MarketMakingTradingMode.LOCAL_EXCHANGE_PRICE
-            and exchange in exchange_config_update
-        ):
-            # only enable selected exchange and reference exchanges, force spot trading
-            exchange_config_update[exchange].update({
-                commons_constants.CONFIG_ENABLED_OPTION: True,
-                commons_constants.CONFIG_EXCHANGE_TYPE: commons_constants.CONFIG_EXCHANGE_SPOT,
-            })
-    current_exchanges_config = copy.deepcopy(current_edited_config.config[commons_constants.CONFIG_EXCHANGES])
-    # nested_update_dict to keep nested key/val that might have been in previous config but are not in update
-    # don't pass current_exchanges_config directly to really delete exchanges
-    updated_exchange_config = {
-        exchange: exchange_config
-        for exchange, exchange_config in current_exchanges_config.items()
-        if exchange in exchange_config_update
-    }
-    dict_util.nested_update_dict(updated_exchange_config, exchange_config_update)
-
-    # currencies: regenerate the whole configuration
-    updated_currencies_config = {
-        trading_pair: {
-            commons_constants.CONFIG_ENABLED_OPTION: True,
-            commons_constants.CONFIG_CRYPTO_PAIRS: [trading_pair]
-        }
-    } if trading_pair else {}
-
-    # trader simulator
-    simulated_enabled = trading_simulator_configuration[commons_constants.CONFIG_ENABLED_OPTION]
-    updated_simulator_config = copy.deepcopy(current_edited_config.config[commons_constants.CONFIG_SIMULATOR])
-    previous_simulated_portfolio = copy.deepcopy(
-        updated_simulator_config.get(commons_constants.CONFIG_STARTING_PORTFOLIO)
-    )
-    simulator_config_update = {
-        **trading_simulator_configuration, **{
-            commons_constants.CONFIG_STARTING_PORTFOLIO: json_schemas.json_simulated_portfolio_to_config(
-                simulated_portfolio_configuration
-            )
-        }
-    }
-    updated_portfolio = simulator_config_update[commons_constants.CONFIG_STARTING_PORTFOLIO]
-    changed_portfolio = _filter_0_values(previous_simulated_portfolio) != _filter_0_values(updated_portfolio)
-    # replace portfolio to allow asset removal (otherwise nested_update_dict will never remove assets)
-    updated_simulator_config[commons_constants.CONFIG_STARTING_PORTFOLIO] = updated_portfolio
-    dict_util.nested_update_dict(updated_simulator_config, simulator_config_update)
-
-    # real trader
-    updated_trader_config = copy.deepcopy(current_edited_config.config[commons_constants.CONFIG_TRADER])
-    # only update the "enabled" state
-    updated_trader_config[commons_constants.CONFIG_ENABLED_OPTION] = not simulated_enabled
-
-    # trading
-    updated_trading_config = copy.deepcopy(current_edited_config.config[commons_constants.CONFIG_TRADING])
-    if trading_pair:
-        # only update the reference market
-        updated_trading_config[commons_constants.CONFIG_TRADER_REFERENCE_MARKET] = (
-            symbol_utils.parse_symbol(trading_pair).quote
-        )
-
-    update = {
-        commons_constants.CONFIG_CRYPTO_CURRENCIES: updated_currencies_config,
-        commons_constants.CONFIG_EXCHANGES: updated_exchange_config,
-        commons_constants.CONFIG_TRADING: updated_trading_config,
-        commons_constants.CONFIG_TRADER: updated_trader_config,
-        commons_constants.CONFIG_SIMULATOR: updated_simulator_config,
-    }
-    # apply & save changes
-    current_edited_config.config.update(update)
-    current_edited_config.save()
-    _get_logger().info(
-        f"Configuration updated. Current profile: {current_edited_config.profile.name}"
-    )
-    if changed_portfolio:
-        _get_logger().info("Simulated portfolio changed: resetting simulated portfolio content.")
-        models_trading.clear_exchanges_portfolio_history(simulated_only=True)
-
-
-def _filter_0_values(elements: dict) -> dict:
-    return {
-        key: val
-        for key, val in elements.items()
-        if val
-    }
-
-
-def _save_tentacle_config(
-    trading_mode_name: str,
-    trading_mode_configuration: dict,
-) -> None:
-    tentacle_class = octobot_tentacles_manager.api.get_tentacle_class_from_string(trading_mode_name)
-    octobot_tentacles_manager.api.update_tentacle_config(
-        interfaces_util.get_edited_tentacles_config(),
-        tentacle_class,
-        trading_mode_configuration,
-        keep_existing=False,
-    )
-    _get_logger().info(
-        f"{trading_mode_name} configuration updated."
-    )
-
-
-def _get_logger():
-    return commons_logging.get_logger(_LOGGER_NAME)
diff --git a/packages/tentacles/Services/Interfaces/web_interface/models/distributions/prediction_market/__init__.py b/packages/tentacles/Services/Interfaces/web_interface/models/distributions/prediction_market/__init__.py
new file mode 100644
index 0000000000..c9e54e61a6
--- /dev/null
+++ b/packages/tentacles/Services/Interfaces/web_interface/models/distributions/prediction_market/__init__.py
@@ -0,0 +1,27 @@
+#  Drakkar-Software OctoBot-Interfaces
+#  Copyright (c) Drakkar-Software, All rights reserved.
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library.
+
+from tentacles.Services.Interfaces.web_interface.models.distributions.prediction_market import configuration
+
+from tentacles.Services.Interfaces.web_interface.models.distributions.prediction_market.configuration import (
+    save_prediction_market_configuration,
+    get_prediction_market_services,
+)
+
+__all__ = [
+    "save_prediction_market_configuration",
+    "get_prediction_market_services",
+]
diff --git a/packages/tentacles/Services/Interfaces/web_interface/models/distributions/prediction_market/configuration.py b/packages/tentacles/Services/Interfaces/web_interface/models/distributions/prediction_market/configuration.py
new file mode 100644
index 0000000000..c5d6f307da
--- /dev/null
+++ b/packages/tentacles/Services/Interfaces/web_interface/models/distributions/prediction_market/configuration.py
@@ -0,0 +1,50 @@
+#  Drakkar-Software OctoBot-Interfaces
+#  Copyright (c) Drakkar-Software, All rights reserved.
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library.
+import typing
+
+import tentacles.Services.Interfaces.web_interface.models.configuration as models_configuration
+
+
+_PM_SERVICES = [
+    "telegram", "web"
+]
+
+def save_prediction_market_configuration(
+    enabled_exchange: str,
+    trading_pair: typing.Optional[str],
+    exchange_configurations: list[dict],
+    trading_simulator_configuration: dict,
+    simulated_portfolio_configuration: list[dict],
+    trading_mode_name: str,
+    trading_mode_configuration: dict,
+) -> None:
+    models_configuration.save_distribution_configuration(
+        trading_mode_name=trading_mode_name,
+        trading_mode_configuration=trading_mode_configuration,
+        enabled_exchange=enabled_exchange,
+        trading_pair=trading_pair,
+        exchange_configurations=exchange_configurations,
+        trading_simulator_configuration=trading_simulator_configuration,
+        simulated_portfolio_configuration=simulated_portfolio_configuration,
+    )
+
+
+def get_prediction_market_services() -> dict:
+    return {
+        name: service
+        for name, service in models_configuration.get_services_list().items()
+        if name in _PM_SERVICES
+    }
diff --git a/packages/tentacles/Services/Interfaces/web_interface/models/json_schemas.py b/packages/tentacles/Services/Interfaces/web_interface/models/json_schemas.py
index efdcdd5c19..9cccda475a 100644
--- a/packages/tentacles/Services/Interfaces/web_interface/models/json_schemas.py
+++ b/packages/tentacles/Services/Interfaces/web_interface/models/json_schemas.py
@@ -16,6 +16,7 @@
 import octobot_commons.constants as commons_constants
 import octobot_commons.configuration as configuration
 
+import tentacles.Services.Interfaces.web_interface.enums as enums
 
 ASSET = "asset"
 VALUE = "value"
@@ -116,7 +117,23 @@ def get_json_trading_simulator_config(user_config: dict) -> dict:
     }
 
 
-def get_json_exchanges_schema(exchanges: list[str]) -> dict:
+CONNECTION_TYPE_EXCHANGE_FIELDS = {
+    enums.ExchangeConnectionType.API_KEY: {
+        "api_key_title": "API key: your API key for this exchange",
+        "api_secret_title": "API secret: your API secret for this exchange",
+        "api_password_title": "API password: leave empty if not required by exchange",
+    },
+    enums.ExchangeConnectionType.WALLET: {
+        "api_key_title": "Funds Wallet address",
+        "api_secret_title": "Funds Wallet private key",
+        "api_password_title": "API wallet address : only provide if authenticated with email",
+    }
+}
+
+
+def get_json_exchanges_schema(exchanges: list[str], connection_type: enums.ExchangeConnectionType = enums.ExchangeConnectionType.API_KEY) -> dict:
+    field_config = CONNECTION_TYPE_EXCHANGE_FIELDS.get(connection_type, CONNECTION_TYPE_EXCHANGE_FIELDS[enums.ExchangeConnectionType.API_KEY])
+
     return {
         "type": "array",
         "uniqueItems": True,
@@ -136,19 +153,19 @@ def get_json_exchanges_schema(exchanges: list[str]) -> dict:
                     "propertyOrder": 1,
                 },
                 API_KEY: {
-                    "title": "API key: your API key for this exchange",
+                    "title": field_config["api_key_title"],
                     "type": "string",
                     "minLength": 0,
                     "propertyOrder": 2,
                 },
                 API_SECRET: {
-                    "title": "API secret: your API secret for this exchange",
+                    "title": field_config["api_secret_title"],
                     "type": "string",
                     "minLength": 0,
                     "propertyOrder": 3,
                 },
                 API_PASSWORD: {
-                    "title": "API password: leave empty if not required by exchange",
+                    "title": field_config["api_password_title"],
                     "type": "string",
                     "minLength": 0,
                     "propertyOrder": 4,
diff --git a/packages/tentacles/Services/Interfaces/web_interface/static/distributions/prediction_market/js/configuration.js b/packages/tentacles/Services/Interfaces/web_interface/static/distributions/prediction_market/js/configuration.js
new file mode 100644
index 0000000000..8acc379e32
--- /dev/null
+++ b/packages/tentacles/Services/Interfaces/web_interface/static/distributions/prediction_market/js/configuration.js
@@ -0,0 +1,307 @@
+/*
+ * Drakkar-Software OctoBot
+ * Copyright (c) Drakkar-Software, All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.
+ */
+
+
+$(document).ready(function() {
+    const saveConfig = async (saveUrl) => {
+        try {
+            validateConfig();
+            const updatedConfig = getConfigUpdate();
+            const resp = await async_send_and_interpret_bot_update(updatedConfig, saveUrl, null);
+            create_alert("success", "Configuration saved", resp);
+            lastSavedConfig = updatedConfig
+            configEditor.validate()
+        } catch (error) {
+            create_alert("error", "Impossible to save config", error)
+        }
+    }
+
+    const refreshPortfolioEditor = (currencies) => {
+        const editorDiv = $("#simulated-portfolio-editor");
+        let value = editorDiv.data("config");
+        if(typeof value === "undefined"){
+            return
+        }
+        const schema = editorDiv.data("schema");
+        if(simulatedPortfolioEditor !== undefined) {
+            value = simulatedPortfolioEditor.getValue();
+            simulatedPortfolioEditor.destroy();
+        }
+        const referenceMarket = editorDiv.data("reference-market");
+        let currenciesList = Array.isArray(currencies) ? [...currencies] : [];
+        if (referenceMarket && currenciesList.indexOf(referenceMarket) === -1) {
+            currenciesList.push(referenceMarket);
+        }
+        value.forEach((val) => {
+            if (val && val.asset && currenciesList.indexOf(val.asset) === -1) {
+                currenciesList.push(val.asset);
+            }
+        })
+        if (currenciesList.length) {
+            schema.items.properties.asset.enum = currenciesList.sort();
+        }
+        simulatedPortfolioEditor = new JSONEditor(editorDiv[0],{
+            schema: schema,
+            startval: value,
+            no_additional_properties: true,
+            prompt_before_delete: true,
+            disable_array_reorder: true,
+            disable_array_delete: false,
+            disable_array_delete_last_row: true,
+            disable_array_delete_all_rows: true,
+            disable_collapse: true,
+            disable_edit_json: true,
+            disable_properties: true,
+        })
+        simulatedPortfolioEditor.on('ready', () => {
+            readyEditors.portfolio = true
+            initLastSavedConfig();
+        })
+    }
+
+    const refreshTradingSimulatorEditor = () => {
+        const editorDiv = $("#trading-simulator-editor");
+        let value = editorDiv.data("config");
+        if(typeof value === "undefined"){
+            return
+        }
+        const schema = editorDiv.data("schema");
+        if(tradingSimulatorEditor !== undefined) {
+            value = tradingSimulatorEditor.getValue();
+            tradingSimulatorEditor.destroy();
+        }
+        schema.options = {
+            titleHidden: true
+        }
+        tradingSimulatorEditor = new JSONEditor(editorDiv[0],{
+            schema: schema,
+            startval: value,
+            disable_collapse: true,
+            disable_edit_json: true,
+            disable_properties: true,
+        })
+        tradingSimulatorEditor.on('ready', () => {
+            readyEditors.simulator = true
+            initLastSavedConfig();
+        })
+    }
+
+    const refreshExchangesEditor = () => {
+        const editorDiv = $("#exchanges-editor");
+        let value = editorDiv.data("config");
+        if(typeof value === "undefined"){
+            return
+        }
+        const schema = editorDiv.data("schema");
+        if(exchangesEditor !== undefined) {
+            exchangesEditor.destroy();
+        }
+        schema.options = {
+            titleHidden: true
+        }
+        const selectableExchanges = schema.items.properties.name.enum;
+        value.forEach((val) => {
+            if(selectableExchanges.indexOf(val.name) === -1){
+                selectableExchanges.push(val.name)
+            }
+        })
+        schema.id="exchangesConfig"
+        exchangesEditor = new JSONEditor(editorDiv[0],{
+            schema: schema,
+            startval: value,
+            no_additional_properties: true,
+            prompt_before_delete: true,
+            disable_array_reorder: true,
+            disable_array_delete: false,
+            disable_array_delete_last_row: true,
+            disable_array_delete_all_rows: true,
+            disable_collapse: true,
+            disable_edit_json: true,
+            disable_properties: true,
+        })
+    }
+
+    const addCustomValidator = () => {
+        // Custom validators must return an array of errors or an empty array if valid
+        JSONEditor.defaults.custom_validators.push((schema, value, path) => {
+            const errors = [];
+            if (schema.id === "exchangesConfig" && path === "root") {
+                const newNames = value.map(value => value.name);
+                const duplicates = newNames.filter(
+                    (value, index) => newNames.indexOf(value) !== index && newNames.lastIndexOf(value) === index
+                );
+                if (duplicates.length) {
+                    // Errors must be an object with `path`, `property`, and `message`
+                    errors.push({
+                        path: path,
+                        property: '',
+                        message: `Each exchanges can only be listed once. Exchanges listed more than once: ${duplicates}.`
+                    });
+                }
+            }
+            return errors;
+        });
+    }
+
+    const getSelectableExchange = () => {
+        if(exchangesEditor === undefined){
+            return []
+        }
+        return exchangesEditor.getValue().map(value => value.name)
+    }
+
+    const getTradingModeName = () => {
+        return $("#trading-mode-config-editor").data("trading-mode-name")
+    }
+
+    const validateConfig = () => {
+        const tradingModeConfig = normalizeTradingModeConfig();
+        normalizeSimulatedPortfolioConfig();
+        [configEditor, tradingSimulatorEditor, simulatedPortfolioEditor, exchangesEditor].forEach((editor) => {
+            if (editor === undefined) {
+                throw "Editors are loading"
+            }
+            let errors = editor.validate();
+            if (editor === configEditor && errors.length) {
+                const optionalNumberKeys = new Set([
+                    "min_unrealized_pnl_percent",
+                    "max_unrealized_pnl_percent",
+                    "min_mark_price",
+                    "max_mark_price",
+                ]);
+                errors = errors.filter((err) => {
+                    const key = err.path.replace("root.", "");
+                    return !(optionalNumberKeys.has(key) && !(key in tradingModeConfig));
+                });
+            }
+            if (errors.length) {
+                throw JSON.stringify(errors.map(
+                    err => `${err.path.replace('root.', '')}: ${err.message}`
+                ).join(", "))
+            }
+        });
+    }
+
+    const normalizeTradingModeConfig = () => {
+        const tradingModeConfig = configEditor.getValue();
+        [
+            "min_unrealized_pnl_percent",
+            "max_unrealized_pnl_percent",
+            "min_mark_price",
+            "max_mark_price",
+        ].forEach((key) => normalize_optional_number_field(tradingModeConfig, key));
+        configEditor.setValue(tradingModeConfig);
+        return tradingModeConfig;
+    }
+
+    const normalizeSimulatedPortfolioConfig = () => {
+        if (simulatedPortfolioEditor === undefined) {
+            return [];
+        }
+        const editorDiv = $("#simulated-portfolio-editor");
+        const referenceMarket = editorDiv.data("reference-market");
+        const portfolio = simulatedPortfolioEditor.getValue();
+        let updated = false;
+        portfolio.forEach((row) => {
+            if (!row || !referenceMarket) {
+                return;
+            }
+            const assetValue = row.asset;
+            if (assetValue === undefined || assetValue === null || `${assetValue}`.trim() === "") {
+                row.asset = referenceMarket;
+                updated = true;
+            }
+        });
+        if (updated) {
+            simulatedPortfolioEditor.setValue(portfolio);
+        }
+        return portfolio;
+    }
+
+    const getEnabledExchangeFromConfig = () => {
+        const exchanges = getSelectableExchange();
+        return exchanges.length ? exchanges[0] : null;
+    }
+
+    const getConfigUpdate = () => {
+        const tradingModeConfig = normalizeTradingModeConfig();
+        const simulatedPortfolioConfig = normalizeSimulatedPortfolioConfig();
+        return {
+            exchange: getEnabledExchangeFromConfig(),
+            tradingPair: null,
+            tradingModeName: getTradingModeName(),
+            tradingModeConfig: tradingModeConfig,
+            tradingSimulatorConfig: tradingSimulatorEditor.getValue(),
+            simulatedPortfolioConfig: simulatedPortfolioConfig,
+            exchangesConfig: exchangesEditor.getValue(),
+        }
+    }
+
+    const initLastSavedConfig = () => {
+        if (
+            readyEditors.exchanges
+            && readyEditors.simulator
+            && readyEditors.portfolio
+            && lastSavedConfig === undefined
+        ) {
+            lastSavedConfig = getConfigUpdate()
+        }
+    }
+
+    const initUIWhenPossible = () => {
+        exchangesEditor.on('ready', () => {
+            readyEditors.exchanges = true
+            initLastSavedConfig();
+        })
+        $("[data-role=save]").on("click", (event) => {
+            saveConfig($(event.currentTarget).data("update-url"))
+        })
+    }
+
+    const hasPendingUpdates = () => {
+        if (tradingSimulatorEditor === undefined
+            || simulatedPortfolioEditor === undefined
+            || exchangesEditor === undefined
+            || lastSavedConfig === undefined
+        ) {
+            return false;
+        }
+        return getValueChangedFromRef(
+            getConfigUpdate(), lastSavedConfig, true
+        )
+    }
+
+    let tradingSimulatorEditor = undefined;
+    let simulatedPortfolioEditor = undefined;
+    let exchangesEditor = undefined;
+    let lastSavedConfig = undefined
+    const readyEditors = {
+        exchanges: false,
+        simulator: false,
+        portfolio: false,
+    }
+
+
+    refreshExchangesEditor();
+    refreshTradingSimulatorEditor();
+    refreshPortfolioEditor();
+    initUIWhenPossible();
+    addCustomValidator();
+    register_exit_confirm_function(hasPendingUpdates)
+    startTutorialIfNecessary("pm:configuration");
+});
diff --git a/packages/tentacles/Services/Interfaces/web_interface/static/distributions/prediction_market/js/dashboard.js b/packages/tentacles/Services/Interfaces/web_interface/static/distributions/prediction_market/js/dashboard.js
new file mode 100644
index 0000000000..247c47ed7d
--- /dev/null
+++ b/packages/tentacles/Services/Interfaces/web_interface/static/distributions/prediction_market/js/dashboard.js
@@ -0,0 +1,22 @@
+/*
+ * Drakkar-Software OctoBot
+ * Copyright (c) Drakkar-Software, All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.
+ */
+
+
+$(document).ready(function() {
+    startTutorialIfNecessary("pm:home");
+});
diff --git a/packages/tentacles/Services/Interfaces/web_interface/static/js/common/util.js b/packages/tentacles/Services/Interfaces/web_interface/static/js/common/util.js
index bf7da1ad5c..8b602297c5 100644
--- a/packages/tentacles/Services/Interfaces/web_interface/static/js/common/util.js
+++ b/packages/tentacles/Services/Interfaces/web_interface/static/js/common/util.js
@@ -374,6 +374,23 @@ function validateJSONEditor(editor) {
     return errorsDesc;
 }
 
+function normalize_optional_number_field(config, key) {
+    if (!config || typeof config !== "object" || !(key in config)) {
+        return;
+    }
+    const value = config[key];
+    if (value === "" || value === null) {
+        delete config[key];
+        return;
+    }
+    if (typeof value === "string") {
+        const parsed = Number(value);
+        if (!Number.isNaN(parsed)) {
+            config[key] = parsed;
+        }
+    }
+}
+
 function getWebsiteUrl() {
     return $("#global-urls").data("website-url");
 }
diff --git a/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/configuration.html b/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/configuration.html
new file mode 100644
index 0000000000..1840da265e
--- /dev/null
+++ b/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/configuration.html
@@ -0,0 +1,128 @@
+{% extends "layout.html" %}
+{% set active_page = "configuration" %}
+
+{% import 'components/config/tentacle_config_editor.html' as m_tentacle_config_editor %}
+
+
+{% macro save_block(display_interfaces_link) %}
+<div class="d-flex justify-content-between">
+    {% if display_interfaces_link %}
+    <div>
+        <a href="{{url_for('interfaces')}}">
+            <button type="button" class="btn btn-outline-primary btn-lg"
+                    data-toggle="tooltip" title="Configure your OctoBot's web interface access and enable the Telegram bot.">
+                Web & Telegram configuration
+            </button>
+        </a>
+    </div>
+    {% endif %}
+    <div class="">
+        <button type="button" class="btn btn-primary btn-lg"
+                data-role="save" data-update-url="{{url_for('save_prediction_market_config')}}">
+            <i class="fas fa-save" aria-hidden="true"></i> Save
+        </button>
+    </div>
+    <div>
+        <button type="button" class="btn btn-outline-primary btn-lg" route="{{ url_for('commands', cmd='restart') }}">
+            <i class="fa fa-refresh" aria-hidden="true"></i> Restart
+        </button>
+    </div>
+</div>
+{% endmacro %}
+
+{% block body %}
+<br/>
+<div class="card card-body">
+    {% if show_profile_switch %}
+    <!-- Profile Switch UI -->
+    <div class="text-center">
+        <h2>Switch to {{ requested_profile.name }} Profile</h2>
+        <p class="mt-3">
+            You are currently viewing the configuration for the <strong>{{ requested_profile.name }}</strong> profile.
+            To configure this profile, you need to switch to it first.
+        </p>
+        <div class="alert alert-warning mt-4">
+            <strong>Warning:</strong> Switching profiles will restart OctoBot with the new profile configuration.
+        </div>
+        <div class="mt-4">
+            <a href="{{ url_for('profile', select=requested_profile.profile_id, next=url_for('configuration')) }}" class="btn btn-primary btn-lg">
+                <i class="fas fa-exchange-alt"></i> Switch to {{ requested_profile.name }} Profile
+            </a>
+            <a href="{{ url_for('configuration') }}" class="btn btn-outline-secondary btn-lg ml-3">
+                <i class="fas fa-times"></i> Cancel
+            </a>
+        </div>
+        <div class="mt-4">
+            <small class="text-muted">
+                Current profile: <strong>{{ current_profile.name }}</strong>
+            </small>
+        </div>
+    </div>
+    {% else %}
+    <!-- Normal Configuration UI -->
+    <div class="grid row">
+        <div class="col col-lg-6 markdown-content">
+            {{tentacle_docs}}
+        </div>
+        <div class="col col-lg-6">
+            <div id="trading-mode-config-editor" data-trading-mode-name="{{trading_mode_name}}">
+                {{ m_tentacle_config_editor.tentacles_config_editor(trading_mode_name) }}
+            </div>
+            <div class="mx-3">
+                {{ save_block(False) }}
+            </div>
+        </div>
+    </div>
+    <div id="exchange-configuration">
+        <h2>Exchanges configuration</h2>
+        <div class="mt-4">
+            <p>
+                Add the exchange to perform prediction market trading on.
+            </p>
+            <div>
+                Note: For trading simulator, exchanges must be added, and
+                <strong>API details are not required</strong>.
+            </div>
+        </div>
+        <div id="exchanges-editor"
+             data-config='{{config_exchanges | tojson}}'
+             data-schema='{{exchanges_schema | tojson}}'
+        ></div>
+        <p class="mx-4">
+            <i>Click save after adding a new exchange to be able to select it.</i>
+        </p>
+    </div>
+    <div id="trading-simulation">
+        <h2>Trading simulator configuration</h2>
+        <div class="grid row">
+            <div class="col col-lg-6">
+                <div id="trading-simulator-editor"
+                     data-config='{{config_trading_simulator | tojson}}'
+                     data-schema='{{trading_simulator_schema | tojson}}'
+                ></div>
+            </div>
+            <div class="col col-lg-6 pt-lg-5">
+                <div id="simulated-portfolio-editor"
+                     data-config='{{simulated_portfolio | tojson}}'
+                     data-schema='{{portfolio_schema | tojson}}'
+                     data-reference-market='{{reference_market}}'
+                ></div>
+            </div>
+        </div>
+    </div>
+    {{ save_block(True) }}
+
+    <span class="d-none"
+          data-display-intro="{{display_intro}}"
+    ></span>
+    {% endif %}
+</div>
+{% endblock %}
+
+{% block additional_scripts %}
+<script src="{{ url_for('static', filename='js/common/resources_rendering.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+<script src="{{ url_for('static', filename='js/common/custom_elements.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+<script src="{{ url_for('static', filename='js/common/common_handlers.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+<script src="{{ url_for('static', filename='distributions/prediction_market/js/configuration.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+<script src="{{ url_for('static', filename='js/components/config_tentacle.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+{% endblock additional_scripts %}
diff --git a/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/dashboard.html b/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/dashboard.html
new file mode 100644
index 0000000000..8533fb3804
--- /dev/null
+++ b/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/dashboard.html
@@ -0,0 +1,100 @@
+{% extends "layout.html" %}
+{% set active_page = "home" %}
+
+{% import 'macros/critical_notifications_alert.html' as m_critical_notifications_alert %}
+
+{% macro waiter(waiter_id, title) %}
+<div id="{{waiter_id}}" class="text-center my-4 py-4 h-100">
+    <div class="py-4">
+        <h2>{{title}}</h2>
+    </div>
+    <div class="py-4">
+        <h2><i class="fa fa-spinner fa-spin"></i></h2>
+    </div>
+</div>
+{% endmacro %}
+
+
+{% block body %}
+    <br>
+
+    {{ m_critical_notifications_alert.critical_notifications_alert(critical_notifications) }}
+    <span id="exchange-specific-data">
+        {% if might_have_positions %}
+        <div class="card">
+            <div class="card-header">
+                <h4>Positions</h4>
+            </div>
+            <div class="card-body">
+                {{ waiter("positions-waiter", "Loading positions") }}
+                <div class='progress mb-1' id='cancel_position_progress_bar' style='display: none;'>
+                    <div class='progress-bar progress-bar-striped progress-bar-animated' role='progressbar' aria-valuenow='100' aria-valuemin='0' aria-valuemax='100' style='width: 100%;'></div>
+                </div>
+                <div id="positionTable">
+                  <table id="positions-table"
+                         data-url="{{url_for('api.positions')}}"
+                         data-close-url="{{url_for('api.positions', action='close_position')}}"
+                         class="w-100 table-striped table-responsive-sm">
+                  </table>
+                </div>
+            </div>
+        </div>
+
+        <br>
+        {% endif %}
+
+        <div class="card">
+            <div class="card-header text-center">
+                <h4>Open orders</h4>
+            </div>
+            <div class="card-body">
+                {{ waiter("orders-waiter", "Loading orders") }}
+                <div class='progress mb-1' id='cancel_order_progress_bar' style='display: none;'>
+                    <div class='progress-bar progress-bar-striped progress-bar-animated' role='progressbar' aria-valuenow='100' aria-valuemin='0' aria-valuemax='100' style='width: 100%;'></div>
+                </div>
+                <div id="openOrderTable">
+                  <table id="orders-table"
+                         data-url="{{url_for('api.orders')}}"
+                         class="w-100 table-striped table-responsive-sm">
+                  </table>
+                </div>
+            </div>
+        </div>
+
+        <br>
+    </span>
+
+    <br>
+
+    <div class="card">
+        <div class="card-header text-center">
+            <h4>Trades history</h4>
+        </div>
+        <div class="card-body">
+            {{ waiter("trades-waiter", "Loading trades") }}
+            <table id="trades-table"
+                 data-url="{{url_for('api.trades')}}"
+                 data-reference-market="{{reference_market}}"
+                 class="w-100 table-striped table-responsive-sm">
+            </table>
+        </div>
+    </div>
+
+    <div class="text-right my-5">
+        <button type="button" class="btn btn-outline-primary btn-lg" route="{{ url_for('commands', cmd='stop') }}">
+            <i class="fa fa-power-off" aria-hidden="true"></i> Stop OctoBot
+        </button>
+    </div>
+
+    <span class="d-none"
+          data-display-intro="{{display_intro}}"
+    ></span>
+{% endblock %}
+
+{% block additional_scripts %}
+    <script src="{{ url_for('static', filename='js/common/custom_elements.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+    <script src="{{ url_for('static', filename='js/common/portfolio_history.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+    <script src="{{ url_for('static', filename='js/common/tables_display.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+    <script src="{{ url_for('static', filename='js/components/trading.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+    <script src="{{ url_for('static', filename='distributions/prediction_market/js/dashboard.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+{% endblock additional_scripts %}
diff --git a/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/footer.html b/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/footer.html
new file mode 100644
index 0000000000..a86bd84394
--- /dev/null
+++ b/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/footer.html
@@ -0,0 +1,18 @@
+<!-- Footer -->
+<footer class="page-footer font-small fixed-bottom">
+
+    <div class="footer-copyright text-center py-sm-2 py-0">Follow
+        <a href="{{OCTOBOT_WEBSITE_URL}}" target="_blank" rel="noopener"> OctoBot</a> <span class="d-none d-md-inline">updates </span>on
+        <a href="{{OCTOBOT_DOCS_URL}}" target="_blank" rel="noopener noreferrer"><i class="fas fa-newspaper"></i><span class="d-none d-md-inline"> our Blog</span></a>
+        <a href="https://github.com/Drakkar-Software/OctoBot" target="_blank" rel="noopener"><i class="fab fa-github"></i><span class="d-none d-md-inline"> GitHub</span></a>
+        <a href="https://twitter.com/DrakkarsOctoBot" target="_blank" rel="noopener noreferrer"><i class="fab fa-twitter"></i><span class="d-none d-md-inline"> Twitter</span></a>
+        <a href="https://t.me/OctoBot_Project" target="_blank" rel="noopener noreferrer"><i class="fab fa-telegram"></i><span class="d-none d-md-inline"> Telegram</span></a>
+        <a href="https://discordapp.com/invite/vHkcb8W" target="_blank" rel="noopener noreferrer"><i class="fab fa-discord"></i><span class="d-none d-md-inline"> Discord</span></a>
+        Join the <a href="https://t.me/joinchat/F9cyfxV97ZOaXQ47H5dRWw" target="_blank" rel="noopener noreferrer"><i class="fab fa-telegram"></i>
+        <span class="d-none d-md-inline">OctoBot</span> community <span class="d-none d-md-inline">chat</span></a> <span class="d-none d-md-inline">for the best tips and tricks.</span>
+        &emsp;
+        <span>OctoBot {{ CURRENT_BOT_VERSION }}</span>
+  </div>
+
+</footer>
+<!-- Footer -->
diff --git a/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/interfaces.html b/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/interfaces.html
new file mode 100644
index 0000000000..53e5225296
--- /dev/null
+++ b/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/interfaces.html
@@ -0,0 +1,118 @@
+{% extends "layout.html" %}
+{% set active_page = "configuration" %}
+{% import 'components/config/service_card.html' as m_config_service_card %}
+{% import 'components/config/notification_config.html' as m_config_notification %}
+
+{% block additional_style %}
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/components/configuration.css', u=LAST_UPDATED_STATIC_FILES) }}">
+{% endblock additional_style %}
+
+{% block body %}
+<div class="row mt-md-4 mt-2">
+  <nav class="mt-md-4 mt-2 col-md-3 col-lg-2 col-1 d-block sidebar shadow">
+      <div class="sidebar-sticky mt-0 pt-0">
+        <div class="col-8 d-none d-md-block">
+            <div class="px-1 px-md-4">
+                <h4>Interfaces settings</h4>
+            </div>
+        </div>
+        <div class="nav flex-column bordered pt-0 mt-0 mt-md-4" id="v-tab" role="tablist" aria-orientation="vertical">
+          <a class="nav-link pl-2 pl-sm-3 waves-effect d-flex active show" id="panelServices-tab" data-toggle="pill" href="#panelServices" role="tab" aria-controls="panelServices" aria-selected="false">
+              <i class="fas fa-share-alt my-auto"></i><span class="d-none d-md-block pl-3">Interfaces</span>
+          </a>
+          <a class="nav-link pl-2 pl-sm-3 waves-effect d-flex" id="panelNotifications-tab" data-toggle="pill" href="#panelNotifications" role="tab" aria-controls="panelNotifications" aria-selected="false">
+              <i class="fas fa-bell my-auto"></i><span class="d-none d-md-block pl-3">Notifications</span>
+          </a>
+        </div>
+        <a class="w-100 my-3 p-2 pl-sm-3 btn btn-lg btn-outline-primary waves-effect d-flex mx-0" id="save-config" href="#" role="tab" aria-selected="false" update-url="{{ url_for('interface_config') }}">
+            <i class="fas fa-save my-auto"></i><span class="d-none d-md-block pl-2">Save</span>
+        </a>
+        <a class="w-100 my-3 p-2 pl-sm-3 btn btn-lg btn-outline-primary waves-effect d-flex mx-0" id="reset-config" href="#" role="tab" aria-selected="false">
+            <i class="fas fa-redo-alt my-auto"></i><span class="d-none d-md-block pl-2">Reset all</span>
+        </a>
+        <button class="w-100 my-3 p-2 pl-sm-3 btn btn-lg btn-outline-primary waves-effect d-flex mx-0 mt-3 mt-mb-5 mb-5" id="save-config-and-restart" href="#" role="tab" type="button" aria-selected="false" update-url="{{ url_for('interface_config') }}">
+            <i class="fas fa-power-off my-auto"></i><span class="d-none d-md-block pl-2">Apply changes and restart</span>
+        </button>
+        {% if current_user.is_authenticated %}
+            <a href="{{ url_for('logout') }}" class="w-100 my-3 p-2 pl-sm-3 btn btn-lg btn-outline-secondary waves-effect d-flex mx-0 mt-3 mt-mb-5 mb-5">
+                <i class="fas fa-sign-out-alt my-auto"></i><span class="d-none d-md-block pl-2">Lock web interface</span>
+
+            </a>
+        {% endif %}
+    </div>
+  </nav>
+  <main role="main" class="col-md-9 col-lg-10 col-11 ml-auto px-4">
+    <div class="tab-content" id="super-container">
+      <div class="tab-pane fade config-root show active" id="panelServices" role="tabpanel" aria-labelledby="panelServices-tab">
+          <div class="card">
+            <div class="card-header"><h2>Interfaces</h2></div>
+            <div class="card-body deck-container">
+                <div class="card">
+                    <div class="card-body">Select an interface :
+                    <select id="AddServiceSelect" class="selectpicker" data-live-search="true">
+                       {% for service in services_list | sort() %}
+                            <option data-tokens="{{ service }}">{{ service }}</option>
+                       {% endfor %}
+                    </select>
+                    <button type="button" id="AddService" class="btn btn-primary add-btn px-3 waves-effect"><i class="fa fa-plus pr-2" aria-hidden="true"></i> Add</button>
+                    </div>
+                </div>
+                <br>
+                <!-- Card deck -->
+                <div class="card-deck config-container" update-url="{{ url_for('interface_config') }}">
+                    {% for service in services_list %}
+                        {% if service in config_services %}
+                            {{ m_config_service_card.config_service_card(config_services, service, services_list[service], extension_name=OCTOBOT_EXTENSION_PACKAGE_1_NAME) }}
+                        {% endif %}
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+      </div>
+      <div class="tab-pane fade config-root" id="panelNotifications" role="tabpanel" aria-labelledby="panelNotifications-tab">
+          <div class="card">
+            <div class="card-header">
+                <h2>
+                    Notifications
+                    <a class="float-right blue-text" target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/octobot-configuration/accounts#notifications">
+                        <i class="fa-solid fa-question"></i>
+                    </a>
+                </h2>
+            </div>
+            <div class="card-body deck-container">
+                <!-- Card deck -->
+                <div class="card-deck config-container">
+                    {{ m_config_notification.config_notification(config_notifications, "notification", notifiers_list) }}
+                </div>
+            </div>
+        </div>
+      </div>
+    </div>
+  </main>
+</div>
+
+<!-- Default cards -->
+<div class="d-none">
+    <!-- Services -->
+    <div id="AddService-template-default">
+        {% for service in services_list %}
+            <div id="AddService-template-default-{{service}}">
+            {{ m_config_service_card.config_service_card(  config_services,
+                                                           service,
+                                                           services_list[service],
+                                                           add_class=added_class,
+                                                           no_select=True,
+                                                           default_values=True,
+                                                           extension_name=OCTOBOT_EXTENSION_PACKAGE_1_NAME) }}
+            </div>
+        {% endfor %}
+    </div>
+</div>
+<br>
+{% endblock %}
+
+{% block additional_scripts %}
+<script src="{{ url_for('static', filename='js/common/resources_rendering.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+<script src="{{ url_for('static', filename='js/common/exchange_accounts.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+<script src="{{ url_for('static', filename='js/components/configuration.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+{% endblock additional_scripts %}
diff --git a/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/navbar.html b/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/navbar.html
new file mode 100644
index 0000000000..63c92b45c3
--- /dev/null
+++ b/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/navbar.html
@@ -0,0 +1,57 @@
+<!-- Navbar -->
+<nav class="navbar navbar-expand-lg sticky-top py-0 py-md-2" id="main-nav-bar">
+    <div class="navbar-collapse collapse w-100 order-1 order-md-0 dual-collapse2">
+        <ul class="navbar-nav mr-auto" id="main-nav-left-part">
+            <li class="nav-item mx-1 px-0 my-auto {% if 'home' == active_page %} active{% endif %}">
+                <a class="nav-link" href="{{ url_for('home') }}">Dashboard</a>
+            </li>
+            <li id="main-nav-portfolio" class="nav-item mx-1 px-0 my-auto {% if 'portfolio' == active_page %} active{% endif %}">
+                <a class="nav-link" href="{{ url_for('portfolio') }}">Portfolio</a>
+            </li>
+            <li class="nav-item mx-1 px-0 my-auto {% if 'configuration' == active_page and current_profile_id == 'profile_copy_trading' %} active{% endif %}">
+                <a class="nav-link" href="{{ url_for('configuration', profile_id='profile_copy_trading') }}">Copy Trading</a>
+            </li>
+            <li class="nav-item mx-1 px-0 my-auto">
+                <a class="nav-link disabled" href="#" aria-disabled="true" tabindex="-1"
+                   data-toggle="tooltip" data-placement="bottom" title="AI Trading is coming soon">
+                    AI Trading
+                </a>
+            </li>
+        </ul>
+    </div>
+    <div class="d-flex mx-auto order-0">
+        <a class="navbar-brand mx-auto font-weight-bolder" href="{{ url_for('home') }}">
+            <img
+                src="{{url_for('static', filename='img/octobot-logo-'+get_color_mode()+'.png')}}" alt="octobot-logo"
+                class="navbar-logo"
+            > OctoBot Prediction Market
+            <i id="navbar-bot-status" class="ml-2 fa fa-check" data-toggle="tooltip" data-placement="bottom" title="OctoBot operational"></i>
+        </a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".dual-collapse2">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+    </div>
+    <div class="navbar-collapse collapse w-100 order-3 dual-collapse2">
+        <ul class="navbar-nav ml-auto" id="main-nav-right-part">
+            {% if (not is_login_required()) or (is_login_required() and is_authenticated()) %}
+            <li class=" mx-1 px-0 my-auto" id="trading-type-indicator">
+                <span class="p-2" aria-label="TradingSwitch">
+                    {{ m_trading_state.display_trading_state(is_real_trading(get_current_profile()), get_enabled_trader(get_current_profile())) }}
+                </span>
+            </li>
+            {% endif %}
+            <li class="nav-item mx-1 px-0 my-auto {% if 'logs' == active_page %} active{% endif %}">
+                <a class="nav-link" href="{{ url_for('logs') }}" aria-label="Logs"><i class="fa fa-bell" data-toggle="tooltip" data-placement="top" title="Event logs">
+                    <span id="errors-count-badge" class="badge badge-warning"></span>
+                </i></a>
+            </li>
+            <li class="nav-item mx-1 px-0 my-auto {% if 'logs' == active_page %} active{% endif %}">
+                <a id="theme-switch" class="nav-link" href="#" aria-label="Switch theme" data-update-url="{{url_for('api.display_config')}}">
+                    <i class="{{'fa fa-moon' if get_color_mode() == 'light' else 'fas fa-sun'}}" data-toggle="tooltip" data-placement="top"
+                       title="Use {{'dark' if get_color_mode() == 'light' else 'light'}} theme">
+                </i></a>
+            </li>
+        </ul>
+    </div>
+</nav>
+<!-- Navbar -->
diff --git a/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/portfolio.html b/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/portfolio.html
new file mode 100644
index 0000000000..4bcadad7e7
--- /dev/null
+++ b/packages/tentacles/Services/Interfaces/web_interface/templates/distributions/prediction_market/portfolio.html
@@ -0,0 +1,117 @@
+{% extends "layout.html" %}
+{% set active_page = "portfolio" %}
+{% import 'macros/cards.html' as m_cards %}
+{% import 'macros/starting_waiter.html' as m_waiter %}
+{% block body %}
+
+<div id="portfolio-display">
+    {% macro display_init_warning() -%}
+        {% if initializing_currencies_prices %}
+        <div class="alert alert-warning" role="alert">
+            OctoBot is currently initializing prices for {{ initializing_currencies_prices | join(", ") }}.
+            These assets might take a few seconds to load.
+        </div>
+        {% endif %}
+    {%- endmacro %}
+
+    {% macro holding_row(holdings, holding_type) -%}
+            <td class="align-middle rounded-number" data-toggle="tooltip" title="{{get_exchange_holdings(holdings, holding_type)}}">
+                {{holdings[holding_type]}}
+            </td>
+    {%- endmacro %}
+
+    {% macro portfolio_holding(currency, holdings, value) -%}
+        <tr class="symbol-holding text-center">
+            <td class="row mx-0">
+                <div class="col col-md-5 animated px-2 fadeIn img-fluid very-small-size">
+                    <img class="card-img-top currency-image"
+                         src="{{ url_for('static', filename='img/svg/loading_currency.svg') }}"
+                         alt="{{currency}}"
+                         data-symbol="{{currency.lower()}}">
+                </div>
+                <div class="d-none d-md-inline col-7 my-auto">
+                    <span class="symbol">{{currency}}</span></div>
+            </td>
+            {{ holding_row(holdings, "total") }}
+            <td class="total-value align-middle rounded-number">{{value}}</td>
+            {{ holding_row(holdings, "free") }}
+            {{ holding_row(holdings, "locked") }}
+        </tr>
+    {%- endmacro %}
+
+    <br>
+    {% if not has_real_trader and not has_simulated_trader %}
+        {{ m_waiter.display_loading_message(details="If this message remains, please make sure that at least one exchange is enabled in your profile.") }}
+    {% else %}
+        <div class="card" id="portfoliosCard" reference_market="{{reference_unit}}">
+            {{ display_init_warning() }}
+            <div class="card-header"><h2>Portfolio: <span class="rounded-number">{{displayed_portfolio_value}}</span> {{reference_unit}}</h2></div>
+            <div class="card-body row mx-0 justify-content-center">
+                {% if displayed_portfolio %}
+                    <div class="col-12 col-md-6 mb-2 mb-md-4" id="portfolio_doughnutChart"
+                         data-md-height="350" data-sm-height="200">
+                    </div>
+                    <div class="col-12">
+                        <table class="table table-striped table-responsive-sm" id="holdings-table">
+                          <thead>
+                            <tr class="text-center">
+                                <th scope="col">Asset</th>
+                                <th scope="col">Total</th>
+                                <th scope="col">Value in {{reference_unit}}</th>
+                                <th scope="col">Available</th>
+                                <th scope="col">Locked in orders</th>
+                            </tr>
+                          </thead>
+                          <tbody>
+                            {% for currency, holdings in displayed_portfolio.items() %}
+                                {{ portfolio_holding(currency, holdings, symbols_values[currency]) }}
+                            {% endfor %}
+                          </tbody>
+                        </table>
+                    </div>
+                {% else %}
+                    <div class="card-subtitle">
+                        <h2 class="text-muted">Nothing there.</h2>
+                        <p>
+                            If a trader is enabled, please check <a href="{{url_for('logs')}}">your OctoBot logs</a>.
+                            There might be an issue with your exchange credentials.
+                        </p>
+                    </div>
+                {% endif %}
+            </div>
+            <div class="card-footer d-flex justify-content-end">
+                <div class="d-flex justify-content-end">
+                    <button
+                        data-url="{{ url_for('api.clear_portfolio_history') }}"
+                        id="clear-portfolio-history-button"
+                        class="btn btn-outline-warning waves-effect"
+                        data-toggle="tooltip"
+                        data-placement="top"
+                        title="Reset portfolio and profitability historical values."
+                    >
+                        <i class="fas fa-trash"></i> Reset history
+                    </button>
+                    {% if has_real_trader%}
+                    <button id="refresh-portfolio" update-url="{{ url_for('api.refresh_portfolio') }}"
+                            class="btn btn-outline-danger btn-lg waves-effect"
+                            data-toggle="tooltip"
+                            data-placement="top"
+                            title="Triggers a total portfolios re-synchronization using exchanges as a reference."
+                    >
+                        <i class="fa fa-sync"></i> Force refresh
+                    </button>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    {% endif %}
+    <br>
+    {% endblock %}
+</div>
+
+{% block additional_scripts %}
+<script src="{{ url_for('static', filename='js/common/resources_rendering.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+<script src="{{ url_for('static', filename='js/common/custom_elements.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+<script src="{{ url_for('static', filename='js/common/common_handlers.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+<script src="{{ url_for('static', filename='js/components/portfolio.js', u=LAST_UPDATED_STATIC_FILES) }}"></script>
+{% endblock additional_scripts %}
diff --git a/packages/tentacles/Services/Interfaces/web_interface/templates/layout.html b/packages/tentacles/Services/Interfaces/web_interface/templates/layout.html
index 40cf65a624..220cf8a7c6 100644
--- a/packages/tentacles/Services/Interfaces/web_interface/templates/layout.html
+++ b/packages/tentacles/Services/Interfaces/web_interface/templates/layout.html
@@ -98,6 +98,8 @@
 
         {% if get_distribution() == 'market_making' %}
             {% include "distributions/market_making/navbar.html" %}
+        {% elif get_distribution() == 'prediction_market' %}
+            {% include "distributions/prediction_market/navbar.html" %}
         {% else %}
             {% include "distributions/default/navbar.html" %}
         {% endif %}
@@ -161,6 +163,8 @@ <h5 class="mb-0">
 
         {% if get_distribution() == 'market_making' %}
             {% include "distributions/market_making/footer.html" %}
+        {% elif get_distribution() == 'prediction_market' %}
+            {% include "distributions/prediction_market/footer.html" %}
         {% else %}
             {% include "distributions/default/footer.html" %}
         {% endif %}
diff --git a/packages/tentacles/Trading/Exchange/polymarket/ccxt/polymarket_async.py b/packages/tentacles/Trading/Exchange/polymarket/ccxt/polymarket_async.py
index 05301df502..4c61f997f2 100644
--- a/packages/tentacles/Trading/Exchange/polymarket/ccxt/polymarket_async.py
+++ b/packages/tentacles/Trading/Exchange/polymarket/ccxt/polymarket_async.py
@@ -1067,8 +1067,21 @@ async def fetch_ticker(self, symbol: str, params={}) -> Ticker:
     - API: GET /last-trade-price(see https://docs.polymarket.com/api-reference/trades/get-last-trade-price)
         """
         await self.load_markets()
-        market = self.market(symbol)
-        marketInfo = self.safe_dict(market, 'info', {})
+        market: Market = None
+        try:
+            market = self.market(symbol)
+        except Exception as e:
+            market = None
+        if market is None:
+            conditionId = self.safe_string_2(params, 'condition_id', 'conditionId')
+            slug = self.safe_string(params, 'slug')
+            tokenIdParam = self.safe_string(params, 'token_id')
+            fallbackId = conditionId or slug or tokenIdParam or symbol
+            try:
+                market = self.safe_market_with_fallback(fallbackId, None, params)
+            except Exception as e:
+                market = None
+        marketInfo = self.safe_dict(market, 'info', {}) if market else {}
         # Get token ID from params or market
         # Use market['id'] which is the specific token ID for self outcome(YES/NO)
         # Do NOT use clobTokenIds[0] always picks the first outcome regardless of symbol
@@ -1269,6 +1282,17 @@ def parse_ticker(self, ticker: dict, market: Market = None) -> Ticker:
         """
         # Polymarket ticker format from market data
         symbol = market['symbol'] if market else None
+        if market is None:
+            conditionId = self.safe_string_2(ticker, 'condition_id', 'conditionId')
+            slug = self.safe_string(ticker, 'slug')
+            tokenId = self.safe_string(ticker, 'token_id')
+            fallbackId = conditionId or slug or tokenId
+            if fallbackId is not None or slug is not None:
+                try:
+                    market = self.safe_market_with_fallback(fallbackId or slug, None, ticker)
+                    symbol = self.safe_string(market, 'symbol', symbol)
+                except Exception as e:
+                    market = None
         # Parse outcome prices
         outcomePricesStr = self.safe_string(ticker, 'outcomePrices')
         outcomePrices = []
diff --git a/packages/tentacles/Trading/Exchange/polymarket/ccxt/polymarket_sync.py b/packages/tentacles/Trading/Exchange/polymarket/ccxt/polymarket_sync.py
index bf3bbe7f1d..52a2f3664e 100644
--- a/packages/tentacles/Trading/Exchange/polymarket/ccxt/polymarket_sync.py
+++ b/packages/tentacles/Trading/Exchange/polymarket/ccxt/polymarket_sync.py
@@ -1067,8 +1067,21 @@ def fetch_ticker(self, symbol: str, params={}) -> Ticker:
     - API: GET /last-trade-price(see https://docs.polymarket.com/api-reference/trades/get-last-trade-price)
         """
         self.load_markets()
-        market = self.market(symbol)
-        marketInfo = self.safe_dict(market, 'info', {})
+        market: Market = None
+        try:
+            market = self.market(symbol)
+        except Exception as e:
+            market = None
+        if market is None:
+            conditionId = self.safe_string_2(params, 'condition_id', 'conditionId')
+            slug = self.safe_string(params, 'slug')
+            tokenIdParam = self.safe_string(params, 'token_id')
+            fallbackId = conditionId or slug or tokenIdParam or symbol
+            try:
+                market = self.safe_market_with_fallback(fallbackId, None, params)
+            except Exception as e:
+                market = None
+        marketInfo = self.safe_dict(market, 'info', {}) if market else {}
         # Get token ID from params or market
         # Use market['id'] which is the specific token ID for self outcome(YES/NO)
         # Do NOT use clobTokenIds[0] always picks the first outcome regardless of symbol
@@ -1269,6 +1282,17 @@ def parse_ticker(self, ticker: dict, market: Market = None) -> Ticker:
         """
         # Polymarket ticker format from market data
         symbol = market['symbol'] if market else None
+        if market is None:
+            conditionId = self.safe_string_2(ticker, 'condition_id', 'conditionId')
+            slug = self.safe_string(ticker, 'slug')
+            tokenId = self.safe_string(ticker, 'token_id')
+            fallbackId = conditionId or slug or tokenId
+            if fallbackId is not None or slug is not None:
+                try:
+                    market = self.safe_market_with_fallback(fallbackId or slug, None, ticker)
+                    symbol = self.safe_string(market, 'symbol', symbol)
+                except Exception as e:
+                    market = None
         # Parse outcome prices
         outcomePricesStr = self.safe_string(ticker, 'outcomePrices')
         outcomePrices = []
diff --git a/packages/tentacles/Trading/Exchange/polymarket/polymarket_exchange.py b/packages/tentacles/Trading/Exchange/polymarket/polymarket_exchange.py
index 00ce69c84d..6cbe6cfb36 100644
--- a/packages/tentacles/Trading/Exchange/polymarket/polymarket_exchange.py
+++ b/packages/tentacles/Trading/Exchange/polymarket/polymarket_exchange.py
@@ -82,6 +82,17 @@ def get_additional_connector_config(self):
             }
         }
     
+    async def get_price_ticker(self, symbol: str, **kwargs: dict) -> typing.Optional[dict]:
+        if 'token_id' not in kwargs:
+            try:
+                market = self.connector.client.market(symbol)
+                token_id = market.get('id')
+                if token_id:
+                    kwargs['token_id'] = token_id
+            except Exception as e:
+                self.logger.debug(f"Could not extract token_id for {symbol}: {e}")
+        return await super().get_price_ticker(symbol, **kwargs)
+
     async def get_symbol_leverage(self, symbol: str, **kwargs: dict):
         return decimal.Decimal(1)
     
diff --git a/packages/tentacles/Trading/Exchange/polymarket/script/download.py b/packages/tentacles/Trading/Exchange/polymarket/script/download.py
index dc3a4ea6c6..e139d9fd77 100644
--- a/packages/tentacles/Trading/Exchange/polymarket/script/download.py
+++ b/packages/tentacles/Trading/Exchange/polymarket/script/download.py
@@ -18,7 +18,7 @@
 from pathlib import Path
 from typing import Dict, List, Tuple, Any
 
-CCXT_PATH = '../../../../../ccxt'
+CCXT_PATH = '../../../../../../../ccxt'
 FILE_MAPPINGS: Dict[str, Dict[str, Any]] = {
     f'{CCXT_PATH}/python/ccxt/polymarket.py': {
         'destination': '../ccxt/polymarket_sync.py',
diff --git a/packages/tentacles/Trading/Mode/index_trading_mode/index_trading.py b/packages/tentacles/Trading/Mode/index_trading_mode/index_trading.py
index 2c17ca7b3c..c6d63ff9b3 100644
--- a/packages/tentacles/Trading/Mode/index_trading_mode/index_trading.py
+++ b/packages/tentacles/Trading/Mode/index_trading_mode/index_trading.py
@@ -226,7 +226,7 @@ async def _split_reference_market_into_indexed_coins(
         amount_by_symbol = await self._get_symbols_and_amounts(coins_to_buy, coins_prices, reference_market_to_distribute)
         for symbol, values in amount_by_symbol.items():
             orders.extend(await self.trading_mode.rebalancer.buy_coin(symbol, values.get(self.IDEAL_AMOUNT), values.get(self.IDEAL_PRICE), dependencies))
-        if not orders:
+        if not orders and not self.trading_mode.allow_skip_asset:
             raise trading_errors.MissingMinimalExchangeTradeVolume()
         return orders
 
@@ -265,23 +265,34 @@ async def _get_symbols_and_amounts(
                     f"Error computing {symbol} ideal amount ({ratio=}, {reference_market_to_split=}, {price=}): {err=}"
                 ) from err
             # worse case (ex with 5 USDT min order size): exactly 5 USDT can be in portfolio, we therefore want to
-            # trade at lease 5 USDT to be able to buy more.
+            # trade at least 5 USDT to be able to buy more.
             # - we want ideal_amount - min_cost > min_cost
-            # - in other words ideal_amount > 2*min_cost => ideal_amount/2 > min cost
+            # - in other words ideal_amount > min_cost * min_order_size_margin
+            #   => ideal_amount / min_order_size_margin > min_cost
+            min_order_size_margin = self.trading_mode.min_order_size_margin
+            if min_order_size_margin < trading_constants.ONE:
+                min_order_size_margin = trading_constants.ONE
             adapted_quantity = trading_personal_data.decimal_check_and_adapt_order_details_if_necessary(
-                ideal_amount / decimal.Decimal(2),
+                ideal_amount / min_order_size_margin,
                 price,
                 symbol_market
             )
             if not adapted_quantity:
+                if self.trading_mode.allow_skip_asset:
+                    self.logger.warning(
+                        f"Skipping {symbol} buy: available funds are too low to buy {ratio*trading_constants.ONE_HUNDRED}% "
+                        f"of {reference_market_to_split} holdings: {round(ideal_amount / min_order_size_margin, 9)} {coin}"
+                    )
+                    continue
                 # if we can't create an order in this case, we won't be able to balance the portfolio.
                 # don't try to avoid triggering new rebalances on each wakeup cycling market sell & buy orders
                 raise trading_errors.MissingMinimalExchangeTradeVolume(
                     f"Can't buy {symbol}: available funds are too low to buy {ratio*trading_constants.ONE_HUNDRED}% "
-                    f"of {reference_market_to_split} holdings: {round(ideal_amount / decimal.Decimal(2), 9)} {coin} "
+                    f"of {reference_market_to_split} holdings: {round(ideal_amount / min_order_size_margin, 9)} {coin} "
                     f"required order size is not compatible with {symbol} exchange requirements: "
                     f"{symbol_market[trading_enums.ExchangeConstantsMarketStatusColumns.LIMITS.value]}."
                 )
+
             amount_by_symbol[symbol] = {
                 self.IDEAL_AMOUNT: ideal_amount,
                 self.IDEAL_PRICE: price,
@@ -292,12 +303,14 @@ async def _get_symbols_and_amounts(
 class IndexTradingModeProducer(trading_modes.AbstractTradingModeProducer):
     REFRESH_INTERVAL = "refresh_interval"
     CANCEL_OPEN_ORDERS = "cancel_open_orders"
+    ALLOW_SKIP_ASSET = "allow_skip_asset"
     REBALANCE_TRIGGER_MIN_PERCENT = "rebalance_trigger_min_percent"
     SELECTED_REBALANCE_TRIGGER_PROFILE = "selected_rebalance_trigger_profile"
     REBALANCE_TRIGGER_PROFILES = "rebalance_trigger_profiles"
     REBALANCE_TRIGGER_PROFILE_NAME = "name"
     REBALANCE_TRIGGER_PROFILE_MIN_PERCENT = "min_percent"
     QUOTE_ASSET_REBALANCE_TRIGGER_MIN_PERCENT = "quote_asset_rebalance_trigger_min_percent"
+    MIN_ORDER_SIZE_MARGIN = "min_order_size_margin"
     REFERENCE_MARKET_RATIO = "reference_market_ratio"
     SYNCHRONIZATION_POLICY = "synchronization_policy"
     SELL_UNINDEXED_TRADED_COINS = "sell_unindexed_traded_coins"
@@ -736,15 +749,17 @@ def __init__(self, config, exchange_manager):
         self.ratio_per_asset = {}
         self.sell_unindexed_traded_coins = True
         self.cancel_open_orders = True
+        self.allow_skip_asset = False
         self.total_ratio_per_asset = trading_constants.ZERO
         self.quote_asset_rebalance_ratio_threshold = decimal.Decimal(str(DEFAULT_QUOTE_ASSET_REBALANCE_TRIGGER_MIN_RATIO))
         self.reference_market_ratio = trading_constants.ONE
+        self.min_order_size_margin = decimal.Decimal("2")
         self.synchronization_policy: SynchronizationPolicy = SynchronizationPolicy.SELL_REMOVED_INDEX_COINS_AS_SOON_AS_POSSIBLE
         self.requires_initializing_appropriate_coins_distribution = False
         self.indexed_coins = []
         self.indexed_coins_prices = {}
         self.is_processing_rebalance = False
-        self.rebalancer: rebalancer.AbstractRebalancer = self._create_rebalancer()
+        self.rebalancer: typing.Optional[rebalancer.AbstractRebalancer] = self._create_rebalancer(exchange_manager) if exchange_manager else None
     
     def init_user_inputs(self, inputs: dict) -> None:
         """
@@ -780,6 +795,13 @@ def init_user_inputs(self, inputs: dict) -> None:
             title="Percentage of the portfolio to trade (distributed among indexed coins). "
                   "The remaining percentage will be kept in the reference market.",
         ))) / trading_constants.ONE_HUNDRED
+        self.min_order_size_margin = decimal.Decimal(str(self.UI.user_input(
+            IndexTradingModeProducer.MIN_ORDER_SIZE_MARGIN, commons_enums.UserInputTypes.FLOAT,
+            float(self.min_order_size_margin), inputs,
+            min_val=1,
+            title="Min order size safety factor: ideal amount must be at least this multiple of the exchange min cost. "
+                  "Higher values are more conservative.",
+        )))
 
         self.rebalance_trigger_profiles = self.trading_config.get(IndexTradingModeProducer.REBALANCE_TRIGGER_PROFILES, None)
         if self.rebalance_trigger_profiles:
@@ -852,6 +874,11 @@ def init_user_inputs(self, inputs: dict) -> None:
             title="Cancel open orders: When enabled, open orders of the index trading pairs will be canceled to free "
                   "funds and invest in the index content.",
         ))
+        self.allow_skip_asset = bool(self.UI.user_input(
+            IndexTradingModeProducer.ALLOW_SKIP_ASSET, commons_enums.UserInputTypes.BOOLEAN,
+            self.allow_skip_asset, inputs,
+            title="Allow skipping assets that don't meet minimum order size requirements instead of aborting portfolio rebalancing.",
+        ))
         self.sell_unindexed_traded_coins = trading_config.get(
             IndexTradingModeProducer.SELL_UNINDEXED_TRADED_COINS,
             self.sell_unindexed_traded_coins
@@ -1171,10 +1198,10 @@ def get_adjusted_target_ratio(self, currency) -> decimal.Decimal:
             return base_ratio * self.reference_market_ratio
         return base_ratio
 
-    def _create_rebalancer(self) -> rebalancer.AbstractRebalancer:
-        if self.exchange_manager.is_option:
+    def _create_rebalancer(self, exchange_manager) -> rebalancer.AbstractRebalancer:
+        if exchange_manager.is_option:
             return rebalancer.OptionRebalancer(self)
-        if self.exchange_manager.is_future:
+        if exchange_manager.is_future:
             return rebalancer.FuturesRebalancer(self)
         return rebalancer.SpotRebalancer(self)
 
diff --git a/packages/tentacles/Trading/Mode/index_trading_mode/rebalancer/futures_rebalancer.py b/packages/tentacles/Trading/Mode/index_trading_mode/rebalancer/futures_rebalancer.py
index 502c1489d3..5956bfc491 100644
--- a/packages/tentacles/Trading/Mode/index_trading_mode/rebalancer/futures_rebalancer.py
+++ b/packages/tentacles/Trading/Mode/index_trading_mode/rebalancer/futures_rebalancer.py
@@ -29,14 +29,6 @@
 
 
 class FuturesRebalancer(rebalancer.AbstractRebalancer):
-    """
-    Futures market rebalancer implementation.
-    Handles opening and closing positions instead of buying/selling assets.
-    """
-    
-    def __init__(self, trading_mode):
-        super().__init__(trading_mode)
-
     async def prepare_coin_rebalancing(self, coin: str):
         await self.ensure_contract_loaded(coin)
 
@@ -124,10 +116,14 @@ async def buy_coin(
                 reduce_only=False,  # Opening/increasing position
             )
             created_order = await self.trading_mode.create_order(current_order, dependencies=dependencies)
-            created_orders.append(created_order)
+            if created_order is not None:
+                created_orders.append(created_order)
         
         if created_orders:
             return created_orders
+        if self.trading_mode.allow_skip_asset:
+            self.logger.warning(f"Skipping {symbol} order creation...")
+            return []
         if orders_should_have_been_created:
             raise trading_errors.OrderCreationError()
         raise trading_errors.MissingMinimalExchangeTradeVolume()
diff --git a/packages/tentacles/Trading/Mode/index_trading_mode/rebalancer/spot_rebalancer.py b/packages/tentacles/Trading/Mode/index_trading_mode/rebalancer/spot_rebalancer.py
index 0386886708..d96c2dbd36 100644
--- a/packages/tentacles/Trading/Mode/index_trading_mode/rebalancer/spot_rebalancer.py
+++ b/packages/tentacles/Trading/Mode/index_trading_mode/rebalancer/spot_rebalancer.py
@@ -27,14 +27,6 @@
 
 
 class SpotRebalancer(rebalancer.AbstractRebalancer):
-    """
-    Spot market rebalancer implementation.
-    Handles buying and selling assets directly.
-    """
-    
-    def __init__(self, trading_mode):
-        super().__init__(trading_mode)
-
     async def prepare_coin_rebalancing(self, coin: str):
         # Nothing to do in SPOT
         pass
@@ -98,6 +90,9 @@ async def buy_coin(
             created_orders.append(created_order)
         if created_orders:
             return created_orders
+        if self.trading_mode.allow_skip_asset:
+            self.logger.warning(f"Skipping {symbol} order creation...")
+            return []
         if orders_should_have_been_created:
             raise trading_errors.OrderCreationError()
         raise trading_errors.MissingMinimalExchangeTradeVolume()
diff --git a/packages/tentacles/Trading/Mode/index_trading_mode/tests/test_index_trading_mode.py b/packages/tentacles/Trading/Mode/index_trading_mode/tests/test_index_trading_mode.py
index e276ef8370..57937cbd24 100644
--- a/packages/tentacles/Trading/Mode/index_trading_mode/tests/test_index_trading_mode.py
+++ b/packages/tentacles/Trading/Mode/index_trading_mode/tests/test_index_trading_mode.py
@@ -186,6 +186,7 @@ async def test_init_default_values(trading_tools):
     assert mode.refresh_interval_days == 1
     assert mode.rebalance_trigger_min_ratio == decimal.Decimal(str(index_trading.DEFAULT_REBALANCE_TRIGGER_MIN_RATIO))
     assert mode.quote_asset_rebalance_ratio_threshold == decimal.Decimal(str(index_trading.DEFAULT_QUOTE_ASSET_REBALANCE_TRIGGER_MIN_RATIO))
+    assert mode.min_order_size_margin == decimal.Decimal("2")
     assert mode.ratio_per_asset == {'BTC': {'name': 'BTC', 'value': 100.0, 'price': None}}
     assert mode.total_ratio_per_asset == decimal.Decimal(100)
     assert mode.synchronization_policy == index_trading.SynchronizationPolicy.SELL_REMOVED_INDEX_COINS_AS_SOON_AS_POSSIBLE
@@ -193,6 +194,7 @@ async def test_init_default_values(trading_tools):
     assert mode.indexed_coins == ["BTC"]
     assert mode.selected_rebalance_trigger_profile is None
     assert mode.rebalance_trigger_profiles is None
+    assert mode.allow_skip_asset is False
 
 
 @pytest.mark.parametrize("trading_tools", ["spot", "futures"], indirect=True)
@@ -201,6 +203,8 @@ async def test_init_config_values(trading_tools):
         index_trading.IndexTradingModeProducer.REFRESH_INTERVAL: 72,
         index_trading.IndexTradingModeProducer.SYNCHRONIZATION_POLICY: index_trading.SynchronizationPolicy.SELL_REMOVED_INDEX_COINS_ON_RATIO_REBALANCE.value,
         index_trading.IndexTradingModeProducer.REBALANCE_TRIGGER_MIN_PERCENT: 10.2,
+        index_trading.IndexTradingModeProducer.MIN_ORDER_SIZE_MARGIN: 3.5,
+        index_trading.IndexTradingModeProducer.ALLOW_SKIP_ASSET: True,
         index_trading.IndexTradingModeProducer.SELECTED_REBALANCE_TRIGGER_PROFILE: None,
         index_trading.IndexTradingModeProducer.REBALANCE_TRIGGER_PROFILES: [
             {
@@ -231,6 +235,8 @@ async def test_init_config_values(trading_tools):
     mode, producer, consumer, trader = await _init_mode(trading_tools, _get_config(trading_tools, update))
     assert mode.refresh_interval_days == 72
     assert mode.rebalance_trigger_min_ratio == decimal.Decimal("0.102")
+    assert mode.min_order_size_margin == decimal.Decimal("3.5")
+    assert mode.allow_skip_asset is True
     assert mode.selected_rebalance_trigger_profile is None
     assert mode.rebalance_trigger_profiles ==  [
         {
@@ -2421,9 +2427,45 @@ async def test_get_symbols_and_amounts(trading_tools):
         }
         assert get_up_to_date_price_mock.call_count == 2
 
+    # enough funds
+    trader.exchange_manager.exchange_config.traded_symbols = [
+        commons_symbols.parse_symbol(symbol)
+        for symbol in ["BTC/USDT"]
+    ]
+    mode.ensure_updated_coins_distribution()
+    mode.min_order_size_margin = decimal.Decimal("2")
+    with mock.patch.object(
+            trading_personal_data, "get_up_to_date_price", mock.AsyncMock(return_value=decimal.Decimal(1000))
+    ), mock.patch.object(
+            trading_personal_data,
+            "decimal_check_and_adapt_order_details_if_necessary",
+            mock.Mock(return_value=decimal.Decimal("1"))
+    ) as decimal_check_mock:
+        await consumer._get_symbols_and_amounts(["BTC"], {}, decimal.Decimal(3000))
+        assert decimal_check_mock.call_args[0][0] == decimal.Decimal("1.5")
+
+    # not enough funds due to too much margin
+    mode.min_order_size_margin = decimal.Decimal("10")
+    with mock.patch.object(
+            trading_personal_data, "get_up_to_date_price", mock.AsyncMock(return_value=decimal.Decimal(1000))
+    ), mock.patch.object(
+            trading_personal_data,
+            "decimal_check_and_adapt_order_details_if_necessary",
+            mock.Mock(return_value=None)
+    ) as decimal_check_mock:
+        with pytest.raises(trading_errors.MissingMinimalExchangeTradeVolume):
+            await consumer._get_symbols_and_amounts(["BTC"], {}, decimal.Decimal(3000))
+        assert decimal_check_mock.call_args[0][0] == decimal.Decimal("0.3")
+
     # not enough funds
     with pytest.raises(trading_errors.MissingMinimalExchangeTradeVolume):
         await consumer._get_symbols_and_amounts(["BTC"], {}, decimal.Decimal(0.0003))
+
+    # not enough funds but skipping allowed so it doesn't raise
+    mode.allow_skip_asset = True
+    assert await consumer._get_symbols_and_amounts(["BTC"], {}, decimal.Decimal(0.0003)) == {}
+    mode.allow_skip_asset = False
+
     with mock.patch.object(
             trading_personal_data, "get_up_to_date_price", mock.AsyncMock(return_value=decimal.Decimal(0.000000001))
     ) as get_up_to_date_price_mock:
diff --git a/packages/tentacles/Trading/Mode/profile_copy_trading_mode/config/ProfileCopyTradingMode.json b/packages/tentacles/Trading/Mode/profile_copy_trading_mode/config/ProfileCopyTradingMode.json
index f0dfb7b7b4..5a1072baf5 100644
--- a/packages/tentacles/Trading/Mode/profile_copy_trading_mode/config/ProfileCopyTradingMode.json
+++ b/packages/tentacles/Trading/Mode/profile_copy_trading_mode/config/ProfileCopyTradingMode.json
@@ -5,5 +5,7 @@
     "exchange_profile_ids": [],
     "per_exchange_profile_portfolio_ratio": 20,
     "allocation_padding_ratio": 20,
-    "new_position_only": false
+    "min_order_size_margin": 1,
+    "new_position_only": false,
+    "allow_skip_asset": true
 }
\ No newline at end of file
diff --git a/packages/tentacles/Trading/Mode/profile_copy_trading_mode/profile_distribution.py b/packages/tentacles/Trading/Mode/profile_copy_trading_mode/profile_distribution.py
index f88e9ceb81..c2f19fc4d6 100644
--- a/packages/tentacles/Trading/Mode/profile_copy_trading_mode/profile_distribution.py
+++ b/packages/tentacles/Trading/Mode/profile_copy_trading_mode/profile_distribution.py
@@ -51,7 +51,7 @@ def get_positions_to_consider(
 ) -> list[dict]:
     result = []
     for position in profile_positions:
-        if new_position_only and position.get(trading_enums.ExchangeConstantsPositionColumns.TIMESTAMP.value) is not None and position.get(trading_enums.ExchangeConstantsPositionColumns.TIMESTAMP.value) <= started_at.timestamp():
+        if new_position_only and position.get(trading_enums.ExchangeConstantsPositionColumns.TIMESTAMP.value) is not None and position.get(trading_enums.ExchangeConstantsPositionColumns.TIMESTAMP.value, 0) <= started_at.timestamp():
             # skip positions with timestamp at or before started_at (only include strictly after)
             continue
 
diff --git a/packages/tentacles/profiles/profile_copy_trading/specific_config/ProfileCopyTradingMode.json b/packages/tentacles/profiles/profile_copy_trading/specific_config/ProfileCopyTradingMode.json
index 9f26d87ab7..23abae3cd0 100644
--- a/packages/tentacles/profiles/profile_copy_trading/specific_config/ProfileCopyTradingMode.json
+++ b/packages/tentacles/profiles/profile_copy_trading/specific_config/ProfileCopyTradingMode.json
@@ -2,5 +2,6 @@
     "index_content": [],
     "rebalance_trigger_min_percent": 5,
     "refresh_interval": 1,
-    "required_strategies": []
+    "required_strategies": [],
+    "allow_skip_asset": true
 }
\ No newline at end of file
diff --git a/packages/trading/octobot_trading/modes/channel/abstract_mode_consumer.py b/packages/trading/octobot_trading/modes/channel/abstract_mode_consumer.py
index 2f4898d3ff..b39943443f 100644
--- a/packages/trading/octobot_trading/modes/channel/abstract_mode_consumer.py
+++ b/packages/trading/octobot_trading/modes/channel/abstract_mode_consumer.py
@@ -136,7 +136,7 @@ async def create_order_if_possible(self, symbol, final_note, state, **kwargs) ->
         """
         For each trader call the creator to check if order creation is possible and create it.
         Will retry once on failure
-        :return: None
+        :return: list of orders to create
         """
         self.logger.debug(f"Entering create_order_if_possible for {symbol} on {self.exchange_manager.exchange_name}")
         try: