fix reg auth. a couple js bugs

decred · Apr 23, 2024 · 523d749 · 523d749
1 parent 457459c
commit 523d749
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/client/core/bond.go b/client/core/bond.go
@@ -1024,18 +1024,7 @@ func (c *Core) RedeemPrepaidBond(appPW []byte, code []byte, host string, certI a
 	dc.acct.bonds = append(dc.acct.bonds, dbBond)
 	dc.acct.authMtx.Unlock()
 
-	defer func() {
-		if success {
-			c.notify(newBondAuthUpdate(dc.acct.host, c.exchangeAuth(dc)))
-		}
-	}()
-
-	if acctExists {
-		err = c.db.AddBond(dc.acct.host, dbBond)
-		if err != nil {
-			return 0, fmt.Errorf("failed to store pre-paid bond for dex %s: %w", host, err)
-		}
-	} else {
+	if !acctExists {
 		dc.acct.keyMtx.RLock()
 		ai := &db.AccountInfo{
 			Host:      dc.acct.host,
@@ -1045,15 +1034,27 @@ func (c *Core) RedeemPrepaidBond(appPW []byte, code []byte, host string, certI a
 			Bonds:     []*db.Bond{dbBond},
 		}
 		dc.acct.keyMtx.RUnlock()
-		err = c.dbCreateOrUpdateAccount(dc, ai)
-		if err != nil {
+
+		if err = c.dbCreateOrUpdateAccount(dc, ai); err != nil {
 			return 0, fmt.Errorf("failed to store pre-paid account for dex %s: %w", host, err)
 		}
+		c.addDexConnection(dc)
+	}
+
+	success = true // Don't disconnect anymore.
+
+	if err = c.db.AddBond(dc.acct.host, dbBond); err != nil {
+		return 0, fmt.Errorf("failed to store pre-paid bond for dex %s: %w", host, err)
+	}
+
+	if err = c.bondConfirmed(dc, account.PrepaidBondID, code, postBondRes); err != nil {
+		return 0, fmt.Errorf("bond redeemed, but failed to auth: %v", err)
 	}
 
 	c.updateBondReserves()
 
-	success = true
+	c.notify(newBondAuthUpdate(dc.acct.host, c.exchangeAuth(dc)))
+
 	return uint64(postBondRes.Strength), nil
 }
 

diff --git a/client/webserver/site/src/html/bodybuilder.tmpl b/client/webserver/site/src/html/bodybuilder.tmpl
@@ -13,7 +13,7 @@
 </head>
 <body >
   <div class="popup-notes d-hide" id="popupNotes">
-    <span data-tmpl="note fs15">
+    <span data-tmpl="note" class="fs15">
       <div class="note-indicator d-inline-block" data-tmpl="indicator"></div>
       <span data-tmpl="text"></span>
     </span>

diff --git a/client/webserver/site/src/js/markets.ts b/client/webserver/site/src/js/markets.ts
@@ -775,7 +775,7 @@ export default class MarketsPage extends BasePage {
     }
 
     Doc.setVis(this.mmRunning, page.mmRunning)
-    Doc.setVis(!this.mmRunning, page.orderForm, page.orderTypeBttns)
+    if (this.mmRunning) Doc.hide(page.orderForm, page.orderTypeBttns)
   }
 
   /* setLoaderMsgVisibility displays a message in case a dex asset is not