From f25971f498357c5cbd4d788adffec47e0cdda5e3 Mon Sep 17 00:00:00 2001
From: martonp <marci93@gmail.com>
Date: Tue, 14 Jun 2022 19:49:05 +0700
Subject: [PATCH] ui: Hide old errors on market page forms

Some of the forms on the markets page would show an old error when
opening the form. This is now fixed.
---
 client/webserver/site/src/js/dexsettings.ts |  2 --
 client/webserver/site/src/js/forms.ts       |  4 +++-
 client/webserver/site/src/js/markets.ts     | 16 ++++++++++++----
 client/webserver/site/src/js/wallets.ts     |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/client/webserver/site/src/js/dexsettings.ts b/client/webserver/site/src/js/dexsettings.ts
index 2ad146dd40..b72de6d73b 100644
--- a/client/webserver/site/src/js/dexsettings.ts
+++ b/client/webserver/site/src/js/dexsettings.ts
@@ -37,8 +37,6 @@ export default class DexSettingsPage extends BasePage {
 
     const closePopups = () => {
       Doc.hide(page.forms)
-      page.exportSeedPW.value = ''
-      page.seedDiv.textContent = ''
     }
 
     Doc.bind(page.forms, 'mousedown', (e: MouseEvent) => {
diff --git a/client/webserver/site/src/js/forms.ts b/client/webserver/site/src/js/forms.ts
index dc3c023ced..039e4bafec 100644
--- a/client/webserver/site/src/js/forms.ts
+++ b/client/webserver/site/src/js/forms.ts
@@ -855,12 +855,14 @@ export class UnlockWalletForm {
     bind(form, this.page.submitUnlock, () => this.submit())
   }
 
-  setAsset (asset: SupportedAsset) {
+  refresh (asset: SupportedAsset) {
     const page = this.page
     this.currentAsset = asset
     page.uwAssetLogo.src = Doc.logoPath(asset.symbol)
     page.uwAssetName.textContent = asset.info.name
     page.uwAppPass.value = ''
+    page.unlockErr.textContent = ''
+    Doc.hide(page.unlockErr)
     const hidePWBox = State.passwordIsCached() || (this.pwCache && this.pwCache.pw)
     if (hidePWBox) Doc.hide(page.uwAppPassBox)
     else Doc.show(page.uwAppPassBox)
diff --git a/client/webserver/site/src/js/markets.ts b/client/webserver/site/src/js/markets.ts
index f7a791e08a..4af3fe8d33 100644
--- a/client/webserver/site/src/js/markets.ts
+++ b/client/webserver/site/src/js/markets.ts
@@ -340,7 +340,7 @@ export default class MarketsPage extends BasePage {
     bindForm(page.cancelForm, page.cancelSubmit, async () => { this.submitCancel() })
     // Order detail view
     Doc.bind(page.vFeeDetails, 'click', () => this.showForm(page.vDetailPane))
-    Doc.bind(page.closeDetailPane, 'click', () => this.showForm(page.verifyForm))
+    Doc.bind(page.closeDetailPane, 'click', () => this.showVerifyForm())
     // Bind active orders list's header sort events.
     page.liveTable.querySelectorAll('[data-ordercol]')
       .forEach((th: HTMLElement) => bind(th, 'click', () => setOrdersSortCol(th.dataset.ordercol || '')))
@@ -388,7 +388,7 @@ export default class MarketsPage extends BasePage {
 
     // If the user clicks outside of a form, it should close the page overlay.
     bind(page.forms, 'mousedown', (e: MouseEvent) => {
-      if (Doc.isDisplayed(page.vDetailPane) && !Doc.mouseInElement(e, page.vDetailPane)) return this.showForm(page.verifyForm)
+      if (Doc.isDisplayed(page.vDetailPane) && !Doc.mouseInElement(e, page.vDetailPane)) return this.showVerifyForm()
       if (!Doc.mouseInElement(e, this.currentForm)) {
         closePopups()
       }
@@ -1354,7 +1354,7 @@ export default class MarketsPage extends BasePage {
     const page = this.page
     this.openAsset = asset
     this.openFunc = f
-    this.unlockForm.setAsset(app().assets[asset.id])
+    this.unlockForm.refresh(app().assets[asset.id])
     this.showForm(page.unlockWalletForm)
     page.uwAppPass.focus()
   }
@@ -1428,7 +1428,7 @@ export default class MarketsPage extends BasePage {
       page.vSubmit.classList.add(buyBtnClass)
       page.vSubmit.classList.remove(sellBtnClass)
     }
-    this.showForm(page.verifyForm)
+    this.showVerifyForm()
     page.vPass.focus()
 
     if (baseAsset.wallet.open && quoteAsset.wallet.open) this.preOrder(order)
@@ -1439,6 +1439,13 @@ export default class MarketsPage extends BasePage {
     }
   }
 
+  /* showVerifyForm displays form to verify an order */
+  async showVerifyForm () {
+    const page = this.page
+    Doc.hide(page.vErr)
+    this.showForm(page.verifyForm)
+  }
+
   /*
    * submitEstimateUnlock reads the current vUnlockPass and unlocks any locked
    * wallets.
@@ -1611,6 +1618,7 @@ export default class MarketsPage extends BasePage {
     const asset = OrderUtil.isMarketBuy(order) ? this.market.quote : this.market.base
     page.cancelRemain.textContent = Doc.formatCoinValue(remaining, asset.info.unitinfo)
     page.cancelUnit.textContent = asset.symbol.toUpperCase()
+    Doc.hide(page.cancelErr)
     this.showForm(page.cancelForm)
     page.cancelPass.focus()
     this.cancelData = {
diff --git a/client/webserver/site/src/js/wallets.ts b/client/webserver/site/src/js/wallets.ts
index 3e4bfd4bc3..0d024f6202 100644
--- a/client/webserver/site/src/js/wallets.ts
+++ b/client/webserver/site/src/js/wallets.ts
@@ -393,7 +393,7 @@ export default class WalletsPage extends BasePage {
     const page = this.page
     this.openAsset = this.lastFormAsset = assetID
     await this.hideBox()
-    this.unlockForm.setAsset(app().assets[assetID])
+    this.unlockForm.refresh(app().assets[assetID])
     if (errorMsg) this.unlockForm.showErrorOnly(errorMsg)
     this.animation = this.showBox(page.unlockWalletForm, page.walletPass)
   }