Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Removed unnecessary getCurrencyMap method

This commit is contained in:
Gianfranco Gasbarri 2019-09-11 09:26:03 +01:00
parent 2a7d89a5f6
commit 45ecff4e90
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/ui/dashboard/dashboard_panels.dart
View File

@ -187,7 +187,7 @@ class DashboardPanels extends StatelessWidget {
final settings = viewModel.dashboardUIState; final settings = viewModel.dashboardUIState;
final state = viewModel.state; final state = viewModel.state;
final currentData = memoizedChartInvoices( final currentData = memoizedChartInvoices(
getCurrencyMap(context), state.staticState.currencyMap,
state.selectedCompany, state.selectedCompany,
settings, settings,
state.invoiceState.map, state.invoiceState.map,
@ -196,7 +196,7 @@ class DashboardPanels extends StatelessWidget {
List<ChartDataGroup> previousData; List<ChartDataGroup> previousData;
if (settings.enableComparison) { if (settings.enableComparison) {
previousData = memoizedChartInvoices( previousData = memoizedChartInvoices(
getCurrencyMap(context), state.staticState.currencyMap,
state.selectedCompany, state.selectedCompany,
settings.rebuild((b) => b..offset += 1), settings.rebuild((b) => b..offset += 1),
state.invoiceState.map, state.invoiceState.map,
@ -216,7 +216,7 @@ class DashboardPanels extends StatelessWidget {
final settings = viewModel.dashboardUIState; final settings = viewModel.dashboardUIState;
final state = viewModel.state; final state = viewModel.state;
final currentData = memoizedChartPayments( final currentData = memoizedChartPayments(
getCurrencyMap(context), state.staticState.currencyMap,
state.selectedCompany, state.selectedCompany,
settings, settings,
state.invoiceState.map, state.invoiceState.map,
@ -226,7 +226,7 @@ class DashboardPanels extends StatelessWidget {
List<ChartDataGroup> previousData; List<ChartDataGroup> previousData;
if (settings.enableComparison) { if (settings.enableComparison) {
previousData = memoizedChartPayments( previousData = memoizedChartPayments(
getCurrencyMap(context), state.staticState.currencyMap,
state.selectedCompany, state.selectedCompany,
settings.rebuild((b) => b..offset += 1), settings.rebuild((b) => b..offset += 1),
state.invoiceState.map, state.invoiceState.map,
@ -247,7 +247,7 @@ class DashboardPanels extends StatelessWidget {
final state = viewModel.state; final state = viewModel.state;
final isLoaded = state.quoteState.isLoaded; final isLoaded = state.quoteState.isLoaded;
final currentData = memoizedChartQuotes( final currentData = memoizedChartQuotes(
getCurrencyMap(context), state.staticState.currencyMap,
state.selectedCompany, state.selectedCompany,
settings, settings,
state.quoteState.map, state.quoteState.map,
@ -256,7 +256,7 @@ class DashboardPanels extends StatelessWidget {
List<ChartDataGroup> previousData; List<ChartDataGroup> previousData;
if (settings.enableComparison) { if (settings.enableComparison) {
previousData = memoizedChartQuotes( previousData = memoizedChartQuotes(
getCurrencyMap(context), state.staticState.currencyMap,
state.selectedCompany, state.selectedCompany,
settings.rebuild((b) => b..offset += 1), settings.rebuild((b) => b..offset += 1),
state.quoteState.map, state.quoteState.map,
@ -277,7 +277,7 @@ class DashboardPanels extends StatelessWidget {
final isLoaded = state.taskState.isLoaded; final isLoaded = state.taskState.isLoaded;
final currentData = memoizedChartTasks( final currentData = memoizedChartTasks(
getCurrencyMap(context), state.staticState.currencyMap,
state.selectedCompany, state.selectedCompany,
settings, settings,
state.taskState.map, state.taskState.map,
@ -288,7 +288,7 @@ class DashboardPanels extends StatelessWidget {
List<ChartDataGroup> previousData; List<ChartDataGroup> previousData;
if (settings.enableComparison) { if (settings.enableComparison) {
previousData = memoizedChartTasks( previousData = memoizedChartTasks(
getCurrencyMap(context), state.staticState.currencyMap,
state.selectedCompany, state.selectedCompany,
settings.rebuild((b) => b..offset += 1), settings.rebuild((b) => b..offset += 1),
state.taskState.map, state.taskState.map,
@ -310,7 +310,7 @@ class DashboardPanels extends StatelessWidget {
final state = viewModel.state; final state = viewModel.state;
final isLoaded = state.expenseState.isLoaded; final isLoaded = state.expenseState.isLoaded;
final currentData = memoizedChartExpenses( final currentData = memoizedChartExpenses(
getCurrencyMap(context), state.staticState.currencyMap,
state.selectedCompany, state.selectedCompany,
settings, settings,
state.invoiceState.map, state.invoiceState.map,
@ -319,7 +319,7 @@ class DashboardPanels extends StatelessWidget {
List<ChartDataGroup> previousData; List<ChartDataGroup> previousData;
if (settings.enableComparison) { if (settings.enableComparison) {
previousData = memoizedChartExpenses( previousData = memoizedChartExpenses(
getCurrencyMap(context), state.staticState.currencyMap,
state.selectedCompany, state.selectedCompany,
settings.rebuild((b) => b..offset += 1), settings.rebuild((b) => b..offset += 1),
state.invoiceState.map, state.invoiceState.map,

8
lib/utils/money.dart
View File

@ -7,16 +7,12 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
double getExchangeRate(BuildContext context, double getExchangeRate(BuildContext context,
{int fromCurrencyId, int toCurrencyId}) { {int fromCurrencyId, int toCurrencyId}) {
final currencyMap = getCurrencyMap(context); final state = StoreProvider.of<AppState>(context).state;
final currencyMap = state.staticState.currencyMap;
return getExchangeRateWithMap(currencyMap, return getExchangeRateWithMap(currencyMap,
fromCurrencyId: fromCurrencyId, toCurrencyId: toCurrencyId); fromCurrencyId: fromCurrencyId, toCurrencyId: toCurrencyId);
} }
BuiltMap<int, CurrencyEntity> getCurrencyMap(BuildContext context) {
final state = StoreProvider.of<AppState>(context).state;
return state.staticState.currencyMap;
}
double getExchangeRateWithMap(BuiltMap<int, CurrencyEntity> currencyMap, double getExchangeRateWithMap(BuiltMap<int, CurrencyEntity> currencyMap,
{int fromCurrencyId, int toCurrencyId}) { {int fromCurrencyId, int toCurrencyId}) {
final fromCurrency = currencyMap[fromCurrencyId]; final fromCurrency = currencyMap[fromCurrencyId];