Merges develop

CHANGELOG.md

@@ -11,6 +11,7 @@ Changelog
 
 ### Fixes
 
+- Fixed visual glitch on the transaction list switching between filters ([PR 2249](https://github.com/input-output-hk/daedalus/pull/2249))
 - Fixed Newsfeed drop shadow when there is an update item ([PR 2242](https://github.com/input-output-hk/daedalus/pull/2242))
 
 ### Chores

source/renderer/app/components/wallet/transactions/render-strategies/VirtualTransactionList.js

@@ -56,11 +56,7 @@ export class VirtualTransactionList extends Component<Props> {
   }
 
   componentDidUpdate(prevProps: Props) {
-    // Recompute all row heights in case the number of rows has changed
-    const prevNumberOfRows = prevProps.rows.length;
-    const nextNumberOfRows = this.props.rows.length;
-    if (prevNumberOfRows && prevNumberOfRows !== nextNumberOfRows) {
-      this.rowHeights = this.estimateRowHeights(this.props.rows);
+    if (this.props.rows.length !== prevProps.rows.length) {
       this.recomputeVirtualRowHeights();
     }
   }
@@ -302,6 +298,11 @@ export class VirtualTransactionList extends Component<Props> {
     // Prevent List rendering if we have no rows to render
     if (!rows.length) return false;
 
+    // Recompute all row heights in case the number of rows has changed
+    if (this.rowHeights.length !== rows.length) {
+      this.rowHeights = this.estimateRowHeights(rows);
+    }
+
     const componentStyles = classNames([
       styles.component,
       isLoadingSpinnerShown ? styles.withLoadingSpinner : null,