From d791f3f67f69d8fcf5c6edaf9ad621f626a4e6a5 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Wed, 8 Jul 2020 09:28:42 -0400
Subject: [PATCH] Fixed: Digital before Physical for normal release order

---
 .../src/Movie/Details/MovieReleaseDates.js    | 23 +++++++++----------
 .../src/Movie/Index/Table/MovieIndexRow.js    | 22 +++++++++---------
 .../src/Store/Actions/movieIndexActions.js    |  8 +++----
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/frontend/src/Movie/Details/MovieReleaseDates.js b/frontend/src/Movie/Details/MovieReleaseDates.js
index 1435ddbf8..d6abd10c7 100644
--- a/frontend/src/Movie/Details/MovieReleaseDates.js
+++ b/frontend/src/Movie/Details/MovieReleaseDates.js
@@ -28,18 +28,6 @@ function MovieReleaseDates(props) {
             {getRelativeDate(inCinemas, shortDateFormat, showRelativeDates, { timeFormat, timeForToday: false })}
           </div>
       }
-      {
-        !!physicalRelease &&
-          <div >
-            <span className={styles.dateIcon}>
-              <Icon
-                name={icons.DISC}
-              />
-            </span>
-            {getRelativeDate(physicalRelease, shortDateFormat, showRelativeDates, { timeFormat, timeForToday: false })}
-          </div>
-      }
-
       {
         !!digitalRelease &&
           <div >
@@ -51,6 +39,17 @@ function MovieReleaseDates(props) {
             {getRelativeDate(digitalRelease, shortDateFormat, showRelativeDates, { timeFormat, timeForToday: false })}
           </div>
       }
+      {
+        !!physicalRelease &&
+          <div >
+            <span className={styles.dateIcon}>
+              <Icon
+                name={icons.DISC}
+              />
+            </span>
+            {getRelativeDate(physicalRelease, shortDateFormat, showRelativeDates, { timeFormat, timeForToday: false })}
+          </div>
+      }
     </div>
   );
 }
diff --git a/frontend/src/Movie/Index/Table/MovieIndexRow.js b/frontend/src/Movie/Index/Table/MovieIndexRow.js
index fee29b285..41d07ca5a 100644
--- a/frontend/src/Movie/Index/Table/MovieIndexRow.js
+++ b/frontend/src/Movie/Index/Table/MovieIndexRow.js
@@ -215,17 +215,6 @@ class MovieIndexRow extends Component {
               );
             }
 
-            if (name === 'physicalRelease') {
-              return (
-                <RelativeDateCellConnector
-                  key={name}
-                  className={styles[name]}
-                  date={physicalRelease}
-                  component={VirtualTableRowCell}
-                />
-              );
-            }
-
             if (name === 'digitalRelease') {
               return (
                 <RelativeDateCellConnector
@@ -237,6 +226,17 @@ class MovieIndexRow extends Component {
               );
             }
 
+            if (name === 'physicalRelease') {
+              return (
+                <RelativeDateCellConnector
+                  key={name}
+                  className={styles[name]}
+                  date={physicalRelease}
+                  component={VirtualTableRowCell}
+                />
+              );
+            }
+
             if (name === 'runtime') {
               return (
                 <VirtualTableRowCell
diff --git a/frontend/src/Store/Actions/movieIndexActions.js b/frontend/src/Store/Actions/movieIndexActions.js
index a9f235481..b143473de 100644
--- a/frontend/src/Store/Actions/movieIndexActions.js
+++ b/frontend/src/Store/Actions/movieIndexActions.js
@@ -114,14 +114,14 @@ export const defaultState = {
       isVisible: false
     },
     {
-      name: 'physicalRelease',
-      label: 'Physical Release',
+      name: 'digitalRelease',
+      label: 'Digital Release',
       isSortable: true,
       isVisible: false
     },
     {
-      name: 'digitalRelease',
-      label: 'Digital Release',
+      name: 'physicalRelease',
+      label: 'Physical Release',
       isSortable: true,
       isVisible: false
     },