From b4a6c6fcbeed8f885f84a0df23040598794065d9 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Fri, 4 Aug 2023 19:11:01 +0200
Subject: [PATCH] Fix https://github.com/firefly-iii/firefly-iii/issues/7818

---
 resources/views/transactions/show.twig | 36 ++++++++++++++------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index c72cdd4731..c126d55379 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -18,35 +18,35 @@
                         <ul class="dropdown-menu">
                             {# edit + delete #}
                             <li><a href="{{ route('transactions.edit', [transactionGroup.id]) }}"><span
-                                            class="fa fa-pencil"></span> {{ 'edit'|_ }}</a></li>
+                                        class="fa fa-pencil"></span> {{ 'edit'|_ }}</a></li>
                             <li><a href="{{ route('transactions.delete', [transactionGroup.id]) }}"><span
-                                            class="fa fa-trash"></span> {{ 'delete'|_ }}</a></li>
+                                        class="fa fa-trash"></span> {{ 'delete'|_ }}</a></li>
                             <li role="separator" class="divider"></li>
 
                             {# convert to different type #}
                             {% if groupArray.transactions[0].type != 'withdrawal' %}
                                 <li>
                                     <a href="{{ route('transactions.convert.index', ['withdrawal', transactionGroup.id]) }}"><span
-                                                class="fa fa-exchange"></span> {{ 'convert_to_withdrawal'|_ }}</a></li>
+                                            class="fa fa-exchange"></span> {{ 'convert_to_withdrawal'|_ }}</a></li>
                             {% endif %}
 
                             {% if groupArray.transactions[0].type != 'deposit' %}
                                 <li>
                                     <a href="{{ route('transactions.convert.index', ['deposit', transactionGroup.id]) }}"><span
-                                                class="fa fa-exchange"></span> {{ 'convert_to_deposit'|_ }}</a></li>
+                                            class="fa fa-exchange"></span> {{ 'convert_to_deposit'|_ }}</a></li>
                             {% endif %}
 
                             {% if groupArray.transactions[0].type != 'transfer' %}
                                 <li>
                                     <a href="{{ route('transactions.convert.index', ['transfer', transactionGroup.id]) }}"><span
-                                                class="fa fa-exchange"></span> {{ 'convert_to_transfer'|_ }}</a></li>
+                                            class="fa fa-exchange"></span> {{ 'convert_to_transfer'|_ }}</a></li>
                             {% endif %}
 
                             {#  clone #}
                             {% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %}
                                 <li role="separator" class="divider"></li>
                                 <li><a href="#" class="clone-transaction" data-id="{{ transactionGroup.id }}"><span
-                                                class="fa fa-copy"></span> {{ 'clone'|_ }}</a></li>
+                                            class="fa fa-copy"></span> {{ 'clone'|_ }}</a></li>
                             {% endif %}
 
                         </ul>
@@ -147,8 +147,10 @@
                             <td style="width:30%;">{{ 'total_amount'|_ }}</td>
                             <td>
                                 {% for amount in amounts %}
-                                    {% if first.transactiontype.type == 'Withdrawal' or first.transactiontype.type == 'Deposit' %}
+                                    {% if first.transactiontype.type == 'Withdrawal' %}
                                         {{ formatAmountBySymbol(amount.amount*-1,amount.symbol, amount.decimal_places) }}{% if loop.index0 != amounts|length -1 %}, {% endif %}
+                                    {% elseif first.transactiontype.type == 'Deposit' %}
+                                        {{ formatAmountBySymbol(amount.amount,amount.symbol, amount.decimal_places) }}{% if loop.index0 != amounts|length -1 %}, {% endif %}
                                     {% elseif first.transactiontype.type == 'Transfer' %}
                                         <span class="text-info money-transfer">
                                         {{ formatAmountBySymbol(amount.amount, amount.symbol, amount.decimal_places, false) }}{% if loop.index0 != amounts|length -1 %}, {% endif %}
@@ -213,29 +215,29 @@
                             <ul class="dropdown-menu">
                                 {# edit + delete #}
                                 <li><a href="{{ route('transactions.edit', [transactionGroup.id]) }}"><span
-                                                class="fa fa-pencil"></span> {{ 'edit'|_ }}</a></li>
+                                            class="fa fa-pencil"></span> {{ 'edit'|_ }}</a></li>
                                 <li><a href="{{ route('transactions.delete', [transactionGroup.id]) }}"><span
-                                                class="fa fa-trash"></span> {{ 'delete'|_ }}</a></li>
+                                            class="fa fa-trash"></span> {{ 'delete'|_ }}</a></li>
                                 <li role="separator" class="divider"></li>
 
                                 {# convert to different type #}
                                 {% if groupArray.transactions[0].type != 'withdrawal' %}
                                     <li>
                                         <a href="{{ route('transactions.convert.index', ['withdrawal', transactionGroup.id]) }}"><span
-                                                    class="fa fa-exchange"></span> {{ 'convert_to_withdrawal'|_ }}</a>
+                                                class="fa fa-exchange"></span> {{ 'convert_to_withdrawal'|_ }}</a>
                                     </li>
                                 {% endif %}
 
                                 {% if groupArray.transactions[0].type != 'deposit' %}
                                     <li>
                                         <a href="{{ route('transactions.convert.index', ['deposit', transactionGroup.id]) }}"><span
-                                                    class="fa fa-exchange"></span> {{ 'convert_to_deposit'|_ }}</a></li>
+                                                class="fa fa-exchange"></span> {{ 'convert_to_deposit'|_ }}</a></li>
                                 {% endif %}
 
                                 {% if groupArray.transactions[0].type != 'transfer' %}
                                     <li>
                                         <a href="{{ route('transactions.convert.index', ['transfer', transactionGroup.id]) }}"><span
-                                                    class="fa fa-exchange"></span> {{ 'convert_to_transfer'|_ }}</a>
+                                                class="fa fa-exchange"></span> {{ 'convert_to_transfer'|_ }}</a>
                                     </li>
                                 {% endif %}
 
@@ -243,20 +245,20 @@
                                 {% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %}
                                     <li role="separator" class="divider"></li>
                                     <li><a href="#" data-id="{{ transactionGroup.id }}" class="clone-transaction"><span
-                                                    class="fa fa-copy"></span> {{ 'clone'|_ }}</a></li>
+                                                class="fa fa-copy"></span> {{ 'clone'|_ }}</a></li>
                                 {% endif %}
 
                                 <li><a href="#" class="link-modal"
                                        data-journal="{{ journal.transaction_journal_id }}"><span
-                                                class="fa fa-fw fa-link"></span>{{ 'link_transaction'|_ }}</a></li>
+                                            class="fa fa-fw fa-link"></span>{{ 'link_transaction'|_ }}</a></li>
                                 <li role="separator" class="divider"></li>
                                 <li>
                                     <a href="{{ route('rules.create-from-journal', [journal.transaction_journal_id]) }}"><span
-                                                class="fa fa-fw fa-random"></span>{{ 'create_rule_from_transaction'|_ }}
+                                            class="fa fa-fw fa-random"></span>{{ 'create_rule_from_transaction'|_ }}
                                     </a></li>
                                 <li>
                                     <a href="{{ route('recurring.create-from-journal', [journal.transaction_journal_id]) }}"><span
-                                                class="fa fa-fw fa-paint-brush"></span>{{ 'create_recurring_from_transaction'|_ }}
+                                            class="fa fa-fw fa-paint-brush"></span>{{ 'create_recurring_from_transaction'|_ }}
                                     </a></li>
                             </ul>
                         </div>
@@ -411,7 +413,7 @@
                                         <td style="width:120px;">
                                             <div class="btn-group btn-group-xs">
                                                 <a href="#" class="btn btn-default switch-link" data-id="{{ link.id }}"><span
-                                                            class="fa fa-fw fa-arrows-h"></span></a>
+                                                        class="fa fa-fw fa-arrows-h"></span></a>
                                                 <a href="{{ route('transactions.link.delete', [link.id]) }}"
                                                    class="btn btn-danger"><span class="fa fa-trash"></span></a>
                                             </div>