Merge pull request #34 from JDI-Group/redesign

Redesign

Author: reasje

lib/features/common/contract/token_contract_use_case.dart

@@ -135,11 +135,23 @@ class TokenContractUseCase extends ReactiveUseCase {
     update(online, result);
   }
 
+  void resetBalanceAndPrice() async {
+    for (int i = 0; i < tokensList.value.length; i++) {
+      tokensList.value[i] = tokensList.value[i].copyWith(balance: 0.0, balancePrice: 0.0);
+    }
+    update(tokensList, tokensList.value);
+  }
+
   Future<void> getTokensBalance(
     List<Token>? tokenList,
     String walletAddress,
-    bool shouldGetPrice,
-  ) async {
+    bool shouldGetPrice, {
+    bool resetBalance = false,
+  }) async {
+    if (resetBalance) {
+      resetBalanceAndPrice();
+    }
+
     late List<Token> result;
     if (tokenList != null) {
       // Check if tokenList and enwList values are the same

lib/features/dapps/presentation/responsive_layout/dapps_layout/dapp_provider_header.dart

@@ -31,9 +31,10 @@ class DAppProviderHeader extends HookConsumerWidget {
       children: [
         Text(
           providerTitle,
-          style: FontTheme.of(context).subtitle2().copyWith(
-              fontWeight: FontWeight.bold,
-              color: ColorsTheme.of(context).textPrimary),
+          style: FontTheme.of(context).body1().copyWith(
+                fontWeight: FontWeight.bold,
+                color: ColorsTheme.of(context).textPrimary,
+              ),
         ),
         const Spacer(),
         InkWell(

lib/features/portfolio/presentation/portfolio_page_presenter.dart

@@ -44,6 +44,7 @@ class PortfolioPresenter extends CompletePresenter<PortfolioState> {
     listen(_accountUserCase.account, (value) {
       if (value != null) {
         notify(() => state.walletAddress = value.address);
+        state.account = value;
         initializePortfolioPage();
       }
     });
@@ -64,6 +65,17 @@ class PortfolioPresenter extends CompletePresenter<PortfolioState> {
   initializePortfolioPage() {
     getNfts();
     getBuyEnabled();
+    getWalletTokensBalance(null, true);
+  }
+
+  void getWalletTokensBalance(
+      List<Token>? tokenList, bool shouldGetPrice) async {
+    _tokenContractUseCase.getTokensBalance(
+      tokenList,
+      state.account!.address,
+      shouldGetPrice,
+      resetBalance: true,
+    );
   }
 
   getNfts() async {

lib/features/portfolio/presentation/portfolio_page_state.dart

@@ -18,6 +18,8 @@ class PortfolioState with EquatableMixin {
 
   bool buyEnabled = true;
 
+  Account? account;
+
   @override
   List<Object?> get props =>
       [walletBalance, tokensList, walletAddress, switchTokensOrNFTs, nftList];

lib/features/wallet/presentation/wallet_page_presenter.dart

@@ -149,8 +149,6 @@ class WalletPresenter extends CompletePresenter<WalletState> {
         break;
       // new balance
       case 'balance':
-        final wannseeBalanceEvent =
-            MoonchainBalanceEvenModel.fromJson(event.payload);
         getWalletTokensBalance(null, true);
         break;
       default: