Merge pull request #57 from ashchan/update-chart-on-portfolio-change

Fix GrowthChart not updating issue by adding PortfolioSettings
ashchan · Dec 14, 2021 · 0e2e3e5 · 0e2e3e5
2 parents 9fc0cc7 + 5ae7f56
commit 0e2e3e5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Shared/Models/Portfolio/PortfolioConfig.swift b/Shared/Models/Portfolio/PortfolioConfig.swift
@@ -46,7 +46,6 @@ extension Portfolio {
         startAt = Calendar.utc.date(from: components)!.startOfMonth
         currencyCode = config.currencyCode
 
-        // TODO: only rebuild if startAt has been changed
         sortedAccounts.forEach { $0.rebuildRecords() }
     }
 }
diff --git a/macOS/Views/PortfolioView/GrowthChart.swift b/macOS/Views/PortfolioView/GrowthChart.swift
@@ -9,6 +9,7 @@ import SwiftUI
 import Charts
 
 struct GrowthChart: NSViewRepresentable {
+    @EnvironmentObject var portfolioSettings: PortfolioSettings
     @State var portfolio: Portfolio
 
     typealias NSViewType = LineChartView
@@ -17,7 +18,6 @@ struct GrowthChart: NSViewRepresentable {
         let view = LineChartView()
         view.leftAxis.axisMinimum = 0
         view.leftAxis.drawGridLinesEnabled = false
-        view.leftAxis.valueFormatter = ChartValueFormatter(portfolio: portfolio)
         view.xAxis.labelPosition = .bottom
         view.xAxis.drawGridLinesEnabled = false
         view.xAxis.valueFormatter = ChartDateFormatter()
@@ -31,6 +31,7 @@ struct GrowthChart: NSViewRepresentable {
     }
 
     func updateNSView(_ nsView: LineChartView, context: Context) {
+        nsView.leftAxis.valueFormatter = ChartValueFormatter(portfolio: portfolio)
         nsView.data = chartData
         if let max = nsView.data?.yMax {
             nsView.leftAxis.axisMaximum = max + 2_000

diff --git a/macOS/Views/Sidebar/PortfolioRow.swift b/macOS/Views/Sidebar/PortfolioRow.swift
@@ -38,7 +38,7 @@ struct PortfolioRow: View {
                 })
         ) {
             NavigationLink(
-                destination: PortfolioView(portfolio: portfolio, showingConfigureSheet: $showingConfigureSheet),
+                destination: PortfolioView(portfolio: portfolio, showingConfigureSheet: $showingConfigureSheet).environmentObject(portfolioSettings),
                 tag: "\(portfolio.tag)-overview",
                 selection: $selection
             ) {