From e2814b5404767a2e054e15c5045f59829f88686e Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Wed, 9 Feb 2022 13:56:08 -0500
Subject: [PATCH] chore: swaps placement of version comparisons

---
 .../fields/Relationship/index.tsx                  |  4 ++--
 .../RenderFieldsToDiff/fields/Text/index.tsx       |  4 ++--
 src/admin/components/views/Version/Version.tsx     | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/admin/components/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx b/src/admin/components/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx
index a98b498c96..99b4abbc06 100644
--- a/src/admin/components/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx
+++ b/src/admin/components/views/Version/RenderFieldsToDiff/fields/Relationship/index.tsx
@@ -85,8 +85,8 @@ const Relationship: React.FC<Props & { field: RelationshipField}> = ({ field, ve
         {field.label}
       </Label>
       <ReactDiffViewer
-        oldValue={typeof versionToRender !== 'undefined' ? String(versionToRender) : placeholder}
-        newValue={typeof comparisonToRender !== 'undefined' ? String(comparisonToRender) : placeholder}
+        oldValue={typeof comparisonToRender !== 'undefined' ? String(comparisonToRender) : placeholder}
+        newValue={typeof versionToRender !== 'undefined' ? String(versionToRender) : placeholder}
         splitView
         hideLineNumbers
         showDiffOnly={false}
diff --git a/src/admin/components/views/Version/RenderFieldsToDiff/fields/Text/index.tsx b/src/admin/components/views/Version/RenderFieldsToDiff/fields/Text/index.tsx
index 5c27477d75..4a63b430f5 100644
--- a/src/admin/components/views/Version/RenderFieldsToDiff/fields/Text/index.tsx
+++ b/src/admin/components/views/Version/RenderFieldsToDiff/fields/Text/index.tsx
@@ -30,8 +30,8 @@ const Text: React.FC<Props> = ({ field, locale, version, comparison, isRichText
       </Label>
       <ReactDiffViewer
         compareMethod={DiffMethod[diffMethod]}
-        oldValue={typeof versionToRender !== 'undefined' ? String(versionToRender) : placeholder}
-        newValue={typeof comparisonToRender !== 'undefined' ? String(comparisonToRender) : placeholder}
+        oldValue={typeof comparisonToRender !== 'undefined' ? String(comparisonToRender) : placeholder}
+        newValue={typeof versionToRender !== 'undefined' ? String(versionToRender) : placeholder}
         splitView
         hideLineNumbers
         showDiffOnly={false}
diff --git a/src/admin/components/views/Version/Version.tsx b/src/admin/components/views/Version/Version.tsx
index ff3c5984d3..277a1d15c2 100644
--- a/src/admin/components/views/Version/Version.tsx
+++ b/src/admin/components/views/Version/Version.tsx
@@ -187,6 +187,12 @@ const VersionView: React.FC<Props> = ({ collection, global }) => {
           />
         </header>
         <div className={`${baseClass}__controls`}>
+          <CompareVersion
+            baseURL={compareBaseURL}
+            parentID={parentID}
+            value={compareValue}
+            onChange={setCompareValue}
+          />
           {localization && (
             <SelectLocales
               onChange={setLocales}
@@ -194,19 +200,13 @@ const VersionView: React.FC<Props> = ({ collection, global }) => {
               value={locales}
             />
           )}
-          <CompareVersion
-            baseURL={compareBaseURL}
-            parentID={parentID}
-            value={compareValue}
-            onChange={setCompareValue}
-          />
         </div>
         {isLoading && (
           <Loading />
         )}
         {doc?.version && (
           <RenderFieldsToDiff
-            locales={locales.map((locale) => locale.value)}
+            locales={locales.map(({ value }) => value)}
             fields={fields}
             fieldComponents={fieldComponents}
             fieldPermissions={fieldPermissions}