From 4cd642b8dafeadda51a70b1b391e2116ec7aba3f Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 8 Feb 2020 12:59:43 +0100
Subject: [PATCH] Fix #3099

---
 app/Http/Controllers/PiggyBankController.php | 2 +-
 app/Transformers/AccountTransformer.php      | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php
index aad7744e31..cc02d9b6b8 100644
--- a/app/Http/Controllers/PiggyBankController.php
+++ b/app/Http/Controllers/PiggyBankController.php
@@ -240,7 +240,7 @@ class PiggyBankController extends Controller
         foreach ($collection as $piggy) {
             $array     = $transformer->transform($piggy);
             $account   = $accountTransformer->transform($piggy->account);
-            $accountId = $account['id'];
+            $accountId = (int)$account['id'];
             if (!isset($accounts[$accountId])) {
                 // create new:
                 $accounts[$accountId] = $account;
diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php
index ec8ee2cf12..f8efed6538 100644
--- a/app/Transformers/AccountTransformer.php
+++ b/app/Transformers/AccountTransformer.php
@@ -180,10 +180,11 @@ class AccountTransformer extends AbstractTransformer
     private function getCurrency(Account $account): array
     {
         $currency       = $this->repository->getAccountCurrency($account);
-        $currencyId     = null;
-        $currencyCode   = null;
-        $decimalPlaces  = 2;
-        $currencySymbol = null;
+        $default        = app('amount')->getDefaultCurrencyByUser($account->user);
+        $currencyId     = $default->id;
+        $currencyCode   = $default->code;
+        $decimalPlaces  = $default->decimal_places;
+        $currencySymbol = $default->symbol;
         if (null !== $currency) {
             $currencyId     = $currency->id;
             $currencyCode   = $currency->code;