separate template from exec for updating lang

Author: buck54321

client/webserver/api.go

@@ -1031,9 +1031,11 @@ func (s *WebServer) apiSetLocale(w http.ResponseWriter, r *http.Request) {
 	// Get actual language after SetLanguage (in case of fallback)
 	actualLang := s.core.Language()
 	s.lang.Store(actualLang)
-	if err := s.buildTemplates(actualLang); err != nil {
-		s.writeAPIError(w, err)
-		return
+	if !newUI {
+		if err := s.buildTemplates(actualLang); err != nil {
+			s.writeAPIError(w, err)
+			return
+		}
 	}
 
 	writeJSON(w, simpleAck())

client/webserver/newui/src/components/InitWizard.tsx

@@ -21,8 +21,8 @@ const SeedPromptForm = ({ setUsingSeed }: SeedPromptFormParams) => {
       </header>
       <div className="px-3">{t('prompt_for_seed')}</div>
       <div className="d-flex align-items-center p-3">
-        <button className="fs16 me-1 flex-grow-1" onClick={onUsingSeedClicked}>Yes</button>
-        <button className="feature fs16 ms-1 flex-grow-1" onClick={onNoSeedClicked}>No</button>
+        <button className="fs16 me-1 flex-grow-1" onClick={onUsingSeedClicked}>{t('Yes')}</button>
+        <button className="feature fs16 ms-1 flex-grow-1" onClick={onNoSeedClicked}>{t('No')}</button>
       </div>
     </form>
   )

client/webserver/newui/src/components/LocaleSelector.tsx

@@ -13,10 +13,11 @@ export default function LocaleSelector () {
   return (
     <div className="form-input-bg flex-center form-input-bg p-2 pointer hoverbg"
       onClick={(e) => {
-        e.currentTarget.querySelector('select').click()
+        const select = e.currentTarget.querySelector('select')
+        if (e.target === select) return
+        select.showPicker()
       }}>
-      <select className="pointer" onChange={(e) => changeLanguage(e.target.value)} value={lang}
-        onClick={(e) => e.stopPropagation()}>
+      <select className="pointer" onChange={(e) => changeLanguage(e.target.value)} value={lang}>
         {Object.keys(localeData).map((key) => (
           <option key={key} value={key}>
             {localeData[key].flag} {localeData[key].name}

client/webserver/newui/src/components/MainFrame.tsx

@@ -33,7 +33,7 @@ export default function MainFrame ({ pd }: MainFrameParams) {
       <Header />
       <div className="d-flex flex-grow-1 align-items-stretch">
         <Sidebar />
-        <div className="flex-grow-1 border-left border-top position-relative">{renderContent()}</div>
+        <div className="flex-grow-1 border-left border-top position-relative fade-in">{renderContent()}</div>
       </div>
       <Modals fd={formData} />
     </div>

client/webserver/newui/src/index.html

@@ -5,8 +5,8 @@
   <meta charset="utf-8">
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" href="/img/favicon.png?v={{.CommitHash}}">
-  <script defer src="/js/bundle.js?v={{.CommitHash}}"></script>
+  <link rel="icon" href="/img/favicon.png?v={{commitHash}}">
+  <script defer src="/js/bundle.js?v={{commitHash}}"></script>
   <title>Bison Wallet</title>
 </head>
 

client/webserver/newui/src/scss/main.scss

@@ -266,6 +266,20 @@ img.logo-full {
   }
 }
 
+@keyframes fadeIn {
+  0% {
+    opacity: 0;
+  }
+
+  100% {
+    opacity: 1;
+  }
+}
+
+.fade-in {
+  animation: fadeIn 0.3s ease-in-out;
+}
+
 .loading-bg {
   background-color: #30343d77;
   z-index: 201;

client/webserver/template.go

@@ -21,7 +21,6 @@ import (
 
 	"decred.org/dcrdex/client/intl"
 	"decred.org/dcrdex/client/webserver/locales"
-	"decred.org/dcrdex/dex"
 	"decred.org/dcrdex/dex/encode"
 	"github.com/yuin/goldmark"
 	"github.com/yuin/goldmark/extension"
@@ -307,7 +306,7 @@ var templateFuncs = template.FuncMap{
 	},
 }
 
-func (s *WebServer) newUIIndexHTML(siteDir string) ([]byte, error) {
+func (s *WebServer) newUIIndexTMPL(siteDir string) (*template.Template, error) {
 	var indexTmpl string
 	if siteDir != "" {
 		b, err := os.ReadFile(filepath.Join(siteDir, "dist", "index.html"))
@@ -327,23 +326,27 @@ func (s *WebServer) newUIIndexHTML(siteDir string) ([]byte, error) {
 		}
 		indexTmpl = string(b)
 	}
-	t, err := template.New("index").Parse(indexTmpl)
+	t, err := template.New("index").Funcs(template.FuncMap{
+		"commitHash": func() string {
+			if commitHash != "" {
+				return commitHash[:8]
+			}
+			return hex.EncodeToString(encode.RandomBytes(4))
+		},
+	}).Parse(indexTmpl)
 	if err != nil {
 		return nil, fmt.Errorf("error parsing new UI index.html: %v", err)
 	}
-	ch := commitHash
-	if ch == "" || s.core.Network() == dex.Simnet {
-		ch = hex.EncodeToString(encode.RandomBytes(4))
-	}
-	data := &struct {
-		Lang       string
-		CommitHash string
-	}{
-		Lang:       (s.lang.Load()).(string),
-		CommitHash: ch,
-	}
+	return t, nil
+}
+
+func (s *WebServer) newUIIndexHTML(tmpl *template.Template, lang string) ([]byte, error) {
 	var b bytes.Buffer
-	err = t.ExecuteTemplate(&b, "index", data)
+	err := tmpl.ExecuteTemplate(&b, "index", &struct {
+		Lang string
+	}{
+		Lang: lang,
+	})
 	if err != nil {
 		return nil, fmt.Errorf("error executing new UI index.html: %v", err)
 	}

client/webserver/webserver.go

@@ -552,7 +552,7 @@ func New(cfg *Config) (*WebServer, error) {
 			})
 		})
 	} else { // new UI. Only serve index.html.
-		indexHTML, err := s.newUIIndexHTML(siteDir)
+		tmpl, err := s.newUIIndexTMPL(siteDir)
 		if err != nil {
 			return nil, fmt.Errorf("error getting new UI index.html: %v", err)
 		}
@@ -563,6 +563,12 @@ func New(cfg *Config) (*WebServer, error) {
 					http.Error(w, "Invalid path", http.StatusBadRequest)
 					return
 				}
+				indexHTML, err := s.newUIIndexHTML(tmpl, s.lang.Load().(string))
+				if err != nil {
+					log.Errorf("error getting new UI index.html: %v", err)
+					http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+					return
+				}
 				w.Header().Set("Content-Type", "text/html;charset=UTF-8")
 				w.WriteHeader(http.StatusOK)
 				w.Write(indexHTML)