wbportfolio 1.44.4__py2.py3-none-any.whl → 1.45.0__py2.py3-none-any.whl

wbportfolio/viewsets/assets.py

@@ -21,6 +21,7 @@ from wbcore.utils.figures import (
 from wbcore.utils.strings import format_number
 from wbfdm.contrib.metric.viewsets.mixins import InstrumentMetricMixin
 from wbfdm.models import Instrument
+
 from wbportfolio.filters import (
     AssetPositionFilter,
     AssetPositionInstrumentFilter,
@@ -45,7 +46,7 @@ from wbportfolio.models import (
     Portfolio,
     Product,
 )
-from wbportfolio.serializers import (
+from wbportfolio.serializers.assets import (
     AssetPositionAggregatedPortfolioModelSerializer,
     AssetPositionInstrumentModelSerializer,
     AssetPositionModelSerializer,
@@ -98,10 +99,10 @@ class AssetPositionModelViewSet(
         "total_value",
         "portfolio__name",
         "portfolio_created__name",
-        "underlying_instrument",
-        "underlying_instrument_name",
-        "underlying_instrument_ticker",
-        "underlying_instrument_isin",
+        "underlying_quote",
+        "underlying_quote_name",
+        "underlying_quote_ticker",
+        "underlying_quote_isin",
         "price",
         "currency__key",
         "currency_fx_rate",
@@ -113,7 +114,7 @@ class AssetPositionModelViewSet(
         "liquidity",
     ]
     ordering = ["-weighting"]
-    search_fields = ["underlying_instrument_ticker", "underlying_instrument_name", "underlying_instrument_isin"]
+    search_fields = ["underlying_quote_ticker", "underlying_quote_name", "underlying_quote_isin"]
 
     display_config_class = AssetPositionDisplayConfig
     button_config_class = AssetPositionButtonConfig
@@ -142,12 +143,12 @@ class AssetPositionModelViewSet(
                 super()
                 .get_queryset()
                 .annotate(
-                    underlying_instrument_isin=F("underlying_instrument__isin"),
-                    underlying_instrument_ticker=F("underlying_instrument__ticker"),
-                    underlying_instrument_name=F("underlying_instrument__name"),
+                    underlying_quote_isin=F("underlying_quote__isin"),
+                    underlying_quote_ticker=F("underlying_quote__ticker"),
+                    underlying_quote_name=F("underlying_quote__name"),
                 )
                 .select_related(
-                    "underlying_instrument",
+                    "underlying_quote",
                     "currency",
                     "portfolio",
                     "exchange",
@@ -170,7 +171,7 @@ class AssetPositionPortfolioModelViewSet(InstrumentMetricMixin, AssetPositionMod
         *PORTFOLIO_ESG_KEYS,
     )
     METRIC_BASKET_LABEL = "portfolio"
-    METRIC_INSTRUMENT_LABEL = "underlying_instrument"
+    METRIC_INSTRUMENT_LABEL = "underlying_quote"
     METRIC_SHOW_BY_DEFAULT = False
     METRIC_SHOW_FILTERS = True
 
@@ -210,7 +211,7 @@ class AssetPositionPortfolioModelViewSet(InstrumentMetricMixin, AssetPositionMod
                 super()
                 .get_queryset()
                 .filter(portfolio=self.portfolio)
-                .select_related("underlying_instrument", "currency", "exchange", "portfolio_created")
+                .select_related("underlying_quote", "currency", "exchange", "portfolio_created")
             )
         return AssetPosition.objects.none()
 
@@ -238,9 +239,7 @@ class AssetPositionInstrumentModelViewSet(AssetPositionModelViewSet):
         return {}
 
     def get_queryset(self):
-        qs = (
-            super().get_queryset().filter(underlying_instrument__in=self.instrument.get_descendants(include_self=True))
-        )
+        qs = super().get_queryset().filter(underlying_quote__in=self.instrument.get_descendants(include_self=True))
         if self.request.GET.get("filter_last_positions", "false") == "true":
             if self.instrument.assets.exists():
                 qs = qs.filter(date=self.instrument.assets.latest("date").date)
@@ -364,10 +363,10 @@ class ContributorPortfolioChartView(UserPortfolioRequestPermissionMixin, viewset
         )
         df = Portfolio.get_contribution_df(queryset, hedged_currency=hedged_currency)
         if not df.empty:
-            df = df[["contribution_total", "contribution_forex", "underlying_security"]].sort_values(
+            df = df[["contribution_total", "contribution_forex", "underlying_instrument"]].sort_values(
                 by="contribution_total", ascending=True
             )
-            df["instrument_id"] = df.underlying_security.apply(lambda x: Instrument.objects.get(id=x).name_repr)
+            df["instrument_id"] = df.underlying_instrument.apply(lambda x: Instrument.objects.get(id=x).name_repr)
             df_forex = df[["instrument_id", "contribution_forex"]]
             df_forex = df_forex[df_forex.contribution_forex != 0]
 
@@ -486,7 +485,7 @@ class AssetPositionUnderlyingInstrumentChartViewSet(UserPortfolioRequestPermissi
 class CompositionModelPortfolioPandasView(
     UserPortfolioRequestPermissionMixin, InternalUserPermissionMixin, ExportPandasAPIViewSet
 ):
-    IDENTIFIER = "wbportfolio:compositionmodelportfolio"
+    IDENTIFIER = "wbportfolio:topdowncomposition"
     filterset_class = CompositionModelPortfolioPandasFilter
     queryset = AssetPosition.objects.all()
 
@@ -494,22 +493,24 @@ class CompositionModelPortfolioPandasView(
     title_config_class = CompositionModelPortfolioPandasTitleConfig
     endpoint_config_class = CompositionModelPortfolioPandasEndpointConfig
 
+    @cached_property
+    def val_date(self) -> date:
+        return parse_date(self.request.GET["date"])
+
     @cached_property
     def dependant_portfolios(self):
         return Portfolio.objects.filter(
             Q(depends_on__in=[self.portfolio]) | Q(dependent_portfolios__in=[self.portfolio])
         )
 
-    @cached_property
-    def instrument_map(self) -> dict[int, str]:
-        instrument_qs = Instrument.objects.filter(
-            id__in=self.get_queryset().values("underlying_instrument__parent")
-        ).values("id", "computed_str")
-        return {item["id"]: item["computed_str"] for item in instrument_qs}
+    def get_queryset(self):
+        if self.has_portfolio_access:
+            return super().get_queryset().filter(portfolio=self.portfolio)
+        return AssetPosition.objects.none()
 
     def get_pandas_fields(self, request):
         fields = [
-            pf.PKField(key="underlying_instrument__parent", label="ID"),
+            pf.PKField(key="underlying_instrument", label="ID"),
             pf.CharField(key="underlying_instrument_repr", label="Instrument"),
         ]
         if not self.portfolio.only_weighting:
@@ -529,34 +530,44 @@ class CompositionModelPortfolioPandasView(
     search_fields = ["underlying_instrument_repr"]
     ordering_fields = ["underlying_instrument_repr", "model_portfolio"]
 
-    def get_queryset(self):
-        if self.has_portfolio_access:
-            return AssetPosition.objects.filter(portfolio__in=[*self.dependant_portfolios, self.portfolio])
-        return AssetPosition.objects.none()
-
     def get_dataframe(self, request, queryset, **kwargs):
-        df = pd.DataFrame()
-        if queryset.exists():
-            df = pd.DataFrame(
-                queryset.values("underlying_instrument__parent", "portfolio", "weighting", "shares")
-            ).pivot_table(
-                index="underlying_instrument__parent",
-                columns=["portfolio"],
-                values=["weighting", "shares"],
-                aggfunc="sum",
-                fill_value=0,
+        rows = []
+        for portfolio in [*self.dependant_portfolios, self.portfolio]:
+            rows.extend(
+                list(
+                    map(
+                        lambda x: {
+                            "underlying_instrument": x.underlying_instrument.id,
+                            "weighting": x.weighting,
+                            "shares": x.shares,
+                            "portfolio": portfolio.id,
+                        },
+                        portfolio.get_positions(self.val_date),
+                    )
+                )
             )
+        df = pd.DataFrame(rows)
+        df = df.pivot_table(
+            index="underlying_instrument",
+            columns=["portfolio"],
+            values=["weighting", "shares"],
+            aggfunc="sum",
+            fill_value=0,
+        )
+        for portfolio in self.dependant_portfolios:
+            with suppress(KeyError):
+                if portfolio.only_weighting:
+                    df["difference", portfolio.id] = df["weighting"][self.portfolio.id] - df["weighting"][portfolio.id]
+                else:
+                    df["difference", portfolio.id] = df["shares"][self.portfolio.id] - df["shares"][portfolio.id]
 
-            for portfolio in self.dependant_portfolios:
-                with suppress(KeyError):
-                    if portfolio.only_weighting:
-                        df["difference", portfolio.id] = (
-                            df["weighting"][self.portfolio.id] - df["weighting"][portfolio.id]
-                        )
-                    else:
-                        df["difference", portfolio.id] = df["shares"][self.portfolio.id] - df["shares"][portfolio.id]
-            df.columns = ["_".join([str(item) for item in col]) for col in df.columns.to_flat_index()]
-            df = df.reset_index()
-            df["underlying_instrument_repr"] = df.underlying_instrument__parent.map(self.instrument_map)
+        df.columns = ["_".join([str(item) for item in col]) for col in df.columns.to_flat_index()]
+        df = df.reset_index()
 
         return df
+
+    def manipulate_dataframe(self, df):
+        df["underlying_instrument_repr"] = df["underlying_instrument"].map(
+            dict(Instrument.objects.filter(id__in=df["underlying_instrument"]).values_list("id", "computed_str"))
+        )
+        return df

wbportfolio/viewsets/assets_and_net_new_money_progression.py

@@ -5,6 +5,7 @@ import pandas as pd
 import plotly.graph_objects as go
 from wbcore import viewsets
 from wbcrm.models.accounts import Account
+
 from wbportfolio.analysis.claims import get_assets_and_net_new_money_progression
 from wbportfolio.filters import AssetsAndNetNewMoneyProgressionFilterSet
 from wbportfolio.models.products import Product

wbportfolio/viewsets/charts/assets.py

@@ -15,7 +15,9 @@ from wbfdm.models import (
     ClassificationGroup,
     Instrument,
     InstrumentClassificationThroughModel,
+    InstrumentType,
 )
+
 from wbportfolio.filters.assets import DistributionFilter
 from wbportfolio.models import (
     AssetPosition,
@@ -68,7 +70,7 @@ class AbstractDistributionMixin:
 
     def _generate_classification_df(self, queryset):
         df = pd.DataFrame(
-            queryset.filter(underlying_security_instrument_type_key="equity").values(
+            queryset.filter(underlying_instrument__instrument_type=InstrumentType.EQUITY).values(
                 "weighting", "underlying_instrument"
             ),
             columns=["weighting", "underlying_instrument"],

wbportfolio/viewsets/configs/buttons/__init__.py

@@ -10,7 +10,7 @@ from .claims import ClaimTradeButtonConfig, ConsolidatedTradeSummaryButtonConfig
 
 from .custodians import CustodianButtonConfig
 from .fees import FeesButtonConfig
-from .portfolios import ModelPortfolioButtonConfig, PortfolioButtonConfig
+from .portfolios import PortfolioButtonConfig
 from .products import ProductButtonConfig, ProductCustomerButtonConfig
 from .registers import RegisterButtonConfig
 from .trades import (

wbportfolio/viewsets/configs/buttons/assets.py

@@ -3,6 +3,7 @@ from contextlib import suppress
 from rest_framework.reverse import reverse
 from wbcore.metadata.configs import buttons as bt
 from wbcore.metadata.configs.buttons.view_config import ButtonViewConfig
+
 from wbportfolio.models.portfolio import Portfolio, PortfolioPortfolioThroughModel
 
 

wbportfolio/viewsets/configs/buttons/custodians.py

@@ -6,6 +6,7 @@ from wbcore.metadata.configs.buttons.view_config import ButtonViewConfig
 from wbcore.metadata.configs.display.instance_display.shortcuts import (
     create_simple_display,
 )
+
 from wbportfolio.models import Custodian
 from wbportfolio.serializers import CustodianRepresentationSerializer
 

wbportfolio/viewsets/configs/buttons/mixins.py

@@ -1,15 +1,9 @@
 from contextlib import suppress
 
 from wbcore.contrib.icons import WBIcon
-from wbcore.enums import RequestType
 from wbcore.metadata.configs import buttons as bt
-from wbcore.metadata.configs.display.instance_display.shortcuts import (
-    create_simple_display,
-)
 from wbfdm.models.instruments import Instrument
 
-from .portfolios import get_portfolio_start_end_serializer_class
-
 
 class InstrumentButtonMixin:
     @classmethod
@@ -25,22 +19,9 @@ class InstrumentButtonMixin:
         with suppress(Instrument.DoesNotExist):
             instrument = Instrument.objects.get(id=pk)
             asset_instrument_btn_label = "Asset Portfolio"
-            if portfolio := instrument.portfolio:
+            if instrument.portfolio:
                 buttons.extend(
                     [
-                        bt.ActionButton(
-                            method=RequestType.PATCH,
-                            identifiers=("wbportfolio:portfolio",),
-                            key="resynchronize",
-                            label="Resynchronize/Rebalance",
-                            description_fields="""
-                            <p>Resynchronize portfolio from {{start}} to {{end}}</p>
-                            """,
-                            serializer=get_portfolio_start_end_serializer_class(portfolio),
-                            action_label="resynchronize",
-                            title="Resynchronize/Rebalance",
-                            instance_display=create_simple_display([["start"], ["end"]]),
-                        ),
                         bt.WidgetButton(key="portfolio_positions", label=asset_instrument_btn_label),
                         bt.DropDownButton(
                             label="Charts",

wbportfolio/viewsets/configs/buttons/portfolios.py

@@ -1,7 +1,7 @@
+from contextlib import suppress
 from datetime import date
 
-from django.shortcuts import get_object_or_404
-from rest_framework.reverse import reverse
+from pandas._libs.tslibs.offsets import BDay
 from wbcore import serializers as wb_serializers
 from wbcore.contrib.currency.serializers import CurrencyRepresentationSerializer
 from wbcore.contrib.icons import WBIcon
@@ -11,14 +11,28 @@ from wbcore.metadata.configs.buttons.view_config import ButtonViewConfig
 from wbcore.metadata.configs.display.instance_display.shortcuts import (
     create_simple_display,
 )
-from wbportfolio.models import Portfolio, PriceComputation
-from wbportfolio.serializers import (
-    PortfolioSynchronizationRepresentationSerializer,
-    PriceComputationRepresentationSerializer,
-)
 
+from wbportfolio.models import AssetPosition, Portfolio
+from wbportfolio.serializers import RebalancerModelSerializer
+from wbportfolio.viewsets.configs.display.rebalancing import RebalancerDisplayConfig
+
+
+class CreateModelPortfolioSerializer(wb_serializers.ModelSerializer):
+    create_index = wb_serializers.BooleanField(default=False, label="Create Underlying Index")
+    name = wb_serializers.CharField(required=True)
+    _currency = CurrencyRepresentationSerializer(source="currency")
 
-def get_portfolio_start_end_serializer_class(portfolio):
+    class Meta:
+        model = Portfolio
+        fields = (
+            "name",
+            "currency",
+            "create_index",
+            "_currency",
+        )
+
+
+def _get_portfolio_start_end_serializer_class(portfolio):
     today = date.today()
 
     class StartEndDateSerializer(wb_serializers.Serializer):
@@ -33,83 +47,83 @@ def get_portfolio_start_end_serializer_class(portfolio):
     return StartEndDateSerializer
 
 
+def _get_rebalance_serializer_class(portfolio):
+    try:
+        default_trade_date = (portfolio.assets.latest("date").date + BDay(1)).date()
+    except AssetPosition.DoesNotExist:
+        default_trade_date = date.today()
+
+    class RebalanceSerializer(wb_serializers.Serializer):
+        trade_date = wb_serializers.DateField(default=default_trade_date)
+
+    return RebalanceSerializer
+
+
 class PortfolioButtonConfig(ButtonViewConfig):
     def get_custom_instance_buttons(self):
-        portfolio_buttons = [
-            bt.WidgetButton(key="assets", label="Assets"),
-            bt.WidgetButton(key="contributor", label="Contributor"),
-            bt.WidgetButton(key="distribution_chart", label="Distribution Chart"),
-            bt.WidgetButton(key="distribution_table", label="Distribution Table"),
-            bt.WidgetButton(key="modelcomposition", label="Portfolio Composition vs. Dependant Portfolios"),
+        admin_buttons = [
+            bt.ActionButton(
+                method=RequestType.POST,
+                identifiers=("wbportfolio:portfolio",),
+                key="add_automatic_rebalancer",
+                label="Attach Rebalancer",
+                serializer=RebalancerModelSerializer,
+                action_label="Attach Rebalancer",
+                title="Attach Rebalancer",
+                instance_display=RebalancerDisplayConfig(
+                    self.view, self.request, self.instance
+                ).get_instance_display(),
+            )
         ]
-        if pk := self.view.kwargs.get("pk", None):
-            portfolio = get_object_or_404(Portfolio, pk=pk)
-
-            portfolio_buttons.append(
+        buttons = [bt.WidgetButton(key="treegraphchart", label="Visualize Tree Graph Chart")]
+        with suppress(Portfolio.DoesNotExist, KeyError):
+            portfolio = Portfolio.objects.get(id=self.view.kwargs["pk"])
+            buttons.append(
                 bt.ActionButton(
-                    method=RequestType.PATCH,
+                    method=RequestType.POST,
                     identifiers=("wbportfolio:portfolio",),
-                    key="resynchronize",
-                    label="Resynchronize/Rebalance",
-                    description_fields="""
-                    <p>Resynchronize portfolio from {{start}} to {{end}}</p>
-                    """,
-                    serializer=get_portfolio_start_end_serializer_class(portfolio),
-                    action_label="resynchronize",
-                    title="Resynchronize/Rebalance",
-                    instance_display=create_simple_display([["start"], ["end"]]),
+                    key="rebalance",
+                    label="Rebalance",
+                    serializer=_get_rebalance_serializer_class(portfolio),
+                    action_label="Rebalance",
+                    title="Rebalance",
+                    instance_display=create_simple_display([["trade_date"]]),
                 )
             )
 
-        return {
-            bt.DropDownButton(label="Portfolio", icon=WBIcon.UNFOLD.icon, buttons=tuple(portfolio_buttons)),
-        }
+            if primary_portfolio := portfolio.primary_portfolio:
+                admin_buttons.append(
+                    bt.ActionButton(
+                        method=RequestType.POST,
+                        identifiers=("wbportfolio:portfolio",),
+                        key="recompute_lookthrough",
+                        label="Recompute Look-Through Portfolio",
+                        serializer=_get_portfolio_start_end_serializer_class(primary_portfolio),
+                        action_label="Recompute Look-Through Portfolio",
+                        title="Recompute Look-Through Portfolio",
+                        instance_display=create_simple_display([["start", "end"]]),
+                    )
+                )
+            buttons.append(
+                bt.DropDownButton(label="Admin", icon=WBIcon.UNFOLD.icon, buttons=tuple(admin_buttons)),
+            )
+        return set(buttons)
 
     def get_custom_list_instance_buttons(self):
         return self.get_custom_instance_buttons()
 
-
-class CreateModelPortfolioSerializer(wb_serializers.ModelSerializer):
-    create_index = wb_serializers.BooleanField(default=False, label="Create Underlying Index")
-    name = wb_serializers.CharField(required=True)
-    _currency = CurrencyRepresentationSerializer(source="currency")
-    _portfolio_synchronization = PortfolioSynchronizationRepresentationSerializer(source="portfolio_synchronization")
-    price_computation = wb_serializers.PrimaryKeyRelatedField(queryset=PriceComputation.objects.all(), required=False)
-    _price_computation = PriceComputationRepresentationSerializer(source="price_computation")
-
-    class Meta:
-        model = Portfolio
-        dependency_map = {
-            "price_computation": ["create_index"],
-        }
-        fields = (
-            "name",
-            "currency",
-            "portfolio_synchronization",
-            "create_index",
-            "price_computation",
-            "_price_computation",
-            "_currency",
-            "_portfolio_synchronization",
-        )
-
-
-class ModelPortfolioButtonConfig(PortfolioButtonConfig):
-    # pass
-    def get_custom_buttons(self):
-        if not self.view.kwargs.get("pk", None):
-            return {
-                bt.ActionButton(
-                    method=RequestType.POST,
-                    identifiers=("wbportfolio:portfolio",),
-                    endpoint=reverse("wbportfolio:modelportfolio-createmodelportfolio", request=self.request),
-                    label="Create New Model Portfolio",
-                    serializer=CreateModelPortfolioSerializer,
-                    action_label="create",
-                    title="Create Model Portfolio",
-                    instance_display=create_simple_display(
-                        [["name", "currency", "portfolio_synchronization"], ["create_index", "price_computation", "."]]
-                    ),
-                )
-            }
-        return set()
+    # def get_custom_buttons(self):
+    #     if not self.view.kwargs.get("pk", None):
+    #         return {
+    #             bt.ActionButton(
+    #                 method=RequestType.POST,
+    #                 identifiers=("wbportfolio:portfolio",),
+    #                 endpoint=reverse("wbportfolio:portfolio-createmodelportfolio", request=self.request),
+    #                 label="Create New Model Portfolio",
+    #                 serializer=CreateModelPortfolioSerializer,
+    #                 action_label="create",
+    #                 title="Create Model Portfolio",
+    #                 instance_display=create_simple_display([["name", "currency"], ["create_index", "."]]),
+    #             )
+    #         }
+    #     return set()

wbportfolio/viewsets/configs/buttons/signals.py

@@ -11,6 +11,7 @@ from wbcore.metadata.configs.display import create_simple_display
 from wbcore.signals.instance_buttons import add_instance_button
 from wbcrm.viewsets import AccountModelViewSet
 from wbfdm.viewsets.instruments import InstrumentModelViewSet
+
 from wbportfolio.serializers.reconciliations import AccountReconciliationModelSerializer
 
 from .mixins import InstrumentButtonMixin

wbportfolio/viewsets/configs/buttons/trades.py

@@ -4,6 +4,7 @@ from wbcore.enums import RequestType
 from wbcore.metadata.configs import buttons as bt
 from wbcore.metadata.configs.buttons.view_config import ButtonViewConfig
 from wbfdm.models import Instrument
+
 from wbportfolio.models import TradeProposal
 
 

wbportfolio/viewsets/configs/display/__init__.py

@@ -1,4 +1,5 @@
 from .adjustments import AdjustmentDisplayConfig
+from .rebalancing import RebalancerDisplayConfig
 from .assets import (
     AssetPositionDisplayConfig,
     AssetPositionInstrumentDisplayConfig,
@@ -23,9 +24,9 @@ from .fees import (
     FeesPortfolioDisplayConfig,
 )
 from .portfolios import (
-    ModelPortfolioDisplayConfig,
     PortfolioDisplayConfig,
     PortfolioPortfolioThroughModelDisplayConfig,
+    TopDownPortfolioCompositionPandasDisplayConfig
 )
 from .positions import (
     AggregatedAssetPositionLiquidityDisplayConfig,

wbportfolio/viewsets/configs/display/adjustments.py

@@ -8,6 +8,7 @@ from wbcore.metadata.configs.display.instance_display.shortcuts import (
 )
 from wbcore.metadata.configs.display.instance_display.utils import repeat_field
 from wbcore.metadata.configs.display.view_config import DisplayViewConfig
+
 from wbportfolio.models import Adjustment
 
 

wbportfolio/viewsets/configs/display/assets.py

@@ -73,9 +73,9 @@ class AssetPositionPortfolioDisplayConfig(AssetPositionDisplayConfig):
                     open_by_default=False,
                     key=None,
                     children=[
-                        dp.Field(key="underlying_instrument_name", label="Name"),
-                        dp.Field(key="underlying_instrument_isin", label="ISIN"),
-                        dp.Field(key="underlying_instrument_ticker", label="Ticker"),
+                        dp.Field(key="underlying_quote_name", label="Name"),
+                        dp.Field(key="underlying_quote_isin", label="ISIN"),
+                        dp.Field(key="underlying_quote_ticker", label="Ticker"),
                         dp.Field(key="exchange", label="Exchange", width=Unit.PIXEL(250)),
                     ],
                 ),
@@ -88,14 +88,15 @@ class AssetPositionPortfolioDisplayConfig(AssetPositionDisplayConfig):
                         dp.Field(key="price", label="Price"),
                         dp.Field(key="shares", label="Shares"),
                         dp.Field(key="currency_fx_rate", label="Currency Rate", show="open"),
-                        dp.Field(key="total_value", label="Total Value", show="open"),
                         dp.Field(
                             key="total_value_fx_portfolio",
                             label="Total Value Portfolio",
                             width=Unit.PIXEL(150),
-                            show="open",
                         ),
-                        dp.Field(key="total_value_fx_usd", label="Total Value ($)", width=Unit.PIXEL(150)),
+                        dp.Field(key="total_value", label="Total Value", show="open"),
+                        dp.Field(
+                            key="total_value_fx_usd", label="Total Value ($)", width=Unit.PIXEL(150), show="open"
+                        ),
                     ],
                 ),
                 dp.Field(

wbportfolio/viewsets/configs/display/claim.py

@@ -10,6 +10,7 @@ from wbcore.metadata.configs.display.instance_display.styles import Style
 from wbcore.metadata.configs.display.instance_display.utils import repeat
 from wbcore.metadata.configs.display.view_config import DisplayViewConfig
 from wbcore.metadata.configs.display.windows import Window
+
 from wbportfolio.models.transactions.claim import Claim