Skip to content

Commit 66fe3f1

Browse files
msalazarmmsalazarm
authored
Merge pull request #161 from cypherstack/staging
Staging
2 parents 5c9c06b + 0057851 commit 66fe3f1

File tree

20 files changed

+162
-136
lines changed

20 files changed

+162
-136
lines changed

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@
451451
buildSettings = {
452452
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
453453
CLANG_ENABLE_MODULES = YES;
454-
CURRENT_PROJECT_VERSION = 75;
454+
CURRENT_PROJECT_VERSION = 78;
455455
DEVELOPMENT_TEAM = 4DQKUWSG6C;
456456
ENABLE_BITCODE = NO;
457457
FRAMEWORK_SEARCH_PATHS = (
@@ -505,7 +505,7 @@
505505
"$(PROJECT_DIR)/../crypto_plugins/flutter_libmonero/cw_shared_external/ios/External/ios/**",
506506
"$(PROJECT_DIR)/../crypto_plugins/flutter_libepiccash/ios/libs",
507507
);
508-
MARKETING_VERSION = 1.5.5;
508+
MARKETING_VERSION = 1.5.8;
509509
ONLY_ACTIVE_ARCH = NO;
510510
PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.stackwallet;
511511
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -635,7 +635,7 @@
635635
buildSettings = {
636636
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
637637
CLANG_ENABLE_MODULES = YES;
638-
CURRENT_PROJECT_VERSION = 75;
638+
CURRENT_PROJECT_VERSION = 78;
639639
DEVELOPMENT_TEAM = 4DQKUWSG6C;
640640
ENABLE_BITCODE = NO;
641641
FRAMEWORK_SEARCH_PATHS = (
@@ -689,7 +689,7 @@
689689
"$(PROJECT_DIR)/../crypto_plugins/flutter_libmonero/cw_shared_external/ios/External/ios/**",
690690
"$(PROJECT_DIR)/../crypto_plugins/flutter_libepiccash/ios/libs",
691691
);
692-
MARKETING_VERSION = 1.5.5;
692+
MARKETING_VERSION = 1.5.8;
693693
ONLY_ACTIVE_ARCH = NO;
694694
PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.stackwallet;
695695
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -711,7 +711,7 @@
711711
buildSettings = {
712712
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
713713
CLANG_ENABLE_MODULES = YES;
714-
CURRENT_PROJECT_VERSION = 75;
714+
CURRENT_PROJECT_VERSION = 78;
715715
DEVELOPMENT_TEAM = 4DQKUWSG6C;
716716
ENABLE_BITCODE = NO;
717717
FRAMEWORK_SEARCH_PATHS = (
@@ -765,7 +765,7 @@
765765
"$(PROJECT_DIR)/../crypto_plugins/flutter_libmonero/cw_shared_external/ios/External/ios/**",
766766
"$(PROJECT_DIR)/../crypto_plugins/flutter_libepiccash/ios/libs",
767767
);
768-
MARKETING_VERSION = 1.5.5;
768+
MARKETING_VERSION = 1.5.8;
769769
ONLY_ACTIVE_ARCH = NO;
770770
PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.stackwallet;
771771
PRODUCT_NAME = "$(TARGET_NAME)";

‎lib/main.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ class _MaterialAppWithThemeState extends ConsumerState<MaterialAppWithTheme>
207207
didLoad = true;
208208

209209
await DB.instance.init();
210+
await _prefs.init();
210211

211212
_notificationsService = ref.read(notificationsProvider);
212213
_nodeService = ref.read(nodeServiceChangeNotifierProvider);
@@ -223,7 +224,6 @@ class _MaterialAppWithThemeState extends ConsumerState<MaterialAppWithTheme>
223224
tradesService: _tradesService,
224225
prefs: _prefs,
225226
);
226-
await _prefs.init();
227227
ref.read(priceAnd24hChangeNotifierProvider).start(true);
228228
await _wallets.load(_prefs);
229229
loadingCompleter.complete();

‎lib/pages/exchange_view/sub_widgets/exchange_provider_options.dart‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:flutter_svg/svg.dart';
55
import 'package:stackwallet/models/exchange/response_objects/estimate.dart';
66
import 'package:stackwallet/providers/providers.dart';
77
import 'package:stackwallet/services/exchange/change_now/change_now_exchange.dart';
8+
import 'package:stackwallet/services/exchange/exchange.dart';
89
import 'package:stackwallet/services/exchange/exchange_response.dart';
910
import 'package:stackwallet/services/exchange/simpleswap/simpleswap_exchange.dart';
1011
import 'package:stackwallet/utilities/assets.dart';
@@ -46,6 +47,9 @@ class ExchangeProviderOptions extends ConsumerWidget {
4647
ChangeNowExchange.exchangeName) {
4748
ref.read(currentExchangeNameStateProvider.state).state =
4849
ChangeNowExchange.exchangeName;
50+
ref.read(exchangeFormStateProvider).exchange =
51+
Exchange.fromName(
52+
ref.read(currentExchangeNameStateProvider.state).state);
4953
}
5054
},
5155
child: Container(
@@ -69,6 +73,10 @@ class ExchangeProviderOptions extends ConsumerWidget {
6973
ref
7074
.read(currentExchangeNameStateProvider.state)
7175
.state = value;
76+
ref.read(exchangeFormStateProvider).exchange =
77+
Exchange.fromName(ref
78+
.read(currentExchangeNameStateProvider.state)
79+
.state);
7280
}
7381
},
7482
),
@@ -214,6 +222,9 @@ class ExchangeProviderOptions extends ConsumerWidget {
214222
SimpleSwapExchange.exchangeName) {
215223
ref.read(currentExchangeNameStateProvider.state).state =
216224
SimpleSwapExchange.exchangeName;
225+
ref.read(exchangeFormStateProvider).exchange =
226+
Exchange.fromName(
227+
ref.read(currentExchangeNameStateProvider.state).state);
217228
}
218229
},
219230
child: Container(
@@ -237,6 +248,10 @@ class ExchangeProviderOptions extends ConsumerWidget {
237248
ref
238249
.read(currentExchangeNameStateProvider.state)
239250
.state = value;
251+
ref.read(exchangeFormStateProvider).exchange =
252+
Exchange.fromName(ref
253+
.read(currentExchangeNameStateProvider.state)
254+
.state);
240255
}
241256
},
242257
),

‎lib/pages/exchange_view/trade_details_view.dart‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,23 +79,25 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
7979
transactionIfSentFromStack = widget.transactionIfSentFromStack;
8080
walletId = widget.walletId;
8181

82-
WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
83-
final trade = ref
84-
.read(tradesServiceProvider)
85-
.trades
86-
.firstWhere((e) => e.tradeId == tradeId);
82+
if (ref.read(prefsChangeNotifierProvider).externalCalls) {
83+
WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
84+
final trade = ref
85+
.read(tradesServiceProvider)
86+
.trades
87+
.firstWhere((e) => e.tradeId == tradeId);
8788

88-
if (mounted) {
89-
final exchange = Exchange.fromName(trade.exchangeName);
90-
final response = await exchange.updateTrade(trade);
89+
if (mounted) {
90+
final exchange = Exchange.fromName(trade.exchangeName);
91+
final response = await exchange.updateTrade(trade);
9192

92-
if (mounted && response.value != null) {
93-
await ref
94-
.read(tradesServiceProvider)
95-
.edit(trade: response.value!, shouldNotifyListeners: true);
93+
if (mounted && response.value != null) {
94+
await ref
95+
.read(tradesServiceProvider)
96+
.edit(trade: response.value!, shouldNotifyListeners: true);
97+
}
9698
}
97-
}
98-
});
99+
});
100+
}
99101
super.initState();
100102
}
101103

‎lib/pages/home_view/home_view.dart‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import 'package:stackwallet/pages/settings_views/global_settings_view/global_set
1111
import 'package:stackwallet/pages/settings_views/global_settings_view/hidden_settings.dart';
1212
import 'package:stackwallet/pages/wallets_view/wallets_view.dart';
1313
import 'package:stackwallet/providers/global/notifications_provider.dart';
14+
import 'package:stackwallet/providers/global/prefs_provider.dart';
1415
import 'package:stackwallet/providers/ui/home_view_index_provider.dart';
1516
import 'package:stackwallet/providers/ui/unread_notifications_provider.dart';
1617
import 'package:stackwallet/services/exchange/exchange_data_loading_service.dart';
1718
import 'package:stackwallet/utilities/assets.dart';
1819
import 'package:stackwallet/utilities/constants.dart';
1920
import 'package:stackwallet/utilities/logger.dart';
20-
import 'package:stackwallet/utilities/prefs.dart';
2121
import 'package:stackwallet/utilities/text_styles.dart';
2222
import 'package:stackwallet/utilities/theme/stack_colors.dart';
2323
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@@ -83,9 +83,7 @@ class _HomeViewState extends ConsumerState<HomeView> {
8383

8484
void _loadCNData() {
8585
// unawaited future
86-
//
87-
final externalCalls = Prefs.instance.externalCalls;
88-
if (externalCalls) {
86+
if (ref.read(prefsChangeNotifierProvider).externalCalls) {
8987
_exchangeDataLoadingService.loadAll(ref);
9088
} else {
9189
Logging.instance.log("User does not want to use external calls",
@@ -289,7 +287,7 @@ class _HomeViewState extends ConsumerState<HomeView> {
289287
(previous, next) {
290288
if (next is int) {
291289
if (next == 1) {
292-
_loadCNData();
290+
_exchangeDataLoadingService.loadAll(ref);
293291
}
294292
if (next >= 0 && next <= 1) {
295293
_pageController.animateToPage(

‎lib/pages/home_view/sub_widgets/home_view_button_bar.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ class _HomeViewButtonBarState extends ConsumerState<HomeViewButtonBar> {
101101
ref.read(homeViewPageIndexStateProvider.state).state = 1;
102102
}
103103
// DateTime now = DateTime.now();
104-
if (ref.read(prefsChangeNotifierProvider).externalCalls) {
105-
print("loading?");
106-
await ExchangeDataLoadingService().loadAll(ref);
107-
}
104+
// if (ref.read(prefsChangeNotifierProvider).externalCalls) {
105+
// print("loading?");
106+
await ExchangeDataLoadingService().loadAll(ref);
107+
// }
108108
// if (now.difference(_lastRefreshed) > _refreshInterval) {
109109
// await ExchangeDataLoadingService().loadAll(ref);
110110
// }

‎lib/pages/wallet_view/sub_widgets/wallet_summary_info.dart‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ class _WalletSummaryInfoState extends State<WalletSummaryInfo> {
7070
builder: (_, ref, __) {
7171
final Coin coin =
7272
ref.watch(managerProvider.select((value) => value.coin));
73+
final externalCalls = ref.watch(prefsChangeNotifierProvider
74+
.select((value) => value.externalCalls));
7375

7476
Future<Decimal>? totalBalanceFuture;
7577
Future<Decimal>? availableBalanceFuture;
@@ -176,18 +178,19 @@ class _WalletSummaryInfoState extends State<WalletSummaryInfo> {
176178
),
177179
),
178180
),
179-
Text(
180-
"${Format.localizedStringAsFixed(
181-
value: priceTuple.item1 * balanceToShow,
182-
locale: locale,
183-
decimalPlaces: 2,
184-
)} $baseCurrency",
185-
style: STextStyles.subtitle500(context).copyWith(
186-
color: Theme.of(context)
187-
.extension<StackColors>()!
188-
.textFavoriteCard,
181+
if (externalCalls)
182+
Text(
183+
"${Format.localizedStringAsFixed(
184+
value: priceTuple.item1 * balanceToShow,
185+
locale: locale,
186+
decimalPlaces: 2,
187+
)} $baseCurrency",
188+
style: STextStyles.subtitle500(context).copyWith(
189+
color: Theme.of(context)
190+
.extension<StackColors>()!
191+
.textFavoriteCard,
192+
),
189193
),
190-
),
191194
],
192195
);
193196
} else {

‎lib/pages/wallet_view/transaction_views/transaction_details_view.dart‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -255,17 +255,19 @@ class _TransactionDetailsViewState
255255
const SizedBox(
256256
height: 2,
257257
),
258-
SelectableText(
259-
"${Format.localizedStringAsFixed(value: (coin == Coin.monero ? (amount / 10000.toDecimal()).toDecimal() : coin == Coin.wownero ? (amount / 1000.toDecimal()).toDecimal() : amount) * ref.watch(priceAnd24hChangeNotifierProvider.select((value) => value.getPrice(coin).item1)), locale: ref.watch(
260-
localeServiceChangeNotifierProvider
261-
.select((value) => value.locale),
262-
), decimalPlaces: 2)} ${ref.watch(
263-
prefsChangeNotifierProvider.select(
264-
(value) => value.currency,
265-
),
266-
)}",
267-
style: STextStyles.itemSubtitle(context),
268-
),
258+
if (ref.watch(prefsChangeNotifierProvider
259+
.select((value) => value.externalCalls)))
260+
SelectableText(
261+
"${Format.localizedStringAsFixed(value: (coin == Coin.monero ? (amount / 10000.toDecimal()).toDecimal() : coin == Coin.wownero ? (amount / 1000.toDecimal()).toDecimal() : amount) * ref.watch(priceAnd24hChangeNotifierProvider.select((value) => value.getPrice(coin).item1)), locale: ref.watch(
262+
localeServiceChangeNotifierProvider
263+
.select((value) => value.locale),
264+
), decimalPlaces: 2)} ${ref.watch(
265+
prefsChangeNotifierProvider.select(
266+
(value) => value.currency,
267+
),
268+
)}",
269+
style: STextStyles.itemSubtitle(context),
270+
),
269271
],
270272
),
271273
TxIcon(

‎lib/pages/wallet_view/wallet_view.dart‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import 'package:stackwallet/utilities/enums/backup_frequency_type.dart';
3737
import 'package:stackwallet/utilities/enums/coin_enum.dart';
3838
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
3939
import 'package:stackwallet/utilities/enums/wallet_balance_toggle_state.dart';
40+
import 'package:stackwallet/utilities/logger.dart';
4041
import 'package:stackwallet/utilities/text_styles.dart';
4142
import 'package:stackwallet/utilities/theme/stack_colors.dart';
4243
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@@ -45,12 +46,6 @@ import 'package:stackwallet/widgets/custom_loading_overlay.dart';
4546
import 'package:stackwallet/widgets/stack_dialog.dart';
4647
import 'package:tuple/tuple.dart';
4748

48-
import 'package:stackwallet/hive/db.dart';
49-
50-
import 'package:stackwallet/utilities/logger.dart';
51-
52-
import 'package:stackwallet/utilities/prefs.dart';
53-
5449
/// [eventBus] should only be set during testing
5550
class WalletView extends ConsumerStatefulWidget {
5651
const WalletView({
@@ -235,12 +230,8 @@ class _WalletViewState extends ConsumerState<WalletView> {
235230
}
236231

237232
void _onExchangePressed(BuildContext context) async {
238-
final _cnLoadingService = ExchangeDataLoadingService();
239-
final externalCalls = Prefs.instance.externalCalls;
240-
if (!externalCalls) {
241-
print("loading?");
242-
unawaited(_cnLoadingService.loadAll(ref));
243-
}
233+
unawaited(_cnLoadingService.loadAll(ref));
234+
244235
final coin = ref.read(managerProvider).coin;
245236

246237
if (coin == Coin.epicCash) {
@@ -371,9 +362,7 @@ class _WalletViewState extends ConsumerState<WalletView> {
371362

372363
void _loadCNData() {
373364
// unawaited future
374-
final externalCalls = DB.instance
375-
.get<dynamic>(boxName: DB.boxNamePrefs, key: "externalCalls") as bool?;
376-
if (externalCalls ?? false) {
365+
if (ref.read(prefsChangeNotifierProvider).externalCalls) {
377366
_cnLoadingService.loadAll(ref, coin: ref.read(managerProvider).coin);
378367
} else {
379368
Logging.instance.log("User does not want to use external calls",

0 commit comments

Comments
 (0)