diff --git a/app/models/import.rb b/app/models/import.rb index 39deb9c314b..895b142b1c6 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -115,7 +115,8 @@ def generate_transactions name: row["name"] || "Imported transaction", date: Date.iso8601(row["date"]), category: category, - amount: BigDecimal(row["amount"]) * -1 # User inputs amounts with opposite signage of our internal representation + amount: BigDecimal(row["amount"]) * -1, # User inputs amounts with opposite signage of our internal representation + currency: account.currency transactions << txn end diff --git a/app/views/imports/transactions/_transaction.html.erb b/app/views/imports/transactions/_transaction.html.erb index 202e0ca7f3f..3d221d96b18 100644 --- a/app/views/imports/transactions/_transaction.html.erb +++ b/app/views/imports/transactions/_transaction.html.erb @@ -7,6 +7,6 @@
- <%= content_tag :p, format_money(-transaction.amount), class: ["whitespace-nowrap", BigDecimal(transaction.amount).negative? ? "text-green-600" : "text-red-600"] %> + <%= content_tag :p, format_money(Money.new(-transaction.amount, @import.account.currency)), class: ["whitespace-nowrap", BigDecimal(transaction.amount).negative? ? "text-green-600" : "text-red-600"] %>
diff --git a/app/views/imports/transactions/_transaction_group.html.erb b/app/views/imports/transactions/_transaction_group.html.erb index 19c1ed4cbaa..fae987924ba 100644 --- a/app/views/imports/transactions/_transaction_group.html.erb +++ b/app/views/imports/transactions/_transaction_group.html.erb @@ -5,7 +5,7 @@

<%= date.strftime("%b %d, %Y") %> · <%= transactions.size %>

- <%= format_money -transactions.sum { |t| t.amount } %> + <%= format_money Money.new(-transactions.sum { |t| t.amount }, @import.account.currency) %>
<%= render partial: "imports/transactions/transaction", collection: transactions %>