From 9dd1268b69c7d924ba14751a2effca397bb34e79 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Thu, 15 Dec 2016 15:56:50 +0100
Subject: [PATCH] Add keys for steps (future-proof)

---
 js/src/modals/UpgradeParity/store.js         |  2 +-
 js/src/modals/UpgradeParity/upgradeParity.js | 40 +++++++++++---------
 js/src/ui/Modal/Title/title.js               |  2 +-
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/js/src/modals/UpgradeParity/store.js b/js/src/modals/UpgradeParity/store.js
index 466a588e6..d7a4efd3e 100644
--- a/js/src/modals/UpgradeParity/store.js
+++ b/js/src/modals/UpgradeParity/store.js
@@ -25,7 +25,7 @@ const A_DAY = 24 * 60 * A_MINUTE;
 const STEP_INFO = 0;
 const STEP_UPDATING = 1;
 const STEP_COMPLETED = 2;
-const STEP_ERROR = 3;
+const STEP_ERROR = 2;
 
 const CHECK_INTERVAL = 1 * A_MINUTE;
 
diff --git a/js/src/modals/UpgradeParity/upgradeParity.js b/js/src/modals/UpgradeParity/upgradeParity.js
index 3e67c42f2..a11e1a1fe 100644
--- a/js/src/modals/UpgradeParity/upgradeParity.js
+++ b/js/src/modals/UpgradeParity/upgradeParity.js
@@ -49,16 +49,20 @@ export default class UpgradeParity extends Component {
         steps={ [
           <FormattedMessage
             id='upgradeParity.step.info'
+            key='info'
             defaultMessage='upgrade available' />,
           <FormattedMessage
+            key='updating'
             id='upgradeParity.step.updating'
             defaultMessage='upgrading parity' />,
           store.step === STEP_ERROR
             ? <FormattedMessage
               id='upgradeParity.step.error'
+              key='error'
               defaultMessage='error' />
             : <FormattedMessage
               id='upgradeParity.step.completed'
+              key='completed'
               defaultMessage='upgrade completed' />
         ] }
         visible>
@@ -158,6 +162,25 @@ export default class UpgradeParity extends Component {
         );
 
       case STEP_COMPLETED:
+      case STEP_ERROR:
+        if (store.error) {
+          return (
+            <Completed>
+              <div>
+                <FormattedMessage
+                  id='upgradeParity.failed'
+                  defaultMessage='Your upgrade to Parity {newversion} has failed with an error.'
+                  values={ {
+                    newversion: <div className={ styles.version }>{ newversion }</div>
+                  } } />
+              </div>
+              <div className={ styles.error }>
+                { store.error.message }
+              </div>
+            </Completed>
+          );
+        }
+
         return (
           <Completed>
             <FormattedMessage
@@ -168,23 +191,6 @@ export default class UpgradeParity extends Component {
               } } />
           </Completed>
         );
-
-      case STEP_ERROR:
-        return (
-          <Completed>
-            <div>
-              <FormattedMessage
-                id='upgradeParity.failed'
-                defaultMessage='Your upgrade to Parity {newversion} has failed with an error.'
-                values={ {
-                  newversion: <div className={ styles.version }>{ newversion }</div>
-                } } />
-            </div>
-            <div className={ styles.error }>
-              { store.error.message }
-            </div>
-          </Completed>
-        );
     }
   }
 
diff --git a/js/src/ui/Modal/Title/title.js b/js/src/ui/Modal/Title/title.js
index 920d1b13c..27197be28 100644
--- a/js/src/ui/Modal/Title/title.js
+++ b/js/src/ui/Modal/Title/title.js
@@ -72,7 +72,7 @@ export default class Title extends Component {
     return steps.map((label, index) => {
       return (
         <Step
-          key={ index }>
+          key={ label.key || index }>
           <StepLabel>
             { label }
           </StepLabel>