From 45ecff4e9007f73deb89efcc890eb46c2f554ee9 Mon Sep 17 00:00:00 2001 From: Gianfranco Gasbarri Date: Wed, 11 Sep 2019 09:26:03 +0100 Subject: [PATCH] Removed unnecessary getCurrencyMap method --- lib/ui/dashboard/dashboard_panels.dart | 20 ++++++++++---------- lib/utils/money.dart | 8 ++------ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/lib/ui/dashboard/dashboard_panels.dart b/lib/ui/dashboard/dashboard_panels.dart index 942149ebd..d3389f896 100644 --- a/lib/ui/dashboard/dashboard_panels.dart +++ b/lib/ui/dashboard/dashboard_panels.dart @@ -187,7 +187,7 @@ class DashboardPanels extends StatelessWidget { final settings = viewModel.dashboardUIState; final state = viewModel.state; final currentData = memoizedChartInvoices( - getCurrencyMap(context), + state.staticState.currencyMap, state.selectedCompany, settings, state.invoiceState.map, @@ -196,7 +196,7 @@ class DashboardPanels extends StatelessWidget { List previousData; if (settings.enableComparison) { previousData = memoizedChartInvoices( - getCurrencyMap(context), + state.staticState.currencyMap, state.selectedCompany, settings.rebuild((b) => b..offset += 1), state.invoiceState.map, @@ -216,7 +216,7 @@ class DashboardPanels extends StatelessWidget { final settings = viewModel.dashboardUIState; final state = viewModel.state; final currentData = memoizedChartPayments( - getCurrencyMap(context), + state.staticState.currencyMap, state.selectedCompany, settings, state.invoiceState.map, @@ -226,7 +226,7 @@ class DashboardPanels extends StatelessWidget { List previousData; if (settings.enableComparison) { previousData = memoizedChartPayments( - getCurrencyMap(context), + state.staticState.currencyMap, state.selectedCompany, settings.rebuild((b) => b..offset += 1), state.invoiceState.map, @@ -247,7 +247,7 @@ class DashboardPanels extends StatelessWidget { final state = viewModel.state; final isLoaded = state.quoteState.isLoaded; final currentData = memoizedChartQuotes( - getCurrencyMap(context), + state.staticState.currencyMap, state.selectedCompany, settings, state.quoteState.map, @@ -256,7 +256,7 @@ class DashboardPanels extends StatelessWidget { List previousData; if (settings.enableComparison) { previousData = memoizedChartQuotes( - getCurrencyMap(context), + state.staticState.currencyMap, state.selectedCompany, settings.rebuild((b) => b..offset += 1), state.quoteState.map, @@ -277,7 +277,7 @@ class DashboardPanels extends StatelessWidget { final isLoaded = state.taskState.isLoaded; final currentData = memoizedChartTasks( - getCurrencyMap(context), + state.staticState.currencyMap, state.selectedCompany, settings, state.taskState.map, @@ -288,7 +288,7 @@ class DashboardPanels extends StatelessWidget { List previousData; if (settings.enableComparison) { previousData = memoizedChartTasks( - getCurrencyMap(context), + state.staticState.currencyMap, state.selectedCompany, settings.rebuild((b) => b..offset += 1), state.taskState.map, @@ -310,7 +310,7 @@ class DashboardPanels extends StatelessWidget { final state = viewModel.state; final isLoaded = state.expenseState.isLoaded; final currentData = memoizedChartExpenses( - getCurrencyMap(context), + state.staticState.currencyMap, state.selectedCompany, settings, state.invoiceState.map, @@ -319,7 +319,7 @@ class DashboardPanels extends StatelessWidget { List previousData; if (settings.enableComparison) { previousData = memoizedChartExpenses( - getCurrencyMap(context), + state.staticState.currencyMap, state.selectedCompany, settings.rebuild((b) => b..offset += 1), state.invoiceState.map, diff --git a/lib/utils/money.dart b/lib/utils/money.dart index 6c67a97bb..7d5e8a26c 100644 --- a/lib/utils/money.dart +++ b/lib/utils/money.dart @@ -7,16 +7,12 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart'; double getExchangeRate(BuildContext context, {int fromCurrencyId, int toCurrencyId}) { - final currencyMap = getCurrencyMap(context); + final state = StoreProvider.of(context).state; + final currencyMap = state.staticState.currencyMap; return getExchangeRateWithMap(currencyMap, fromCurrencyId: fromCurrencyId, toCurrencyId: toCurrencyId); } -BuiltMap getCurrencyMap(BuildContext context) { - final state = StoreProvider.of(context).state; - return state.staticState.currencyMap; -} - double getExchangeRateWithMap(BuiltMap currencyMap, {int fromCurrencyId, int toCurrencyId}) { final fromCurrency = currencyMap[fromCurrencyId];