From 7c5bfc44713d9b10e6a73b6b1765d7dc0f6b4dfd Mon Sep 17 00:00:00 2001
From: "m.ray" <16125548+MadalinaRaicu@users.noreply.github.com>
Date: Wed, 12 Oct 2022 11:49:13 +0100
Subject: [PATCH] feat: 1648 add deposit button and show accounts 0 state
 (#1696)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: #1648 add deposit button and show accounts 0 state

* fix: remove text-white and text-black

* fix: #1648 revert and add back row model type and data source in accounts table

* fix: #1648 fix linting issue

* fix: #1648 table tweaks buttons at the bottom

* fix: #1644 hide withdrawals history title

* fix: #1648 fix accounts-table test

* fix: #1648 fix trading-accounts.cy.ts test

* fix: leave ag grid to show overlay if data is simply null but there is no error or it's not loading

Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com>
---
 .../src/integration/trading-accounts.cy.ts    |  2 +-
 .../pages/portfolio/accounts-container.tsx    | 30 ++++---------
 .../pages/portfolio/deposits-container.tsx    | 43 ++++++++++++++-----
 .../pages/portfolio/withdrawals-container.tsx | 29 ++++++-------
 libs/accounts/src/lib/accounts-manager.tsx    | 24 +++++------
 libs/accounts/src/lib/accounts-table.spec.tsx |  2 +-
 libs/accounts/src/lib/accounts-table.tsx      |  2 +-
 7 files changed, 69 insertions(+), 63 deletions(-)

diff --git a/apps/trading-e2e/src/integration/trading-accounts.cy.ts b/apps/trading-e2e/src/integration/trading-accounts.cy.ts
index 073f4c206..09cd58a1c 100644
--- a/apps/trading-e2e/src/integration/trading-accounts.cy.ts
+++ b/apps/trading-e2e/src/integration/trading-accounts.cy.ts
@@ -33,7 +33,7 @@ describe('accounts', { tags: '@smoke' }, () => {
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)
       .find('[col-id="breakdown"]')
-      .should('have.text', 'Collateral breakdown');
+      .should('have.text', 'Breakdown');
 
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)
diff --git a/apps/trading/pages/portfolio/accounts-container.tsx b/apps/trading/pages/portfolio/accounts-container.tsx
index 7dae4e0f2..66527f238 100644
--- a/apps/trading/pages/portfolio/accounts-container.tsx
+++ b/apps/trading/pages/portfolio/accounts-container.tsx
@@ -1,13 +1,13 @@
 import { useState } from 'react';
-import { Dialog } from '@vegaprotocol/ui-toolkit';
+import { Button } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/react-helpers';
 import { WithdrawalDialogs } from '@vegaprotocol/withdraws';
 import { Web3Container } from '@vegaprotocol/web3';
-import { DepositContainer } from '@vegaprotocol/deposits';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { AccountManager } from '@vegaprotocol/accounts';
+import { DepositDialog } from './deposits-container';
 
 export const AccountsContainer = () => {
   const { pubKey } = useVegaWallet();
@@ -23,12 +23,17 @@ export const AccountsContainer = () => {
 
   return (
     <Web3Container>
-      <div className="h-full">
+      <div className="h-full relative grid grid-rows-[1fr,min-content]">
         <AssetAccountTable partyId={pubKey} />
         <DepositDialog
           depositDialog={depositDialog}
           setDepositDialog={setDepositDialog}
         />
+        <div className="w-full dark:bg-black bg-white absolute bottom-0 h-auto flex justify-end px-[11px] py-2">
+          <Button size="sm" onClick={() => setDepositDialog(true)}>
+            Deposit
+          </Button>
+        </div>
       </div>
     </Web3Container>
   );
@@ -68,22 +73,3 @@ export const AssetAccountTable = ({ partyId }: { partyId: string }) => {
     </>
   );
 };
-
-export interface DepositDialogProps {
-  assetId?: string;
-  depositDialog: boolean;
-  setDepositDialog: (open: boolean) => void;
-}
-
-export const DepositDialog = ({
-  assetId,
-  depositDialog,
-  setDepositDialog,
-}: DepositDialogProps) => {
-  return (
-    <Dialog open={depositDialog} onChange={setDepositDialog}>
-      <h1 className="text-2xl mb-4">{t('Deposit')}</h1>
-      <DepositContainer assetId={assetId} />
-    </Dialog>
-  );
-};
diff --git a/apps/trading/pages/portfolio/deposits-container.tsx b/apps/trading/pages/portfolio/deposits-container.tsx
index cf44f8c14..0a5f1e110 100644
--- a/apps/trading/pages/portfolio/deposits-container.tsx
+++ b/apps/trading/pages/portfolio/deposits-container.tsx
@@ -1,20 +1,15 @@
-import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
-import { DepositsTable } from '@vegaprotocol/deposits';
+import { AsyncRenderer, Button, Dialog } from '@vegaprotocol/ui-toolkit';
+import { DepositContainer, DepositsTable } from '@vegaprotocol/deposits';
 import { useDeposits } from '@vegaprotocol/deposits';
 import { t } from '@vegaprotocol/react-helpers';
-import Link from 'next/link';
+import { useState } from 'react';
 
 export const DepositsContainer = () => {
   const { deposits, loading, error } = useDeposits();
+  const [depositDialog, setDepositDialog] = useState(false);
 
   return (
-    <div className="h-full grid grid-rows-[min-content_1fr]">
-      <header className="flex justify-between items-center p-4">
-        <h4 className="text-lg text-black dark:text-white">{t('Deposits')}</h4>
-        <Link href="/portfolio/deposit" passHref={true}>
-          <Button>Deposit</Button>
-        </Link>
-      </header>
+    <div className="h-full grid grid-rows-[1fr,min-content]">
       <div>
         <AsyncRenderer
           data={deposits}
@@ -25,6 +20,34 @@ export const DepositsContainer = () => {
           }}
         />
       </div>
+      <DepositDialog
+        depositDialog={depositDialog}
+        setDepositDialog={setDepositDialog}
+      />
+      <div className="w-full dark:bg-black bg-white absolute bottom-0 h-auto flex justify-end px-[11px] py-2">
+        <Button size="sm" onClick={() => setDepositDialog(true)}>
+          Deposit
+        </Button>
+      </div>
     </div>
   );
 };
+
+export interface DepositDialogProps {
+  assetId?: string;
+  depositDialog: boolean;
+  setDepositDialog: (open: boolean) => void;
+}
+
+export const DepositDialog = ({
+  assetId,
+  depositDialog,
+  setDepositDialog,
+}: DepositDialogProps) => {
+  return (
+    <Dialog open={depositDialog} onChange={setDepositDialog}>
+      <h1 className="text-2xl mb-4">{t('Deposit')}</h1>
+      <DepositContainer assetId={assetId} />
+    </Dialog>
+  );
+};
diff --git a/apps/trading/pages/portfolio/withdrawals-container.tsx b/apps/trading/pages/portfolio/withdrawals-container.tsx
index d3772d625..14b9eba56 100644
--- a/apps/trading/pages/portfolio/withdrawals-container.tsx
+++ b/apps/trading/pages/portfolio/withdrawals-container.tsx
@@ -17,19 +17,8 @@ export const WithdrawalsContainer = () => {
   return (
     <Web3Container>
       <VegaWalletContainer>
-        <div className="h-full grid grid-rows-[min-content_1fr]">
-          <header className="flex justify-between items-center p-4">
-            <h4 className="text-lg text-black dark:text-white">
-              {t('Withdrawals')}
-            </h4>
-            <Button
-              onClick={() => setWithdrawDialog(true)}
-              data-testid="withdraw-dialog-button"
-            >
-              {t('Make withdrawal')}
-            </Button>
-          </header>
-          <div className="h-full px-4">
+        <div className="h-full relative grid grid-rows-[1fr,min-content]">
+          <div className="h-full">
             <AsyncRenderer
               data={{ pending, completed }}
               loading={loading}
@@ -42,13 +31,23 @@ export const WithdrawalsContainer = () => {
                       <PendingWithdrawalsTable rowData={pending} />
                     </>
                   )}
-
-                  <h4 className="pt-3 pb-1">{t('Withdrawal history')}</h4>
+                  {completed && completed.length > 0 && (
+                    <h4 className="pt-3 pb-1">{t('Withdrawal history')}</h4>
+                  )}
                   <WithdrawalsTable rowData={completed} />
                 </>
               )}
             />
           </div>
+          <div className="w-full dark:bg-black bg-white absolute bottom-0 h-auto flex justify-end px-[11px] py-2">
+            <Button
+              size="sm"
+              onClick={() => setWithdrawDialog(true)}
+              data-testid="withdraw-dialog-button"
+            >
+              {t('Make withdrawal')}
+            </Button>
+          </div>
         </div>
         <WithdrawalDialogs
           withdrawDialog={withdrawDialog}
diff --git a/libs/accounts/src/lib/accounts-manager.tsx b/libs/accounts/src/lib/accounts-manager.tsx
index 5c27abaa5..c5fb4d70f 100644
--- a/libs/accounts/src/lib/accounts-manager.tsx
+++ b/libs/accounts/src/lib/accounts-manager.tsx
@@ -32,7 +32,7 @@ export const AccountManager = ({
     },
     [gridRef]
   );
-  const { data, error, loading } = useDataProvider<AccountFields[], never>({
+  const { data, loading, error } = useDataProvider<AccountFields[], never>({
     dataProvider: aggregatedAccountsDataProvider,
     update,
     variables,
@@ -52,18 +52,16 @@ export const AccountManager = ({
     successCallback(rowsThisBlock, lastRow);
   };
   return (
-    <AsyncRenderer loading={loading} error={error} data={data}>
-      {data && (
-        <AccountTable
-          rowModelType={data?.length ? 'infinite' : 'clientSide'}
-          rowData={data?.length ? undefined : []}
-          ref={gridRef}
-          datasource={{ getRows }}
-          onClickAsset={onClickAsset}
-          onClickDeposit={onClickDeposit}
-          onClickWithdraw={onClickWithdraw}
-        />
-      )}
+    <AsyncRenderer data={data || []} error={error} loading={loading}>
+      <AccountTable
+        rowModelType={data?.length ? 'infinite' : 'clientSide'}
+        rowData={data?.length ? undefined : []}
+        ref={gridRef}
+        datasource={{ getRows }}
+        onClickAsset={onClickAsset}
+        onClickDeposit={onClickDeposit}
+        onClickWithdraw={onClickWithdraw}
+      />
     </AsyncRenderer>
   );
 };
diff --git a/libs/accounts/src/lib/accounts-table.spec.tsx b/libs/accounts/src/lib/accounts-table.spec.tsx
index 254a7b0c4..e12690bfe 100644
--- a/libs/accounts/src/lib/accounts-table.spec.tsx
+++ b/libs/accounts/src/lib/accounts-table.spec.tsx
@@ -57,7 +57,7 @@ describe('AccountsTable', () => {
       'tBTC',
       '1,256.00000',
       '1,256.00001,256.0000',
-      'Collateral breakdown',
+      'Breakdown',
       'Deposit',
     ];
     cells.forEach((cell, i) => {
diff --git a/libs/accounts/src/lib/accounts-table.tsx b/libs/accounts/src/lib/accounts-table.tsx
index f17b1bb81..04b774c95 100644
--- a/libs/accounts/src/lib/accounts-table.tsx
+++ b/libs/accounts/src/lib/accounts-table.tsx
@@ -154,7 +154,7 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
                     setBreakdown(value || null);
                   }}
                 >
-                  {t('Collateral breakdown')}
+                  {t('Breakdown')}
                 </ButtonLink>
               );
             }}