From f88fa9326a676f97165508de4cc9797f8273c54b Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Fri, 29 Jan 2021 17:56:51 -0300
Subject: [PATCH 01/10] Hide query string from the site editor top bar

---
 CHANGELOG.md                                  | 32 +++++++++++++++++--
 .../EditorContainer/StoreIframe.tsx           |  9 +++++-
 .../Topbar/ContextSelectors/index.tsx         |  2 +-
 .../EditorContainer/Topbar/UrlInput.tsx       | 21 ++++++++++--
 4 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4615c66f8..ccaacdd4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,23 +7,38 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+- Block selector not working after a locale change
+
+### Added
+- Block selector status(wait)
+
+### Changed
+- Hides query strings from site editor top bar.
+
 ## [4.40.0] - 2021-04-13
 
 ### Fixed
 - File format disclaimer to both iOS and Android icons uploaded via the PWA section inside of Store settings page not added in some languages.
 
 ## [4.39.0] - 2021-04-05
+
 ### Added
+
 - File format disclaimer to both iOS and Android icons uploaded via the PWA section inside of Store settings page.
 
+## [4.37.0] - 2021-02-09
+
+- Adds support for multi binding for redirect CSV managment
+
 ## [4.38.1] - 2021-03-17
 
 ### Fixed
 
 - I18n En, Es, Pt, Ro and Jp.
 - Context.json with new strings.
-## [4.38.0] - 2021-03-08
 
+## [4.38.0] - 2021-03-08
 
 ### Added
 
@@ -32,20 +47,29 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 
 - I18n Ro.
+
 ## [4.37.0] - 2021-02-09
+
 ### Added
+
 - Support for multi binding for redirect CSV management.
 
 ## [4.36.1] - 2021-02-08
+
 ### Fixed
+
 - Preventing unchanged information to be sent and updated as undefined in `admin-pages\Form\index`
 
 ## [4.36.0] - 2021-02-02
+
 ### Fixed
+
 - Setting `Description` and `Keywords` as editable fields with the same condition as `Title` in `admin-pages`
 
 ## [4.35.0] - 2021-02-02
+
 ### Added
+
 - Adds binding selector for CMS Redirects
 
 ## [4.34.0] - 2021-01-22
@@ -61,11 +85,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Site editor flag in the iframe URL.
 
 ## [4.32.0] - 2021-01-21
+
 ### Added
-- Adds binding selector for CMS Pages 
+
+- Adds binding selector for CMS Pages
 
 ## [4.31.1] - 2021-01-20
+
 ### Fixed
+
 - Sending blockId in `Form index` component even when is not changed to prevent unexpected behaviors
 
 ## [4.31.0] - 2021-01-13
diff --git a/react/components/EditorContainer/StoreIframe.tsx b/react/components/EditorContainer/StoreIframe.tsx
index fed233f5c..2a2049cdd 100644
--- a/react/components/EditorContainer/StoreIframe.tsx
+++ b/react/components/EditorContainer/StoreIframe.tsx
@@ -32,11 +32,18 @@ const StoreIframe: React.FunctionComponent<Props> = ({ path }) => {
 
   let src = path ? `/${path}` : '/'
 
+  if (window?.location.search && !src.includes(window.location.search)) {
+    src = src + `${window.location.search}`
+  }
+
   if (binding && !src.includes('__bindingAddress')) {
+    console.log('PASSOU')
     src += `${getJoiner(src)}__bindingAddress=${binding.canonicalBaseAddress}`
   }
 
-  src += `${getJoiner(src)}__siteEditor`
+  if (!src.includes('__siteEditor')) {
+    src += `${getJoiner(src)}__siteEditor=true`
+  }
 
   return (
     <iframe
diff --git a/react/components/EditorContainer/Topbar/ContextSelectors/index.tsx b/react/components/EditorContainer/Topbar/ContextSelectors/index.tsx
index 8d9c51c94..79ac90e41 100644
--- a/react/components/EditorContainer/Topbar/ContextSelectors/index.tsx
+++ b/react/components/EditorContainer/Topbar/ContextSelectors/index.tsx
@@ -96,7 +96,7 @@ const ContextSelectors: React.FC<WithApolloClient<Props>> = ({
         if (newBinding && editor.iframeWindow) {
           setBinding(newBinding)
 
-          editor.iframeWindow.location.search = `__bindingAddress=${newBinding.canonicalBaseAddress}&__siteEditor`
+          editor.iframeWindow.location.search = `__bindingAddress=${newBinding.canonicalBaseAddress}&__siteEditor=true`
         }
       }
     },
diff --git a/react/components/EditorContainer/Topbar/UrlInput.tsx b/react/components/EditorContainer/Topbar/UrlInput.tsx
index 2b212161e..7977fa324 100644
--- a/react/components/EditorContainer/Topbar/UrlInput.tsx
+++ b/react/components/EditorContainer/Topbar/UrlInput.tsx
@@ -8,9 +8,26 @@ const UrlInput = () => {
 
   const editor = useEditorContext()
 
+  const resolveUrlPath = (pathname: string, searchQueries: string) => {
+    const searchParams = new URLSearchParams(searchQueries)
+    const blacklistedSearchQueries = ['__siteEditor', '__bindingAddress']
+
+    blacklistedSearchQueries.forEach(query => {
+      searchParams.delete(query)
+    })
+
+    if (searchParams.toString().length) {
+      return pathname + `?${searchParams.toString()}`
+    }
+
+    return pathname
+  }
+
   const urlPath = editor.iframeWindow
-    ? editor.iframeWindow.location.pathname +
-      editor.iframeWindow.location.search
+    ? resolveUrlPath(
+        editor.iframeWindow.location.pathname,
+        editor.iframeWindow.location.search
+      )
     : ''
 
   const [url, setUrl] = React.useState(urlPath)

From 2a60bc78da02b7730718b1d241f1a30a939cd838 Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Thu, 11 Feb 2021 20:15:23 -0300
Subject: [PATCH 02/10] Rebase + hide only selected query strings

---
 react/components/EditorContainer/StoreIframe.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/react/components/EditorContainer/StoreIframe.tsx b/react/components/EditorContainer/StoreIframe.tsx
index 2a2049cdd..f2f060cb1 100644
--- a/react/components/EditorContainer/StoreIframe.tsx
+++ b/react/components/EditorContainer/StoreIframe.tsx
@@ -37,7 +37,6 @@ const StoreIframe: React.FunctionComponent<Props> = ({ path }) => {
   }
 
   if (binding && !src.includes('__bindingAddress')) {
-    console.log('PASSOU')
     src += `${getJoiner(src)}__bindingAddress=${binding.canonicalBaseAddress}`
   }
 

From de9e8134236f8015ca2f3adbf76ce700552c5184 Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Thu, 11 Feb 2021 20:22:44 -0300
Subject: [PATCH 03/10] Format code

---
 react/components/EditorContainer/Topbar/UrlInput.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/react/components/EditorContainer/Topbar/UrlInput.tsx b/react/components/EditorContainer/Topbar/UrlInput.tsx
index 7977fa324..42a974a04 100644
--- a/react/components/EditorContainer/Topbar/UrlInput.tsx
+++ b/react/components/EditorContainer/Topbar/UrlInput.tsx
@@ -10,9 +10,9 @@ const UrlInput = () => {
 
   const resolveUrlPath = (pathname: string, searchQueries: string) => {
     const searchParams = new URLSearchParams(searchQueries)
-    const blacklistedSearchQueries = ['__siteEditor', '__bindingAddress']
+    const SEARCH_QUERIES_BLACKLIST = ['__siteEditor', '__bindingAddress']
 
-    blacklistedSearchQueries.forEach(query => {
+    SEARCH_QUERIES_BLACKLIST.forEach(query => {
       searchParams.delete(query)
     })
 

From 8df4e75dae5a5ad605e5c0fbd51046d64c3d390f Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Fri, 12 Feb 2021 17:17:27 -0300
Subject: [PATCH 04/10] Change variable

---
 react/components/EditorContainer/Topbar/UrlInput.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/react/components/EditorContainer/Topbar/UrlInput.tsx b/react/components/EditorContainer/Topbar/UrlInput.tsx
index 42a974a04..f764f330f 100644
--- a/react/components/EditorContainer/Topbar/UrlInput.tsx
+++ b/react/components/EditorContainer/Topbar/UrlInput.tsx
@@ -10,9 +10,9 @@ const UrlInput = () => {
 
   const resolveUrlPath = (pathname: string, searchQueries: string) => {
     const searchParams = new URLSearchParams(searchQueries)
-    const SEARCH_QUERIES_BLACKLIST = ['__siteEditor', '__bindingAddress']
+    const SEARCH_QUERIES_TO_HIDE = ['__siteEditor', '__bindingAddress']
 
-    SEARCH_QUERIES_BLACKLIST.forEach(query => {
+    SEARCH_QUERIES_TO_HIDE.forEach(query => {
       searchParams.delete(query)
     })
 

From d01f040c1765b27f52ea2891ec69272cd26dc8d3 Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Thu, 25 Feb 2021 20:04:01 -0300
Subject: [PATCH 05/10] Remove unused condition

---
 react/components/EditorContainer/StoreIframe.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/react/components/EditorContainer/StoreIframe.tsx b/react/components/EditorContainer/StoreIframe.tsx
index f2f060cb1..1b04a5231 100644
--- a/react/components/EditorContainer/StoreIframe.tsx
+++ b/react/components/EditorContainer/StoreIframe.tsx
@@ -32,9 +32,9 @@ const StoreIframe: React.FunctionComponent<Props> = ({ path }) => {
 
   let src = path ? `/${path}` : '/'
 
-  if (window?.location.search && !src.includes(window.location.search)) {
-    src = src + `${window.location.search}`
-  }
+  // if (window?.location.search && !src.includes(window.location.search)) {
+  //   src = src + `${window.location.search}`
+  // }
 
   if (binding && !src.includes('__bindingAddress')) {
     src += `${getJoiner(src)}__bindingAddress=${binding.canonicalBaseAddress}`

From 3fdaf3566345040e235bf57b9fdf8b27f3354f66 Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Thu, 25 Feb 2021 20:04:53 -0300
Subject: [PATCH 06/10] Remove comment

---
 react/components/EditorContainer/StoreIframe.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/react/components/EditorContainer/StoreIframe.tsx b/react/components/EditorContainer/StoreIframe.tsx
index 1b04a5231..0cbdf2b94 100644
--- a/react/components/EditorContainer/StoreIframe.tsx
+++ b/react/components/EditorContainer/StoreIframe.tsx
@@ -32,10 +32,6 @@ const StoreIframe: React.FunctionComponent<Props> = ({ path }) => {
 
   let src = path ? `/${path}` : '/'
 
-  // if (window?.location.search && !src.includes(window.location.search)) {
-  //   src = src + `${window.location.search}`
-  // }
-
   if (binding && !src.includes('__bindingAddress')) {
     src += `${getJoiner(src)}__bindingAddress=${binding.canonicalBaseAddress}`
   }

From dacbaaeaa2e3b6604cc324bba75297c6578eb666 Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Thu, 25 Feb 2021 20:24:51 -0300
Subject: [PATCH 07/10] Fix block selector inconsistencies

---
 .../EditorContainer/Topbar/BlockPicker.tsx    |  7 +++++--
 .../ContextSelectors/LocaleSelector.tsx       | 19 +++++++++++++++++--
 .../Topbar/ContextSelectors/index.tsx         |  2 ++
 .../EditorContainer/Topbar/UrlInput.tsx       |  8 +++++++-
 react/components/EditorProvider.tsx           |  2 +-
 react/typings/global.d.ts                     |  2 +-
 6 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/react/components/EditorContainer/Topbar/BlockPicker.tsx b/react/components/EditorContainer/Topbar/BlockPicker.tsx
index 09a86c3b3..7bf9604e6 100644
--- a/react/components/EditorContainer/Topbar/BlockPicker.tsx
+++ b/react/components/EditorContainer/Topbar/BlockPicker.tsx
@@ -4,7 +4,6 @@ import { InjectedIntlProps, injectIntl } from 'react-intl'
 import { Tooltip } from 'vtex.styleguide'
 
 import { useEditorContext } from '../../EditorContext'
-
 import { useHover } from './hooks'
 import IconPicker from './icons/IconPicker'
 
@@ -26,13 +25,17 @@ const BlockPicker: React.FC<InjectedIntlProps> = ({ intl }) => {
       position="bottom"
     >
       <button
+        style={editor.mode === 'disabled' ? { cursor: 'wait' } : {}}
         className={`w2 h2 bg-white br2 b--transparent outline-0 pointer flex justify-center items-center ${
-          editor.editMode || hover ? 'c-action-primary' : 'c-on-disabled'
+          editor.editMode || (hover && editor.mode !== 'disabled')
+            ? 'c-action-primary'
+            : 'c-on-disabled'
         }`}
         onClick={handleEditModeToggle}
         onKeyPress={handleKeyPress}
         onMouseEnter={handleMouseEnter}
         onMouseLeave={handleMouseLeave}
+        disabled={editor.mode === 'disabled'}
       >
         <IconPicker />
       </button>
diff --git a/react/components/EditorContainer/Topbar/ContextSelectors/LocaleSelector.tsx b/react/components/EditorContainer/Topbar/ContextSelectors/LocaleSelector.tsx
index fb8ea372b..6c96dc7c6 100644
--- a/react/components/EditorContainer/Topbar/ContextSelectors/LocaleSelector.tsx
+++ b/react/components/EditorContainer/Topbar/ContextSelectors/LocaleSelector.tsx
@@ -20,13 +20,27 @@ const LocaleSelector: React.FC<Props> = ({
 }) => {
   const { culture, emitter } = iframeRuntime
 
+  const editor = useEditorContext()
+
   const [locale, setLocale] = React.useState(culture.locale)
 
   const handleChange = React.useCallback(
     (e: React.ChangeEvent<HTMLSelectElement>) => {
       setLocale(e.target.value)
 
-      emitter.emit('localesChanged', e.target.value)
+      emitter.emit('localesChanged', e.target.value, null, () => {
+        if (editor.iframeWindow) {
+          const searchParams = new URLSearchParams(
+            editor.iframeWindow.location.search
+          )
+
+          const bindingQueryString = searchParams.get('__bindingAddress')
+
+          editor.iframeWindow.location.search = `__bindingAddress=${bindingQueryString}&__localeAddress=${e.target.value}&__siteEditor=true`
+        }
+      })
+
+      editor.setMode('disabled')
     },
     [emitter]
   )
@@ -35,6 +49,8 @@ const LocaleSelector: React.FC<Props> = ({
     if (locale !== culture.locale) {
       setLocale(culture.locale)
     }
+
+    if (editor.mode !== 'layout') editor.setMode('layout')
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [culture.locale])
 
@@ -53,7 +69,6 @@ const LocaleSelector: React.FC<Props> = ({
     [className, handleChange, isDisabled, locale, options]
   )
 
-  const editor = useEditorContext()
   const intl = useIntl()
 
   return editor.editTreePath ? (
diff --git a/react/components/EditorContainer/Topbar/ContextSelectors/index.tsx b/react/components/EditorContainer/Topbar/ContextSelectors/index.tsx
index 79ac90e41..648764309 100644
--- a/react/components/EditorContainer/Topbar/ContextSelectors/index.tsx
+++ b/react/components/EditorContainer/Topbar/ContextSelectors/index.tsx
@@ -98,6 +98,8 @@ const ContextSelectors: React.FC<WithApolloClient<Props>> = ({
 
           editor.iframeWindow.location.search = `__bindingAddress=${newBinding.canonicalBaseAddress}&__siteEditor=true`
         }
+
+        editor.setMode('disabled')
       }
     },
     [bindings, setBinding, editor.iframeWindow]
diff --git a/react/components/EditorContainer/Topbar/UrlInput.tsx b/react/components/EditorContainer/Topbar/UrlInput.tsx
index f764f330f..c2ab27995 100644
--- a/react/components/EditorContainer/Topbar/UrlInput.tsx
+++ b/react/components/EditorContainer/Topbar/UrlInput.tsx
@@ -10,7 +10,11 @@ const UrlInput = () => {
 
   const resolveUrlPath = (pathname: string, searchQueries: string) => {
     const searchParams = new URLSearchParams(searchQueries)
-    const SEARCH_QUERIES_TO_HIDE = ['__siteEditor', '__bindingAddress']
+    const SEARCH_QUERIES_TO_HIDE = [
+      '__siteEditor',
+      '__bindingAddress',
+      '__localeAddress',
+    ]
 
     SEARCH_QUERIES_TO_HIDE.forEach(query => {
       searchParams.delete(query)
@@ -34,6 +38,8 @@ const UrlInput = () => {
 
   React.useEffect(() => {
     setUrl(urlPath)
+
+    if (editor.mode !== 'layout') editor.setMode('layout')
   }, [urlPath])
 
   const onEnter = (
diff --git a/react/components/EditorProvider.tsx b/react/components/EditorProvider.tsx
index 40c5dcba5..45a0a579b 100644
--- a/react/components/EditorProvider.tsx
+++ b/react/components/EditorProvider.tsx
@@ -306,7 +306,7 @@ class EditorProvider extends Component<Props, State> {
   }
 
   public handleSetMode = (mode: EditorMode) => {
-    this.setState({ mode })
+    this.setState({ mode, editMode: mode === 'content' ? true : false })
   }
 
   public handleChangeIframeUrl = (url: string) => {
diff --git a/react/typings/global.d.ts b/react/typings/global.d.ts
index bf37ae623..079fc43c7 100644
--- a/react/typings/global.d.ts
+++ b/react/typings/global.d.ts
@@ -170,7 +170,7 @@ declare global {
 
   type ConfigurationDevice = 'any' | 'desktop' | 'mobile'
 
-  type EditorMode = 'content' | 'layout'
+  type EditorMode = 'content' | 'layout' | 'disabled'
 
   interface EditorConditionSection {
     activeConditions: string[]

From f16678384f042c7e5aac8905abc7b66ebb6b784d Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Mon, 19 Apr 2021 12:34:33 -0300
Subject: [PATCH 08/10] Organize the code to avoid future errors

---
 manifest.json                                 |  4 +-
 .../ContextSelectors/LocaleSelector.tsx       | 43 +++++++++++++------
 .../EditorContainer/Topbar/UrlInput.tsx       |  4 +-
 3 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/manifest.json b/manifest.json
index 9c2b4966b..a06d3f1fb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -26,9 +26,7 @@
   },
   "mustUpdateAt": "2018-09-05",
   "categories": [],
-  "registries": [
-    "smartcheckout"
-  ],
+  "registries": ["smartcheckout"],
   "settingsSchema": {},
   "scripts": {
     "postreleasy": "vtex publish -r vtex --verbose"
diff --git a/react/components/EditorContainer/Topbar/ContextSelectors/LocaleSelector.tsx b/react/components/EditorContainer/Topbar/ContextSelectors/LocaleSelector.tsx
index 6c96dc7c6..da02c4aa6 100644
--- a/react/components/EditorContainer/Topbar/ContextSelectors/LocaleSelector.tsx
+++ b/react/components/EditorContainer/Topbar/ContextSelectors/LocaleSelector.tsx
@@ -26,21 +26,38 @@ const LocaleSelector: React.FC<Props> = ({
 
   const handleChange = React.useCallback(
     (e: React.ChangeEvent<HTMLSelectElement>) => {
-      setLocale(e.target.value)
-
-      emitter.emit('localesChanged', e.target.value, null, () => {
-        if (editor.iframeWindow) {
-          const searchParams = new URLSearchParams(
-            editor.iframeWindow.location.search
-          )
-
-          const bindingQueryString = searchParams.get('__bindingAddress')
+      editor.setMode('disabled')
 
-          editor.iframeWindow.location.search = `__bindingAddress=${bindingQueryString}&__localeAddress=${e.target.value}&__siteEditor=true`
+      setLocale(e?.target?.value)
+
+      emitter.emit(
+        'localesChanged',
+        e?.target?.value,
+        null,
+        (locale: string) => {
+          let bindingQueryString
+
+          if (editor.iframeWindow) {
+            const searchParams = new URLSearchParams(
+              editor?.iframeWindow?.location.search
+            )
+
+            const bindingAddress = searchParams.get('__bindingAddress')
+
+            if (bindingAddress) {
+              bindingQueryString = `__bindingAddress=${decodeURIComponent(
+                bindingAddress
+              )}`
+            }
+
+            if (e?.target?.value) {
+              editor.iframeWindow.location.search = `${bindingQueryString}&__locale=${e.target.value}&__siteEditor=true`
+            } else {
+              editor.iframeWindow.location.search = `${bindingQueryString}&__locale=${locale}&__siteEditor=true`
+            }
+          }
         }
-      })
-
-      editor.setMode('disabled')
+      )
     },
     [emitter]
   )
diff --git a/react/components/EditorContainer/Topbar/UrlInput.tsx b/react/components/EditorContainer/Topbar/UrlInput.tsx
index c2ab27995..5157d46ae 100644
--- a/react/components/EditorContainer/Topbar/UrlInput.tsx
+++ b/react/components/EditorContainer/Topbar/UrlInput.tsx
@@ -13,7 +13,7 @@ const UrlInput = () => {
     const SEARCH_QUERIES_TO_HIDE = [
       '__siteEditor',
       '__bindingAddress',
-      '__localeAddress',
+      '__locale',
     ]
 
     SEARCH_QUERIES_TO_HIDE.forEach(query => {
@@ -21,7 +21,7 @@ const UrlInput = () => {
     })
 
     if (searchParams.toString().length) {
-      return pathname + `?${searchParams.toString()}`
+      return pathname + decodeURIComponent(`?${searchParams.toString()}`)
     }
 
     return pathname

From 87cabec94428b4d897d635e341d09f4d0d454c33 Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Tue, 20 Apr 2021 17:52:05 -0300
Subject: [PATCH 09/10] Fix: adjust edition state

---
 .../Topbar/ContextSelectors/LocaleSelector.tsx            | 8 ++++++--
 react/components/EditorContainer/Topbar/UrlInput.tsx      | 2 --
 react/components/EditorProvider.tsx                       | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/react/components/EditorContainer/Topbar/ContextSelectors/LocaleSelector.tsx b/react/components/EditorContainer/Topbar/ContextSelectors/LocaleSelector.tsx
index da02c4aa6..ea1fa8269 100644
--- a/react/components/EditorContainer/Topbar/ContextSelectors/LocaleSelector.tsx
+++ b/react/components/EditorContainer/Topbar/ContextSelectors/LocaleSelector.tsx
@@ -66,11 +66,15 @@ const LocaleSelector: React.FC<Props> = ({
     if (locale !== culture.locale) {
       setLocale(culture.locale)
     }
-
-    if (editor.mode !== 'layout') editor.setMode('layout')
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [culture.locale])
 
+  React.useEffect(() => {
+    if (editor.mode !== 'content') {
+      editor.setMode('content')
+    }
+  }, [culture.locale, culture.country])
+
   const Selector = React.useCallback(
     () => (
       <div className={className}>
diff --git a/react/components/EditorContainer/Topbar/UrlInput.tsx b/react/components/EditorContainer/Topbar/UrlInput.tsx
index 5157d46ae..f77460f0d 100644
--- a/react/components/EditorContainer/Topbar/UrlInput.tsx
+++ b/react/components/EditorContainer/Topbar/UrlInput.tsx
@@ -38,8 +38,6 @@ const UrlInput = () => {
 
   React.useEffect(() => {
     setUrl(urlPath)
-
-    if (editor.mode !== 'layout') editor.setMode('layout')
   }, [urlPath])
 
   const onEnter = (
diff --git a/react/components/EditorProvider.tsx b/react/components/EditorProvider.tsx
index 45a0a579b..43f591026 100644
--- a/react/components/EditorProvider.tsx
+++ b/react/components/EditorProvider.tsx
@@ -306,7 +306,7 @@ class EditorProvider extends Component<Props, State> {
   }
 
   public handleSetMode = (mode: EditorMode) => {
-    this.setState({ mode, editMode: mode === 'content' ? true : false })
+    this.setState({ mode, editMode: mode === 'content' ? false : true })
   }
 
   public handleChangeIframeUrl = (url: string) => {

From f65f1aa68eac35b674a6140bdc793b86ccdc4bb2 Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Thu, 22 Apr 2021 06:02:23 -0300
Subject: [PATCH 10/10] Update CHANGELOG.md

---
 CHANGELOG.md | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccaacdd4c..20944ee79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,10 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
 
 ### Fixed
-- Block selector not working after a locale change
+- Block selector not working after a locale change.
 
 ### Added
-- Block selector status(wait)
+- Block selector status(wait).
 
 ### Changed
 - Hides query strings from site editor top bar.
@@ -22,24 +22,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - File format disclaimer to both iOS and Android icons uploaded via the PWA section inside of Store settings page not added in some languages.
 
 ## [4.39.0] - 2021-04-05
-
 ### Added
-
 - File format disclaimer to both iOS and Android icons uploaded via the PWA section inside of Store settings page.
 
-## [4.37.0] - 2021-02-09
-
-- Adds support for multi binding for redirect CSV managment
-
 ## [4.38.1] - 2021-03-17
 
 ### Fixed
 
 - I18n En, Es, Pt, Ro and Jp.
 - Context.json with new strings.
-
 ## [4.38.0] - 2021-03-08
 
+
 ### Added
 
 - I18n Jp.
@@ -47,29 +41,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 
 - I18n Ro.
-
 ## [4.37.0] - 2021-02-09
-
 ### Added
-
 - Support for multi binding for redirect CSV management.
 
 ## [4.36.1] - 2021-02-08
-
 ### Fixed
-
 - Preventing unchanged information to be sent and updated as undefined in `admin-pages\Form\index`
 
 ## [4.36.0] - 2021-02-02
-
 ### Fixed
-
 - Setting `Description` and `Keywords` as editable fields with the same condition as `Title` in `admin-pages`
 
 ## [4.35.0] - 2021-02-02
-
 ### Added
-
 - Adds binding selector for CMS Redirects
 
 ## [4.34.0] - 2021-01-22
@@ -85,15 +70,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Site editor flag in the iframe URL.
 
 ## [4.32.0] - 2021-01-21
-
 ### Added
-
-- Adds binding selector for CMS Pages
+- Adds binding selector for CMS Pages 
 
 ## [4.31.1] - 2021-01-20
-
 ### Fixed
-
 - Sending blockId in `Form index` component even when is not changed to prevent unexpected behaviors
 
 ## [4.31.0] - 2021-01-13