Merge pull request #532 from rithvikvibhu/rc1-fixes

1.0.0 RC1 fixes
kyokan · Jul 27, 2022 · dab053b · dab053b
2 parents e610772 + 689942e
commit dab053b
Show file tree

Hide file tree

Showing 6 changed files with 498 additions and 493 deletions.
diff --git a/app/background/wallet/stats.js b/app/background/wallet/stats.js
@@ -1,5 +1,6 @@
 const { states } = require("hsd/lib/covenants/namestate");
 
+/** @param {import('hsd/lib/wallet/wallet')} wallet */
 async function fromBids(wallet) {
   const height = wallet.wdb.height;
   const network = wallet.network;
@@ -30,6 +31,12 @@ async function fromBids(wallet) {
     const ns = await wallet.getNameState(bid.nameHash);
     const state = ns.state(height, network);
 
+    // Only consider bids from the latest auction (is local?)
+    const bidTx = await wallet.getTX(bid.prevout.hash);
+    if (bidTx.height < ns.height) {
+      continue;
+    }
+
     // Full bid + blind is locked up in the bidding phase
     if (state === states.BIDDING) {
       biddingNum++;
@@ -87,6 +94,7 @@ async function fromBids(wallet) {
   };
 }
 
+/** @param {import('hsd/lib/wallet/wallet')} wallet */
 async function fromReveals(wallet) {
   const height = wallet.wdb.height;
   const network = wallet.network;
@@ -145,6 +153,7 @@ async function fromReveals(wallet) {
   };
 }
 
+/** @param {import('hsd/lib/wallet/wallet')} wallet */
 async function fromNames(wallet) {
   const height = wallet.wdb.height;
   const network = wallet.network;
@@ -236,6 +245,7 @@ async function fromNames(wallet) {
   };
 }
 
+/** @param {import('hsd/lib/wallet/wallet')} wallet */
 export async function getStats(wallet) {
   const [statsFromBids, statsFromReveals, statsFromNames] = await Promise.all([
     fromBids(wallet),

diff --git a/app/components/Collapsible/collapsible.scss b/app/components/Collapsible/collapsible.scss
@@ -35,20 +35,19 @@
 
   &__content {
     opacity: 1;
-    // padding: 1rem;
     position: relative;
-    max-height: 35rem;
     height: auto;
     transition: 0.5s ease-out;
 
     &--hidden {
       opacity: 0;
-      max-height: 0;
+      max-height: 0 !important;
       overflow: hidden;
       transition: 0.5s ease-out;
     }
 
     &--overflowY {
+      max-height: 35rem;
       overflow-y: auto;
     }
   }

diff --git a/app/components/Records/EditableRecord.js b/app/components/Records/EditableRecord.js
@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import deepEqual from 'deep-equal';
 import { TableItem, TableRow } from '../Table';
 import { DROPDOWN_TYPES } from '../../ducks/names';
 import { deserializeRecord, serializeRecord, validate } from '../../utils/recordHelpers';
@@ -26,15 +27,18 @@ class EditableRecord extends Component {
     };
   }
 
-  componentDidUpdate() {
+  componentDidUpdate(prevProps) {
     const {type} = this.props.record || {};
     const currentTypeIndex = DROPDOWN_TYPES.findIndex(d => d.label === type);
-    this.setState({
-      isEditing: false,
-      value: serializeRecord(this.props.record),
-      errorMessage: '',
-      currentTypeIndex: Math.max(currentTypeIndex, 0),
-    });
+
+    if (!deepEqual(this.props.record, prevProps.record)) {
+      this.setState({
+        isEditing: false,
+        value: serializeRecord(this.props.record),
+        errorMessage: '',
+        currentTypeIndex: Math.max(currentTypeIndex, 0),
+      });
+    }
   }
 
   cancel = () => {