[DDW-694] Tokens list - progress

input-output-hk · Sep 14, 2021 · eb3e3a2 · eb3e3a2
1 parent 2ee90af
commit eb3e3a2
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 39 deletions.
diff --git a/source/renderer/app/components/wallet/summary/WalletSummary.js b/source/renderer/app/components/wallet/summary/WalletSummary.js
@@ -4,7 +4,6 @@ import { observer } from 'mobx-react';
 import Wallet from '../../../domains/Wallet';
 import type { Currency } from '../../../types/currencyTypes';
 import WalletSummaryHeader from './WalletSummaryHeader';
-import WalletSummaryAssets from './WalletSummaryAssets';
 import WalletSummaryCurrency from './WalletSummaryCurrency';
 import type { AssetToken } from '../../../api/assets/types';
 import WalletSummaryNoTokens from './WalletSummaryNoTokens';
@@ -30,6 +29,7 @@ type Props = {
   isLoadingAssets: boolean,
   assetSettingsDialogWasOpened: boolean,
   onExternalLinkClick: Function,
+  onViewAllButtonClick: Function,
 };
 
 @observer
@@ -55,6 +55,7 @@ export default class WalletSummary extends Component<Props> {
       assetSettingsDialogWasOpened,
       isLoadingAssets,
       onExternalLinkClick,
+      onViewAllButtonClick,
     } = this.props;
 
     const { isRestoring } = wallet;
@@ -95,6 +96,7 @@ export default class WalletSummary extends Component<Props> {
                 assetSettingsDialogWasOpened={assetSettingsDialogWasOpened}
                 currentLocale={currentLocale}
                 title="Recently used tokens"
+                onViewAllButtonClick={onViewAllButtonClick}
               />
             ) : (
               <WalletSummaryNoTokens

diff --git a/source/renderer/app/components/wallet/summary/WalletSummaryAssets.js b/source/renderer/app/components/wallet/summary/WalletSummaryAssets.js
diff --git a/source/renderer/app/components/wallet/tokens/WalletTokensList.js b/source/renderer/app/components/wallet/tokens/WalletTokensList.js
@@ -23,6 +23,7 @@ type Props = {
   assets: Array<AssetToken>,
   assetSettingsDialogWasOpened: boolean,
   currentLocale: string,
+  onViewAllButtonClick?: Function,
   intl: intlShape.isRequired,
   isLoadingAssets: boolean,
   onAssetSettings: Function,
@@ -35,9 +36,9 @@ type Props = {
 
 const WalletTokensList = observer((props: Props) => {
   const {
-    // anyAssetWasHovered,
     assets,
     assetSettingsDialogWasOpened,
+    onViewAllButtonClick,
     intl,
     isLoadingAssets,
     onAssetSettings,
@@ -86,6 +87,9 @@ const WalletTokensList = observer((props: Props) => {
             assetSettingsDialogWasOpened={assetSettingsDialogWasOpened}
           />
         ))}
+        {onViewAllButtonClick && (
+          <button onClick={onViewAllButtonClick}>VIEW ALL</button>
+        )}
       </BorderedBox>
     </div>
   );

diff --git a/source/renderer/app/containers/wallet/WalletSummaryPage.js b/source/renderer/app/containers/wallet/WalletSummaryPage.js
@@ -49,6 +49,13 @@ export default class WalletSummaryPage extends Component<Props> {
     });
   };
 
+  handleViewAllButtonClick = (walletId: string) => {
+    this.props.actions.router.goToRoute.trigger({
+      route: ROUTES.WALLETS.PAGE,
+      params: { id: walletId, page: 'tokens' },
+    });
+  };
+
   render() {
     const { intl } = this.context;
     const { stores, actions } = this.props;
@@ -83,7 +90,6 @@ export default class WalletSummaryPage extends Component<Props> {
     } = transactions;
     const { active: wallet } = wallets;
     const { isActive, isFetchingRate, lastFetched, rate, selected } = currency;
-
     const { currentTimeFormat, currentDateFormat, currentLocale } = profile;
     const hasAssetsEnabled = WALLET_ASSETS_ENABLED;
 
@@ -100,6 +106,8 @@ export default class WalletSummaryPage extends Component<Props> {
     const hasRawAssets = wallet.assets.total.length > 0;
     const isLoadingAssets = hasRawAssets && totalAssets < totalRawAssets;
 
+    const onViewAllButtonClick = () => this.handleViewAllButtonClick(wallet.id);
+
     const getUrlByType = (type: 'tx' | 'address', param: string) =>
       getNetworkExplorerUrlByType(type, param, network, currentLocale);
 
@@ -161,6 +169,7 @@ export default class WalletSummaryPage extends Component<Props> {
           onCopyAssetParam={onCopyAssetParam.trigger}
           onAssetSettings={onAssetSettingsOpen.trigger}
           onExternalLinkClick={app.openExternalLink}
+          onViewAllButtonClick={onViewAllButtonClick}
         />
         {walletTransactions}
       </VerticalFlexContainer>

diff --git a/source/renderer/app/utils/assets.js b/source/renderer/app/utils/assets.js
@@ -122,7 +122,7 @@ export const hasTokensLeftAfterTransaction = (
  */
 export const searchAssets = (
   rawSearchValue: string,
-  assets: Array<{ asset: AssetToken }>
+  assets: Array<AssetToken>
 ) => {
   const searchValue = rawSearchValue.trim();
   if (searchValue.length < 3) {