diff --git a/lib/models/wallets_profiles.dart b/lib/models/wallets_profiles.dart index b1e03229c357159814c1267ca4138e484d9fa710..5fb6901a86a4955726717f4f61d9882353603549 100644 --- a/lib/models/wallets_profiles.dart +++ b/lib/models/wallets_profiles.dart @@ -30,7 +30,7 @@ class WalletsProfilesProvider with ChangeNotifier { TextEditingController payAmount = TextEditingController(); TextEditingController payComment = TextEditingController(); num balance; - int nRepositories = 10; + int nRepositories = 20; int nPage = 1; Future scan(context) async { @@ -199,7 +199,7 @@ class WalletsProfilesProvider with ChangeNotifier { if (fetchMoreCursor == null) nPage = 1; if (nPage == 1) { - nRepositories = 30; + nRepositories = 40; } else if (nPage == 2) { nRepositories = 100; } diff --git a/lib/screens/myWallets/cesium_wallet_options.dart b/lib/screens/myWallets/cesium_wallet_options.dart index b7e70c50d430be5a8953b9dcc381e0d314dedfee..ac7ffedd398f2861f9426d752506b7985a4f3542 100644 --- a/lib/screens/myWallets/cesium_wallet_options.dart +++ b/lib/screens/myWallets/cesium_wallet_options.dart @@ -332,16 +332,14 @@ class CesiumWalletOptions extends StatelessWidget { InkWell( key: const Key('displayHistory'), onTap: () { - if (_historyProvider.isPubkey( - context, _walletOptions.pubkey.text)) { - Navigator.push( - context, - MaterialPageRoute(builder: (context) { - return HistoryScreen( - pubkey: _walletOptions.pubkey.text); - }), - ); - } + _historyProvider.nPage = 1; + Navigator.push( + context, + MaterialPageRoute(builder: (context) { + return HistoryScreen( + pubkey: _walletOptions.pubkey.text); + }), + ); }, child: SizedBox( height: 50, diff --git a/lib/screens/myWallets/wallet_options.dart b/lib/screens/myWallets/wallet_options.dart index 93c278d9c35b818016d55728094c6e310d6bb411..ca8d7ed8d89eb5d97d869edca1b3038c98fec64b 100644 --- a/lib/screens/myWallets/wallet_options.dart +++ b/lib/screens/myWallets/wallet_options.dart @@ -7,6 +7,7 @@ import 'package:gecko/models/my_wallets.dart'; import 'package:gecko/models/queries.dart'; import 'package:gecko/models/wallet_data.dart'; import 'package:gecko/models/wallet_options.dart'; +import 'package:gecko/models/wallets_profiles.dart'; import 'package:gecko/screens/history.dart'; import 'package:graphql_flutter/graphql_flutter.dart'; import 'package:provider/provider.dart'; @@ -25,6 +26,8 @@ class WalletOptions extends StatelessWidget { SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); WalletOptionsProvider _walletOptions = Provider.of<WalletOptionsProvider>(context, listen: false); + WalletsProfilesProvider _historyProvider = + Provider.of<WalletsProfilesProvider>(context, listen: false); MyWalletsProvider _myWalletProvider = Provider.of<MyWalletsProvider>(context); @@ -354,6 +357,7 @@ class WalletOptions extends StatelessWidget { InkWell( key: const Key('displayHistory'), onTap: () { + _historyProvider.nPage = 1; Navigator.push( context, MaterialPageRoute(builder: (context) { diff --git a/lib/screens/wallet_view.dart b/lib/screens/wallet_view.dart index f77e21f0c0e1793635ca6a924929e6952479e42a..0c20e75101f716395612657aee927567daba5de6 100644 --- a/lib/screens/wallet_view.dart +++ b/lib/screens/wallet_view.dart @@ -59,6 +59,7 @@ class WalletViewScreen extends StatelessWidget { 'assets/walletOptions/clock.png'), height: 90)), onTap: () { + _historyProvider.nPage = 1; Navigator.push( context, FaderTransition(