Organize the code to avoid future errors

Author: vitorflg

manifest.json

@@ -26,9 +26,7 @@
   },
   "mustUpdateAt": "2018-09-05",
   "categories": [],
-  "registries": [
-    "smartcheckout"
-  ],
+  "registries": ["smartcheckout"],
   "settingsSchema": {},
   "scripts": {
     "postreleasy": "vtex publish -r vtex --verbose"

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]
   )

react/components/EditorContainer/Topbar/UrlInput.tsx

@@ -13,15 +13,15 @@ const UrlInput = () => {
     const SEARCH_QUERIES_TO_HIDE = [
       '__siteEditor',
       '__bindingAddress',
-      '__localeAddress',
+      '__locale',
     ]
 
     SEARCH_QUERIES_TO_HIDE.forEach(query => {
       searchParams.delete(query)
     })
 
     if (searchParams.toString().length) {
-      return pathname + `?${searchParams.toString()}`
+      return pathname + decodeURIComponent(`?${searchParams.toString()}`)
     }
 
     return pathname