Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

# Conflicts: # app/Support/Steam.php
2025-09-16 09:51:16 +00:00 · 2025-02-04 21:28:43 +01:00
parent 35a8fa5f02 2297589dca
commit 81173e8340
7 changed files with 166 additions and 161 deletions
--- a/app/Helpers/Collector/GroupCollector.php
+++ b/app/Helpers/Collector/GroupCollector.php
@@ -100,7 +100,7 @@ class GroupCollector implements GroupCollectorInterface
            'category_id',
            'budget_id',
        ];
-        $this->stringFields         = ['amount', 'foreign_amount','native_amount','native_foreign_amount'];
+        $this->stringFields         = ['amount', 'foreign_amount', 'native_amount', 'native_foreign_amount'];
        $this->total                = 0;
        $this->fields               = [
            // group
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -41,8 +41,8 @@ class Steam
 {
    public function getAccountCurrency(Account $account): ?TransactionCurrency
    {
-        $type = $account->accountType->type;
-        $list = config('firefly.valid_currency_account_types');
+        $type   = $account->accountType->type;
+        $list   = config('firefly.valid_currency_account_types');

        // return null if not in this list.
        if (!in_array($type, $list, true)) {
@@ -64,7 +64,7 @@ class Steam
        Log::debug(sprintf('finalAccountBalanceInRange(#%d, %s, %s)', $account->id, $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));

        // set up cache
-        $cache = new CacheProperties();
+        $cache                = new CacheProperties();
        $cache->addProperty($account->id);
        $cache->addProperty('final-balance-in-range');
        $cache->addProperty($start);
@@ -73,26 +73,26 @@ class Steam
            // return $cache->get();
        }

-        $balances        = [];
-        $formatted       = $start->format('Y-m-d');
-        $startBalance    = $this->finalAccountBalance($account, $start);
-        $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
-        $accountCurrency = $this->getAccountCurrency($account);
-        $hasCurrency     = null !== $accountCurrency;
-        $currency        = $accountCurrency ?? $defaultCurrency;
+        $balances             = [];
+        $formatted            = $start->format('Y-m-d');
+        $startBalance         = $this->finalAccountBalance($account, $start);
+        $defaultCurrency      = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
+        $accountCurrency      = $this->getAccountCurrency($account);
+        $hasCurrency          = null !== $accountCurrency;
+        $currency             = $accountCurrency ?? $defaultCurrency;
        Log::debug(sprintf('Currency is %s', $currency->code));
        if (!$hasCurrency) {
            Log::debug(sprintf('Also set start balance in %s', $defaultCurrency->code));
            $startBalance[$defaultCurrency->code] ??= '0';
        }
-        $currencies = [
+        $currencies           = [
            $currency->id        => $currency,
            $defaultCurrency->id => $defaultCurrency,
        ];


        $startBalance[$currency->code] ??= '0';
-        $balances[$formatted]          = $startBalance;
+        $balances[$formatted] = $startBalance;
        Log::debug('Final start balance: ', $startBalance);


@@ -116,6 +116,7 @@ class Steam
        $currentBalance = $startBalance;
        $converter = new ExchangeRateConverter();

+
        /** @var Transaction $entry */
        foreach ($set as $entry) {
            // normal, native and foreign amount
@@ -126,7 +127,7 @@ class Steam
            $currencies[$entry->transaction_currency_id] ??= TransactionCurrency::find($entry->transaction_currency_id);

            /** @var TransactionCurrency $entryCurrency */
-            $entryCurrency = $currencies[$entry->transaction_currency_id];
+            $entryCurrency                      = $currencies[$entry->transaction_currency_id];

            Log::debug(sprintf('Processing transaction(s) on date %s', $carbon->format('Y-m-d H:i:s')));
            $currentBalance[$entryCurrency->code] ??= '0';
@@ -147,7 +148,6 @@ class Steam
                }
            }

-
 //            // if convert to native, if NOT convert to native.
 //            if ($convertToNative) {
 //                // convert for this day to native
@@ -184,6 +184,7 @@ class Steam
 //                // add to GBP, as expected.
 //                $currentBalance[$entryCurrency->code] = bcadd($currentBalance[$entryCurrency->code] ?? '0', $modified);
 //            }
+
            $balances[$carbon->format('Y-m-d')] = $currentBalance;
            Log::debug('Updated entry', $currentBalance);
        }
@@ -222,10 +223,10 @@ class Steam
        // Log::debug(sprintf('Trying bcround("%s",%d)', $number, $precision));
        if (str_contains($number, '.')) {
            if ('-' !== $number[0]) {
-                return bcadd($number, '0.' . str_repeat('0', $precision) . '5', $precision);
+                return bcadd($number, '0.'.str_repeat('0', $precision).'5', $precision);
            }

-            return bcsub($number, '0.' . str_repeat('0', $precision) . '5', $precision);
+            return bcsub($number, '0.'.str_repeat('0', $precision).'5', $precision);
        }

        return $number;
@@ -313,31 +314,32 @@ class Steam
     */
    public function finalAccountBalance(Account $account, Carbon $date): array
    {
-        $cache = new CacheProperties();
+        $cache             = new CacheProperties();
        $cache->addProperty($account->id);
        $cache->addProperty($date);
        if ($cache->has()) {
-            //return $cache->get();
+            // return $cache->get();
        }

        Log::debug(sprintf('Now in finalAccountBalance(#%d, "%s", "%s")', $account->id, $account->name, $date->format('Y-m-d H:i:s')));

-        $native          = Amount::getNativeCurrencyByUserGroup($account->user->userGroup);
-        $convertToNative = Amount::convertToNative($account->user);
-        $accountCurrency = $this->getAccountCurrency($account);
-        $hasCurrency     = null !== $accountCurrency;
-        $currency        = $hasCurrency ? $accountCurrency : $native;
-        $return          = [
+        $native            = Amount::getNativeCurrencyByUserGroup($account->user->userGroup);
+        $convertToNative   = Amount::convertToNative($account->user);
+        $accountCurrency   = $this->getAccountCurrency($account);
+        $hasCurrency       = null !== $accountCurrency;
+        $currency          = $hasCurrency ? $accountCurrency : $native;
+        $return            = [
            'balance'        => '0',
            'native_balance' => '0',
        ];
        // balance(s) in other (all) currencies.
-        $array  = $account->transactions()
-                          ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                          ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')
-                          ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))
-                          ->get(['transaction_currencies.code', 'transactions.amount'])->toArray();
-        $others = $this->groupAndSumTransactions($array, 'code', 'amount');
+        $array             = $account->transactions()
+            ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+            ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')
+            ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))
+            ->get(['transaction_currencies.code', 'transactions.amount'])->toArray()
+        ;
+        $others            = $this->groupAndSumTransactions($array, 'code', 'amount');
        Log::debug('All balances are (joined)', $others);
        // if there is no request to convert, take this as "balance" and "native_balance".
        if (!$convertToNative) {
@@ -348,7 +350,7 @@ class Steam
        // if there is a request to convert, convert to "native_balance" and use "balance" for whichever amount is in the native currency.
        if ($convertToNative) {
            $return['balance']        = $others[$native->code] ?? '0';
-            $return['native_balance'] = $this->convertAllBalances($others, $native, $date);// todo sum all and convert.
+            $return['native_balance'] = $this->convertAllBalances($others, $native, $date); // todo sum all and convert.
            Log::debug(sprintf('Set balance to %s and native_balance to %s', $return['balance'], $return['native_balance']));
        }

@@ -375,20 +377,21 @@ class Steam
        //            $return['native_balance'] = $return['balance'];
        //        }

-//        if (!$hasCurrency && array_key_exists('balance', $return)) {
-//            //            Log::debug('Account has no currency preference, dropping balance in favor of native balance.');
-//            $sum                      = bcadd($return['balance'], $return['native_balance']);
-//            //            Log::debug(sprintf('%s + %s = %s', $return['balance'], $return['native_balance'], $sum));
-//            $return['native_balance'] = $sum;
-//            unset($return['balance']);
-//        }
-        $final           = array_merge($return, $others);
-//        // Log::debug('Return is', $final);
+        //        if (!$hasCurrency && array_key_exists('balance', $return)) {
+        //            //            Log::debug('Account has no currency preference, dropping balance in favor of native balance.');
+        //            $sum                      = bcadd($return['balance'], $return['native_balance']);
+        //            //            Log::debug(sprintf('%s + %s = %s', $return['balance'], $return['native_balance'], $sum));
+        //            $return['native_balance'] = $sum;
+        //            unset($return['balance']);
+        //        }
+        $final             = array_merge($return, $others);
+        //        // Log::debug('Return is', $final);

        $cache->store($final);
+
        return $final;

-        //return array_merge($return, $others);
+        // return array_merge($return, $others);
        // Log::debug('Return is', $final);
    }

@@ -492,15 +495,15 @@ class Steam
    {
        $list = [];

-        $set = auth()->user()->transactions()
-                     ->whereIn('transactions.account_id', $accounts)
-                     ->groupBy(['transactions.account_id', 'transaction_journals.user_id'])
-                     ->get(['transactions.account_id', \DB::raw('MAX(transaction_journals.date) AS max_date')]) // @phpstan-ignore-line
+        $set  = auth()->user()->transactions()
+            ->whereIn('transactions.account_id', $accounts)
+            ->groupBy(['transactions.account_id', 'transaction_journals.user_id'])
+            ->get(['transactions.account_id', \DB::raw('MAX(transaction_journals.date) AS max_date')]) // @phpstan-ignore-line
        ;

        /** @var Transaction $entry */
        foreach ($set as $entry) {
-            $date = new Carbon($entry->max_date, config('app.timezone'));
+            $date                           = new Carbon($entry->max_date, config('app.timezone'));
            $date->setTimezone(config('app.timezone'));
            $list[(int) $entry->account_id] = $date;
        }
@@ -575,9 +578,9 @@ class Steam
    public function getSafeUrl(string $unknownUrl, string $safeUrl): string
    {
        // Log::debug(sprintf('getSafeUrl(%s, %s)', $unknownUrl, $safeUrl));
-        $returnUrl   = $safeUrl;
-        $unknownHost = parse_url($unknownUrl, PHP_URL_HOST);
-        $safeHost    = parse_url($safeUrl, PHP_URL_HOST);
+        $returnUrl      = $safeUrl;
+        $unknownHost    = parse_url($unknownUrl, PHP_URL_HOST);
+        $safeHost       = parse_url($safeUrl, PHP_URL_HOST);

        if (null !== $unknownHost && $unknownHost === $safeHost) {
            $returnUrl = $unknownUrl;
@@ -614,7 +617,7 @@ class Steam
     */
    public function floatalize(string $value): string
    {
-        $value = strtoupper($value);
+        $value  = strtoupper($value);
        if (!str_contains($value, 'E')) {
            return $value;
        }
@@ -693,18 +696,20 @@ class Steam
        return $amount;
    }

-    private function convertAllBalances(array $others, TransactionCurrency $native, Carbon $date): string {
-        $total = '0';
-        $converter                = new ExchangeRateConverter();
-        foreach($others as $key => $amount) {
+    private function convertAllBalances(array $others, TransactionCurrency $native, Carbon $date): string
+    {
+        $total     = '0';
+        $converter = new ExchangeRateConverter();
+        foreach ($others as $key => $amount) {
            $currency = TransactionCurrency::where('code', $key)->first();
-            if(null === $currency) {
+            if (null === $currency) {
                continue;
            }
-            $current     = $converter->convert($currency, $native, $date, $amount);
+            $current  = $converter->convert($currency, $native, $date, $amount);
            Log::debug(sprintf('Convert %s %s to %s %s', $currency->code, $amount, $native->code, $current));
-            $total = bcadd($current, $total);
+            $total    = bcadd($current, $total);
        }
+
        return $total;
    }
 }
--- a/composer.lock
+++ b/composer.lock
@@ -1571,16 +1571,16 @@
        },
        {
            "name": "guzzlehttp/uri-template",
-            "version": "v1.0.3",
+            "version": "v1.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/uri-template.git",
-                "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c"
+                "reference": "30e286560c137526eccd4ce21b2de477ab0676d2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/ecea8feef63bd4fef1f037ecb288386999ecc11c",
-                "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c",
+                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/30e286560c137526eccd4ce21b2de477ab0676d2",
+                "reference": "30e286560c137526eccd4ce21b2de477ab0676d2",
                "shasum": ""
            },
            "require": {
@@ -1637,7 +1637,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/uri-template/issues",
-                "source": "https://github.com/guzzle/uri-template/tree/v1.0.3"
+                "source": "https://github.com/guzzle/uri-template/tree/v1.0.4"
            },
            "funding": [
                {
@@ -1653,7 +1653,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-12-03T19:50:20+00:00"
+            "time": "2025-02-03T10:55:03+00:00"
        },
        {
            "name": "jc5/google2fa-laravel",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -81,7 +81,7 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2025-02-03',
+    'version'                      => 'develop/2025-02-04',
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 25,

--- a/package-lock.json
+++ b/package-lock.json
@@ -2591,9 +2591,9 @@
            }
        },
        "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.0.tgz",
-            "integrity": "sha512-Eeao7ewDq79jVEsrtWIj5RNqB8p2knlm9fhR6uJ2gqP7UfbLrTrxevudVrEPDM7Wkpn/HpRC2QfazH7MXLz3vQ==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.2.tgz",
+            "integrity": "sha512-6Fyg9yQbwJR+ykVdT9sid1oc2ewejS6h4wzQltmJfSW53N60G/ah9pngXGANdy9/aaE/TcUFpWosdm7JXS1WTQ==",
            "cpu": [
                "arm"
            ],
@@ -2605,9 +2605,9 @@
            ]
        },
        "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.0.tgz",
-            "integrity": "sha512-yVh0Kf1f0Fq4tWNf6mWcbQBCLDpDrDEl88lzPgKhrgTcDrTtlmun92ywEF9dCjmYO3EFiSuJeeo9cYRxl2FswA==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.2.tgz",
+            "integrity": "sha512-K5GfWe+vtQ3kyEbihrimM38UgX57UqHp+oME7X/EX9Im6suwZfa7Hsr8AtzbJvukTpwMGs+4s29YMSO3rwWtsw==",
            "cpu": [
                "arm64"
            ],
@@ -2619,9 +2619,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.0.tgz",
-            "integrity": "sha512-gCs0ErAZ9s0Osejpc3qahTsqIPUDjSKIyxK/0BGKvL+Tn0n3Kwvj8BrCv7Y5sR1Ypz1K2qz9Ny0VvkVyoXBVUQ==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.2.tgz",
+            "integrity": "sha512-PSN58XG/V/tzqDb9kDGutUruycgylMlUE59f40ny6QIRNsTEIZsrNQTJKUN2keMMSmlzgunMFqyaGLmly39sug==",
            "cpu": [
                "arm64"
            ],
@@ -2633,9 +2633,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.0.tgz",
-            "integrity": "sha512-aIB5Anc8hngk15t3GUkiO4pv42ykXHfmpXGS+CzM9CTyiWyT8HIS5ygRAy7KcFb/wiw4Br+vh1byqcHRTfq2tQ==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.2.tgz",
+            "integrity": "sha512-gQhK788rQJm9pzmXyfBB84VHViDERhAhzGafw+E5mUpnGKuxZGkMVDa3wgDFKT6ukLC5V7QTifzsUKdNVxp5qQ==",
            "cpu": [
                "x64"
            ],
@@ -2647,9 +2647,9 @@
            ]
        },
        "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.0.tgz",
-            "integrity": "sha512-kpdsUdMlVJMRMaOf/tIvxk8TQdzHhY47imwmASOuMajg/GXpw8GKNd8LNwIHE5Yd1onehNpcUB9jHY6wgw9nHQ==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.2.tgz",
+            "integrity": "sha512-eiaHgQwGPpxLC3+zTAcdKl4VsBl3r0AiJOd1Um/ArEzAjN/dbPK1nROHrVkdnoE6p7Svvn04w3f/jEZSTVHunA==",
            "cpu": [
                "arm64"
            ],
@@ -2661,9 +2661,9 @@
            ]
        },
        "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.0.tgz",
-            "integrity": "sha512-D0RDyHygOBCQiqookcPevrvgEarN0CttBecG4chOeIYCNtlKHmf5oi5kAVpXV7qs0Xh/WO2RnxeicZPtT50V0g==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.2.tgz",
+            "integrity": "sha512-lhdiwQ+jf8pewYOTG4bag0Qd68Jn1v2gO1i0mTuiD+Qkt5vNfHVK/jrT7uVvycV8ZchlzXp5HDVmhpzjC6mh0g==",
            "cpu": [
                "x64"
            ],
@@ -2675,9 +2675,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.0.tgz",
-            "integrity": "sha512-mCIw8j5LPDXmCOW8mfMZwT6F/Kza03EnSr4wGYEswrEfjTfVsFOxvgYfuRMxTuUF/XmRb9WSMD5GhCWDe2iNrg==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.2.tgz",
+            "integrity": "sha512-lfqTpWjSvbgQP1vqGTXdv+/kxIznKXZlI109WkIFPbud41bjigjNmOAAKoazmRGx+k9e3rtIdbq2pQZPV1pMig==",
            "cpu": [
                "arm"
            ],
@@ -2689,9 +2689,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.0.tgz",
-            "integrity": "sha512-AwwldAu4aCJPob7zmjuDUMvvuatgs8B/QiVB0KwkUarAcPB3W+ToOT+18TQwY4z09Al7G0BvCcmLRop5zBLTag==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.2.tgz",
+            "integrity": "sha512-RGjqULqIurqqv+NJTyuPgdZhka8ImMLB32YwUle2BPTDqDoXNgwFjdjQC59FbSk08z0IqlRJjrJ0AvDQ5W5lpw==",
            "cpu": [
                "arm"
            ],
@@ -2703,9 +2703,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.0.tgz",
-            "integrity": "sha512-e7kDUGVP+xw05pV65ZKb0zulRploU3gTu6qH1qL58PrULDGxULIS0OSDQJLH7WiFnpd3ZKUU4VM3u/Z7Zw+e7Q==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.2.tgz",
+            "integrity": "sha512-ZvkPiheyXtXlFqHpsdgscx+tZ7hoR59vOettvArinEspq5fxSDSgfF+L5wqqJ9R4t+n53nyn0sKxeXlik7AY9Q==",
            "cpu": [
                "arm64"
            ],
@@ -2717,9 +2717,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.0.tgz",
-            "integrity": "sha512-SXYJw3zpwHgaBqTXeAZ31qfW/v50wq4HhNVvKFhRr5MnptRX2Af4KebLWR1wpxGJtLgfS2hEPuALRIY3LPAAcA==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.2.tgz",
+            "integrity": "sha512-UlFk+E46TZEoxD9ufLKDBzfSG7Ki03fo6hsNRRRHF+KuvNZ5vd1RRVQm8YZlGsjcJG8R252XFK0xNPay+4WV7w==",
            "cpu": [
                "arm64"
            ],
@@ -2731,9 +2731,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.0.tgz",
-            "integrity": "sha512-e5XiCinINCI4RdyU3sFyBH4zzz7LiQRvHqDtRe9Dt8o/8hTBaYpdPimayF00eY2qy5j4PaaWK0azRgUench6WQ==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.2.tgz",
+            "integrity": "sha512-hJhfsD9ykx59jZuuoQgYT1GEcNNi3RCoEmbo5OGfG8RlHOiVS7iVNev9rhLKh7UBYq409f4uEw0cclTXx8nh8Q==",
            "cpu": [
                "loong64"
            ],
@@ -2745,9 +2745,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.0.tgz",
-            "integrity": "sha512-3SWN3e0bAsm9ToprLFBSro8nJe6YN+5xmB11N4FfNf92wvLye/+Rh5JGQtKOpwLKt6e61R1RBc9g+luLJsc23A==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.2.tgz",
+            "integrity": "sha512-g/O5IpgtrQqPegvqopvmdCF9vneLE7eqYfdPWW8yjPS8f63DNam3U4ARL1PNNB64XHZDHKpvO2Giftf43puB8Q==",
            "cpu": [
                "ppc64"
            ],
@@ -2759,9 +2759,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.0.tgz",
-            "integrity": "sha512-B1Oqt3GLh7qmhvfnc2WQla4NuHlcxAD5LyueUi5WtMc76ZWY+6qDtQYqnxARx9r+7mDGfamD+8kTJO0pKUJeJA==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.2.tgz",
+            "integrity": "sha512-bSQijDC96M6PuooOuXHpvXUYiIwsnDmqGU8+br2U7iPoykNi9JtMUpN7K6xml29e0evK0/g0D1qbAUzWZFHY5Q==",
            "cpu": [
                "riscv64"
            ],
@@ -2773,9 +2773,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.0.tgz",
-            "integrity": "sha512-UfUCo0h/uj48Jq2lnhX0AOhZPSTAq3Eostas+XZ+GGk22pI+Op1Y6cxQ1JkUuKYu2iU+mXj1QjPrZm9nNWV9rg==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.2.tgz",
+            "integrity": "sha512-49TtdeVAsdRuiUHXPrFVucaP4SivazetGUVH8CIxVsNsaPHV4PFkpLmH9LeqU/R4Nbgky9lzX5Xe1NrzLyraVA==",
            "cpu": [
                "s390x"
            ],
@@ -2787,9 +2787,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.0.tgz",
-            "integrity": "sha512-chZLTUIPbgcpm+Z7ALmomXW8Zh+wE2icrG+K6nt/HenPLmtwCajhQC5flNSk1Xy5EDMt/QAOz2MhzfOfJOLSiA==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.2.tgz",
+            "integrity": "sha512-j+jFdfOycLIQ7FWKka9Zd3qvsIyugg5LeZuHF6kFlXo6MSOc6R1w37YUVy8VpAKd81LMWGi5g9J25P09M0SSIw==",
            "cpu": [
                "x64"
            ],
@@ -2801,9 +2801,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.0.tgz",
-            "integrity": "sha512-jo0UolK70O28BifvEsFD/8r25shFezl0aUk2t0VJzREWHkq19e+pcLu4kX5HiVXNz5qqkD+aAq04Ct8rkxgbyQ==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.2.tgz",
+            "integrity": "sha512-aDPHyM/D2SpXfSNCVWCxyHmOqN9qb7SWkY1+vaXqMNMXslZYnwh9V/UCudl6psyG0v6Ukj7pXanIpfZwCOEMUg==",
            "cpu": [
                "x64"
            ],
@@ -2815,9 +2815,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.0.tgz",
-            "integrity": "sha512-Vmg0NhAap2S54JojJchiu5An54qa6t/oKT7LmDaWggpIcaiL8WcWHEN6OQrfTdL6mQ2GFyH7j2T5/3YPEDOOGA==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.2.tgz",
+            "integrity": "sha512-LQRkCyUBnAo7r8dbEdtNU08EKLCJMgAk2oP5H3R7BnUlKLqgR3dUjrLBVirmc1RK6U6qhtDw29Dimeer8d5hzQ==",
            "cpu": [
                "arm64"
            ],
@@ -2829,9 +2829,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.0.tgz",
-            "integrity": "sha512-CV2aqhDDOsABKHKhNcs1SZFryffQf8vK2XrxP6lxC99ELZAdvsDgPklIBfd65R8R+qvOm1SmLaZ/Fdq961+m7A==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.2.tgz",
+            "integrity": "sha512-wt8OhpQUi6JuPFkm1wbVi1BByeag87LDFzeKSXzIdGcX4bMLqORTtKxLoCbV57BHYNSUSOKlSL4BYYUghainYA==",
            "cpu": [
                "ia32"
            ],
@@ -2843,9 +2843,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.0.tgz",
-            "integrity": "sha512-g2ASy1QwHP88y5KWvblUolJz9rN+i4ZOsYzkEwcNfaNooxNUXG+ON6F5xFo0NIItpHqxcdAyls05VXpBnludGw==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.2.tgz",
+            "integrity": "sha512-rUrqINax0TvrPBXrFKg0YbQx18NpPN3NNrgmaao9xRNbTwek7lOXObhx8tQy8gelmQ/gLaGy1WptpU2eKJZImg==",
            "cpu": [
                "x64"
            ],
@@ -3133,9 +3133,9 @@
            "license": "MIT"
        },
        "node_modules/@types/node": {
-            "version": "22.13.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.0.tgz",
-            "integrity": "sha512-ClIbNe36lawluuvq3+YYhnIN2CELi+6q8NpnM7PYp4hBn/TatfboPgVSm2rwKRfnV2M+Ty9GWDFI64KEe+kysA==",
+            "version": "22.13.1",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.1.tgz",
+            "integrity": "sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -4448,9 +4448,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001696",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001696.tgz",
-            "integrity": "sha512-pDCPkvzfa39ehJtJ+OwGT/2yvT2SbjfHhiIW2LWOAcMQ7BzwxT/XuyUp4OTOd0XFWA6BKw0JalnBHgSi5DGJBQ==",
+            "version": "1.0.30001697",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001697.tgz",
+            "integrity": "sha512-GwNPlWJin8E+d7Gxq96jxM6w0w+VFeyyXRsjU58emtkYqnbwHqXm5uT2uCmO0RQE9htWknOP4xtBlLmM/gWxvQ==",
            "dev": true,
            "funding": [
                {
@@ -5663,9 +5663,9 @@
            "license": "MIT"
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.90",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.90.tgz",
-            "integrity": "sha512-C3PN4aydfW91Natdyd449Kw+BzhLmof6tzy5W1pFC5SpQxVXT+oyiyOG9AgYYSN9OdA/ik3YkCrpwqI8ug5Tug==",
+            "version": "1.5.91",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.91.tgz",
+            "integrity": "sha512-sNSHHyq048PFmZY4S90ax61q+gLCs0X0YmcOII9wG9S2XwbVr+h4VW2wWhnbp/Eys3cCwTxVF292W3qPaxIapQ==",
            "dev": true,
            "license": "ISC"
        },
@@ -5720,9 +5720,9 @@
            }
        },
        "node_modules/enhanced-resolve": {
-            "version": "5.18.0",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz",
-            "integrity": "sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==",
+            "version": "5.18.1",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
+            "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -9987,9 +9987,9 @@
            }
        },
        "node_modules/rollup": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.0.tgz",
-            "integrity": "sha512-+4C/cgJ9w6sudisA0nZz0+O7lTP9a3CzNLsoDwaRumM8QHwghUsu6tqHXiTmNUp/rqNiM14++7dkzHDyCRs0Jg==",
+            "version": "4.34.2",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.2.tgz",
+            "integrity": "sha512-sBDUoxZEaqLu9QeNalL8v3jw6WjPku4wfZGyTU7l7m1oC+rpRihXc/n/H+4148ZkGz5Xli8CHMns//fFGKvpIQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -10003,25 +10003,25 @@
                "npm": ">=8.0.0"
            },
            "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.34.0",
-                "@rollup/rollup-android-arm64": "4.34.0",
-                "@rollup/rollup-darwin-arm64": "4.34.0",
-                "@rollup/rollup-darwin-x64": "4.34.0",
-                "@rollup/rollup-freebsd-arm64": "4.34.0",
-                "@rollup/rollup-freebsd-x64": "4.34.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.34.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.34.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.34.0",
-                "@rollup/rollup-linux-arm64-musl": "4.34.0",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.34.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.34.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.34.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.34.0",
-                "@rollup/rollup-linux-x64-gnu": "4.34.0",
-                "@rollup/rollup-linux-x64-musl": "4.34.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.34.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.34.0",
-                "@rollup/rollup-win32-x64-msvc": "4.34.0",
+                "@rollup/rollup-android-arm-eabi": "4.34.2",
+                "@rollup/rollup-android-arm64": "4.34.2",
+                "@rollup/rollup-darwin-arm64": "4.34.2",
+                "@rollup/rollup-darwin-x64": "4.34.2",
+                "@rollup/rollup-freebsd-arm64": "4.34.2",
+                "@rollup/rollup-freebsd-x64": "4.34.2",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.34.2",
+                "@rollup/rollup-linux-arm-musleabihf": "4.34.2",
+                "@rollup/rollup-linux-arm64-gnu": "4.34.2",
+                "@rollup/rollup-linux-arm64-musl": "4.34.2",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.34.2",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.34.2",
+                "@rollup/rollup-linux-riscv64-gnu": "4.34.2",
+                "@rollup/rollup-linux-s390x-gnu": "4.34.2",
+                "@rollup/rollup-linux-x64-gnu": "4.34.2",
+                "@rollup/rollup-linux-x64-musl": "4.34.2",
+                "@rollup/rollup-win32-arm64-msvc": "4.34.2",
+                "@rollup/rollup-win32-ia32-msvc": "4.34.2",
+                "@rollup/rollup-win32-x64-msvc": "4.34.2",
                "fsevents": "~2.3.2"
            }
        },
@@ -10168,9 +10168,9 @@
            }
        },
        "node_modules/semver": {
-            "version": "7.7.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
-            "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==",
+            "version": "7.7.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+            "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
            "dev": true,
            "license": "ISC",
            "bin": {
--- a/resources/assets/v1/src/locales/pl.json
+++ b/resources/assets/v1/src/locales/pl.json
@@ -171,7 +171,7 @@
    "list": {
        "title": "Tytu\u0142",
        "active": "Jest aktywny?",
-        "native_currency": "Native currency",
+        "native_currency": "Waluta natywna",
        "trigger": "Wyzwalacz",
        "response": "Odpowied\u017a",
        "delivery": "Dor\u0119czenie",
--- a/resources/assets/v1/src/locales/sl.json
+++ b/resources/assets/v1/src/locales/sl.json
@@ -138,7 +138,7 @@
        "visit_webhook_url": "Obi\u0161\u010dite URL webhooka",
        "reset_webhook_secret": "Ponastavi skrivno kodo webhooka",
        "header_exchange_rates": "Menjalni te\u010daji",
-        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
+        "exchange_rates_intro": "Firefly III podpira prenos in uporabo menjalnih te\u010dajev. Preberite ve\u010d o tem v <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">dokumentaciji<\/a>.",
        "exchange_rates_from_to": "Med {from} in {to} (in obratno)",
        "exchange_rates_intro_rates": "Firefly III uporablja naslednje menjalne te\u010daje. Obratna vrednost se samodejno izra\u010duna, \u010de ni na voljo. \u010ce na dan transakcije ni menjalnega te\u010daja, se bo Firefly III vrnil v preteklost, da bi ga na\u0161el. \u010ce jih ni, se uporabi te\u010daj \"1\".",
        "header_exchange_rates_rates": "Menjalni te\u010daji",