From 29697aa7283be405d88531d92ebdecd9b7cedea8 Mon Sep 17 00:00:00 2001
From: Gabor Hodi <gaborhodi@yahoo.com>
Date: Thu, 20 Jan 2022 18:29:53 +0100
Subject: [PATCH] [Issue8906] Fix broken html in the Area part of the
 Walkthrough

---
 modules/core/context.js  | 4 ----
 modules/ui/intro/area.js | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/core/context.js b/modules/core/context.js
index cbe4be7e8..21087728a 100644
--- a/modules/core/context.js
+++ b/modules/core/context.js
@@ -8,7 +8,6 @@ import { t } from '../core/localizer';
 
 import { fileFetcher } from './file_fetcher';
 import { localizer } from './localizer';
-import { prefs } from './preferences';
 import { coreHistory } from './history';
 import { coreValidator } from './validator';
 import { coreUploader } from './uploader';
@@ -32,9 +31,6 @@ export function coreContext() {
   // iD will alter the hash so cache the parameters intended to setup the session
   context.initialHashParams = window.location.hash ? utilStringQs(window.location.hash) : {};
 
-  context.isFirstSession = !prefs('sawSplash') && !prefs('sawPrivacyVersion');
-
-
   /* Changeset */
   // An osmChangeset object. Not loaded until needed.
   context.changeset = null;
diff --git a/modules/ui/intro/area.js b/modules/ui/intro/area.js
index d20cee392..370f75a25 100644
--- a/modules/ui/intro/area.js
+++ b/modules/ui/intro/area.js
@@ -328,8 +328,8 @@ export function uiIntroArea(context, reveal) {
             timeout(function() {
                 reveal('.more-fields .combobox-input',
                     helpHtml('intro.areas.add_field', {
-                        name: nameField.label(),
-                        description: descriptionField.label()
+                        name: { html: nameField.label() },
+                        description: { html: descriptionField.label() }
                     }),
                     { duration: 300 }
                 );
@@ -395,7 +395,7 @@ export function uiIntroArea(context, reveal) {
         }, 300);
 
         reveal('div.combobox',
-            helpHtml('intro.areas.choose_field', { field: descriptionField.label() }),
+            helpHtml('intro.areas.choose_field', { field: { html: descriptionField.label() } }),
             { duration: 300 }
         );
 
@@ -456,7 +456,7 @@ export function uiIntroArea(context, reveal) {
         context.container().select('.inspector-wrap .panewrap').style('right', '0%');
 
         reveal('.entity-editor-pane',
-            helpHtml('intro.areas.retry_add_field', { field: descriptionField.label() }), {
+            helpHtml('intro.areas.retry_add_field', { field: { html: descriptionField.label() } }), {
             buttonText: t.html('intro.ok'),
             buttonCallback: function() { continueTo(clickAddField); }
         });