diff --git a/resources/assets/v2/vite.config.js b/resources/assets/v2/vite.config.js
index f3f18671bb..fad196ce34 100644
--- a/resources/assets/v2/vite.config.js
+++ b/resources/assets/v2/vite.config.js
@@ -36,8 +36,8 @@ export default defineConfig(({command, mode, isSsrBuild, isPreview}) => {
let https = null;
if (command === 'serve') {
https = {
- key: fs.readFileSync(`/vagrant/tls-certificates/wildcard.sd.internal.key`),
- cert: fs.readFileSync(`/vagrant/tls-certificates/wildcard.sd.internal.crt`),
+ key: fs.readFileSync(`/Users/sander/Sites/vm/tls-certificates/wildcard.sd.internal.key`),
+ cert: fs.readFileSync(`/Users/sander/Sites/vm/tls-certificates/wildcard.sd.internal.crt`),
};
}
@@ -83,7 +83,7 @@ export default defineConfig(({command, mode, isSsrBuild, isPreview}) => {
server: {
cors: true,
- origin: 'https://firefly.sd.internal:5173',
+ origin: 'https://localhost:5173',
watch: {
usePolling: true,
},
diff --git a/resources/views/list/groups.twig b/resources/views/list/groups.twig
index ec963eff29..5c1354023f 100644
--- a/resources/views/list/groups.twig
+++ b/resources/views/list/groups.twig
@@ -165,20 +165,28 @@
{# deposit #}
{% if transaction.transaction_type_type == 'Deposit' %}
+ {# amount of deposit #}
{{ formatAmountBySymbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
+ {# foreign amount of deposit #}
{% if null != transaction.foreign_amount %}
({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
{% endif %}
+ {# native amount of deposit #}
{% 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' %}
- {{ formatAmountBySymbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
+ {# amount of transfer #}
+ {{ formatAmountBySymbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
+
+ {# foreign amount of transfer #}
{% if null != transaction.foreign_amount %}
({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
{% endif %}
+
+ {# native amount of transfer #}
{% if convertToNative and 0 != transaction.native_amount %}
({{ formatAmountBySymbol(transaction.native_amount*-1, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
{% endif %}
@@ -244,10 +252,14 @@
{# THE REST #}
{% else %}
+ {# amount of withdrawal #}
{{ formatAmountBySymbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
+
+ {# foreign amount of withdrawal #}
{% if null != transaction.foreign_amount %}
({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
{% endif %}
+ {# native amount of withdrawal #}
{% if convertToNative and 0 != transaction.native_amount %}
({{ formatAmountBySymbol(transaction.native_amount, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
{% endif %}
diff --git a/resources/views/v2/partials/dashboard/account-list.blade.php b/resources/views/v2/partials/dashboard/account-list.blade.php
index a7b2f5078d..19c999d5ec 100644
--- a/resources/views/v2/partials/dashboard/account-list.blade.php
+++ b/resources/views/v2/partials/dashboard/account-list.blade.php
@@ -9,7 +9,7 @@
|