diff --git a/app/Support/Http/Controllers/ChartGeneration.php b/app/Support/Http/Controllers/ChartGeneration.php
index 4f425483d9..e66a202364 100644
--- a/app/Support/Http/Controllers/ChartGeneration.php
+++ b/app/Support/Http/Controllers/ChartGeneration.php
@@ -81,7 +81,7 @@ trait ChartGeneration
             ];
 
             $currentStart = clone $start;
-            $range        = Steam::finalAccountBalanceInRange($account, $start, clone $end);
+            $range        = Steam::finalAccountBalanceInRange($account, $start, clone $end, $this->convertToNative);
             $previous     = array_values($range)[0];
             while ($currentStart <= $end) {
                 $format                        = $currentStart->format('Y-m-d');
diff --git a/resources/views/list/groups.twig b/resources/views/list/groups.twig
index ae6211df75..3830e007c9 100644
--- a/resources/views/list/groups.twig
+++ b/resources/views/list/groups.twig
@@ -59,14 +59,14 @@
                 <td colspan="1" style="text-align:right;border-top:1px #aaa solid;">
                     {% for sum in group.sums %}
                         {% if group.transaction_type == 'Deposit' %}
-                            {{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }}{# (TODO NATIVE1) #}{% if loop.index != group.sums|length %},{% endif %}
+                            {{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }}(TODO NATIVE group 1){% if loop.index != group.sums|length %},{% endif %}
 
                         {% elseif group.transaction_type == 'Transfer' %}
                             <span class="text-info money-transfer">
-                            {{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places, false) }}{# (TODO NATIVE2) #}{% if loop.index != group.sums|length %},{% endif %}
+                            {{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places, false) }}(TODO group 2 ){% if loop.index != group.sums|length %},{% endif %}
                             </span>
                         {% else %}
-                            {{ formatAmountBySymbol(sum.amount, sum.currency_symbol, sum.currency_decimal_places) }}{# (TODO NATIVE3) #}{% if loop.index != group.sums|length %},{% endif %}
+                            {{ formatAmountBySymbol(sum.amount, sum.currency_symbol, sum.currency_decimal_places) }}(TODO NATIVE group 3){% if loop.index != group.sums|length %},{% endif %}
                         {% endif %}
                     {% endfor %}
                 </td>
@@ -154,7 +154,9 @@
                         {% if null != transaction.foreign_amount %}
                             ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                         {% endif %}
-                        {# (TODO NATIVE1) #}
+                        {% if convertToNative and 0 != transaction.native_amount %}
+                            ({{ formatAmountBySymbol(transaction.native_amount*-1, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                        {% endif %}
                         {# transfer #}
                     {% elseif transaction.transaction_type_type == 'Transfer' %}
                         <span class="text-info money-transfer">
@@ -162,7 +164,9 @@
                             {% if null != transaction.foreign_amount %}
                                 ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
                             {% endif %}
-                            {# (TODO NATIVE2) #}
+                            {% if convertToNative and 0 != transaction.native_amount %}
+                                ({{ formatAmountBySymbol(transaction.native_amount*-1, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                            {% endif %}
                             </span>
                         {# opening balance #}
                     {% elseif transaction.transaction_type_type == 'Opening balance' %}
@@ -171,13 +175,17 @@
                             {% if null != transaction.foreign_amount %}
                                 ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                             {% endif %}
-                            {# (TODO NATIVE3) #}
+                            {% if convertToNative and 0 != transaction.native_amount %}
+                                ({{ formatAmountBySymbol(transaction.native_amount*-1, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                            {% endif %}
                         {% else %}
                             {{ formatAmountBySymbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
                             {% if null != transaction.foreign_amount %}
                                 ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                             {% endif %}
-                            {# (TODO NATIVE4) #}
+                            {% if convertToNative and 0 != transaction.native_amount %}
+                                ({{ formatAmountBySymbol(transaction.native_amount, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                            {% endif %}
                         {% endif %}
                         {# reconciliation #}
                     {% elseif transaction.transaction_type_type == 'Reconciliation' %}
@@ -186,13 +194,17 @@
                             {% if null != transaction.foreign_amount %}
                                 ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                             {% endif %}
-                            {# (TODO NATIVE5) #}
+                            {% if convertToNative and 0 != transaction.native_amount %}
+                                ({{ formatAmountBySymbol(transaction.native_amount*-1, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                            {% endif %}
                         {% else %}
                             {{ formatAmountBySymbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
                             {% if null != transaction.foreign_amount %}
                                 ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                             {% endif %}
-                            {# (TODO NATIVE6) #}
+                            {% if convertToNative and 0 != transaction.native_amount %}
+                                ({{ formatAmountBySymbol(transaction.native_amount, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                            {% endif %}
                         {% endif %}
                         {# liability credit #}
                     {% elseif transaction.transaction_type_type == 'Liability credit' %}
@@ -201,13 +213,17 @@
                             {% if null != transaction.foreign_amount %}
                                 ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                             {% endif %}
-                            {# (TODO NATIVE7) #}
+                            {% if convertToNative and 0 != transaction.native_amount %}
+                                ({{ formatAmountBySymbol(transaction.native_amount, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                            {% endif %}
                         {% else %}
                             {{ formatAmountBySymbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
                             {% if null != transaction.foreign_amount %}
                                 ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                             {% endif %}
-                            {# (TODO NATIVE8) #}
+                            {% if convertToNative and 0 != transaction.native_amount %}
+                                ({{ formatAmountBySymbol(transaction.native_amount*-1, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                            {% endif %}
                         {% endif %}
 
 
@@ -217,7 +233,9 @@
                         {% if null != transaction.foreign_amount %}
                             ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                         {% endif %}
-                        {# (TODO NATIVE9) #}
+                        {% if convertToNative and 0 != transaction.native_amount %}
+                            ({{ formatAmountBySymbol(transaction.native_amount, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                        {% endif %}
                     {% endif %}
                 </td>
                 <td style=" {{ style|raw }}">