[DDW-385] Progress

input-output-hk · Oct 20, 2020 · a29db2f · a29db2f
1 parent 5074200
commit a29db2f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 24 deletions.
diff --git a/source/renderer/app/api/transactions/getDummyTransactionHistory.js b/source/renderer/app/api/transactions/getDummyTransactionHistory.js
@@ -5,15 +5,15 @@ import { random, get } from 'lodash';
 
 const isOdd = (number: number) => number % 2;
 
-const now = new Date();
+const now = moment();
 const getAddress = (txIndex: number, inputOutputIndex: number) =>
   `addr1qxwt274ux0n46rvg27k6dcepdewvh28ex0uua2u2gsuus7wp7n5ea7ryx48h2txjkf09cljahkwyvpawpm3ga6s8hynscqps${txIndex}${inputOutputIndex}`;
-// faker.random.alphaNumeric(Math.round(Math.random() * 10) + 100);
 const amountBase = Math.round(Math.random() * 10) + 1000000000;
 
 const getDummyTransaction = (index: number) => {
   const amount = amountBase + index;
   const direction = isOdd(index) ? 'incoming' : 'outgoing';
+  if (isOdd(index)) now.add(1, 'day');
   const id = index;
   return {
     id,
@@ -22,10 +22,10 @@ const getDummyTransaction = (index: number) => {
       unit: 'lovelace',
     },
     inserted_at: {
-      time: now,
+      time: now.toDate(),
       block: {
-        slot_number: now.getTime(),
-        epoch_number: now.getTime(),
+        slot_number: amountBase,
+        epoch_number: amountBase,
       },
     },
     depth: {
@@ -60,5 +60,5 @@ const getDummyTransaction = (index: number) => {
   };
 };
 
-export const getDummyTransactionHistory = (numberOfTx: number = 10) =>
+export const getDummyTransactionHistory = (numberOfTx: number = 30) =>
   [...Array(numberOfTx)].map((x, index) => getDummyTransaction(index));
diff --git a/source/renderer/app/components/wallet/transactions/WalletTransactions.js b/source/renderer/app/components/wallet/transactions/WalletTransactions.js
@@ -26,7 +26,6 @@ export const messages = defineMessages({
 type Props = {
   activeWallet: ?Wallet,
   transactions: Array<WalletTransaction>,
-  shouldDisplayTransactions: boolean,
   filterOptions: TransactionFilterOptionsType,
   deletePendingTransaction: Function,
   onLoadMore: Function,
@@ -67,7 +66,6 @@ export default class WalletTransactions extends Component<Props, State> {
     const {
       activeWallet,
       transactions,
-      shouldDisplayTransactions,
       filterOptions,
       deletePendingTransaction,
       onLoadMore,
@@ -95,11 +93,11 @@ export default class WalletTransactions extends Component<Props, State> {
 
     const isRestoreActive = activeWallet && activeWallet.isRestoring;
 
-    if (!shouldDisplayTransactions) {
-      walletTransactions = <WalletNoTransactions label={noTransactionsLabel} />;
-    } else if (numberOfFilterDimensionsApplied > 0 && !transactions.length) {
-      walletTransactions = (
+    if (!transactions.length) {
+      walletTransactions = numberOfFilterDimensionsApplied ? (
         <FilterResultInfo filtered={0} total={totalAvailable} />
+      ) : (
+        <WalletNoTransactions label={noTransactionsLabel} />
       );
     } else {
       walletTransactions = (

diff --git a/source/renderer/app/components/wallet/transactions/WalletTransactionsList.js b/source/renderer/app/components/wallet/transactions/WalletTransactionsList.js
@@ -252,14 +252,16 @@ export default class WalletTransactionsList extends Component<Props> {
         />
       ) : null;
 
-    const syncingTransactionsSpinner = isRestoreActive ? (
-      <div className={styles.syncingTransactionsWrapper}>
-        <LoadingSpinner big />
-        <p className={styles.syncingTransactionsText}>
-          {intl.formatMessage(messages.syncingTransactionsMessage)}
-        </p>
-      </div>
-    ) : null;
+    // @TX TODO
+    const syncingTransactionsSpinner = null;
+    // isRestoreActive ? (
+    //   <div className={styles.syncingTransactionsWrapper}>
+    //     <LoadingSpinner big />
+    //     <p className={styles.syncingTransactionsText}>
+    //       {intl.formatMessage(messages.syncingTransactionsMessage)}
+    //     </p>
+    //   </div>
+    // ) : null;
 
     const buttonClasses = classnames([
       'primary',

diff --git a/source/renderer/app/containers/wallet/WalletTransactionsPage.js b/source/renderer/app/containers/wallet/WalletTransactionsPage.js
@@ -92,11 +92,9 @@ export default class WalletTransactionsPage extends Component<Props, State> {
     const { searchLimit = 0 } = filterOptions;
 
     let transactions = [];
-    const shouldDisplayTransactions =
-      hasAny || !activeWallet || activeWallet.isRestoring;
 
     // Straight away show recent filtered transactions if all filtered ones are not loaded yet
-    if (shouldDisplayTransactions) {
+    if (hasAny && activeWallet && !activeWallet.isRestoring) {
       transactions =
         recentFiltered.length && !allFiltered.length
           ? recentFiltered
@@ -121,7 +119,6 @@ export default class WalletTransactionsPage extends Component<Props, State> {
       <WalletTransactions
         activeWallet={activeWallet}
         transactions={transactions}
-        shouldDisplayTransactions={shouldDisplayTransactions}
         filterOptions={filterOptions}
         deletePendingTransaction={deletePendingTransaction}
         isLoadingTransactions={searchRequest.isExecutingFirstTime}