Refactor Report.js to remove Ion.get()

src/IONKEYS.js

@@ -2,16 +2,15 @@
  * This is a file containing constants for all the top level keys in our store
  */
 export default {
-    ACTIVE_CLIENT_IDS: 'activeClientIDs',
-    APP_REDIRECT_TO: 'app_redirectTo',
-    CURRENT_URL: 'current_url',
+    ACTIVE_CLIENTS: 'activeClients',
+    APP_REDIRECT_TO: 'appRedirectTo',
+    CURRENT_URL: 'currentURL',
     CREDENTIALS: 'credentials',
-    MY_PERSONAL_DETAILS: 'my_personal_details',
+    FIRST_REPORT_ID: 'firstReportID',
+    MY_PERSONAL_DETAILS: 'myPersonalDetails',
     NETWORK: 'network',
-    PERSONAL_DETAILS: 'personal_details',
+    PERSONAL_DETAILS: 'personalDetails',
     REPORT: 'report',
-    REPORT_ACTION: 'reportAction',
-    REPORT_HISTORY: 'report_history',
-    FIRST_REPORT_ID: 'first_report_id',
+    REPORT_ACTIONS: 'reportActions',
     SESSION: 'session',
 };

src/lib/ActiveClientManager.js

@@ -10,17 +10,17 @@ const clientID = Guid();
  *
  * @returns {Promise}
  */
-const init = () => Ion.merge(IONKEYS.ACTIVE_CLIENT_IDS, {clientID});
+const init = () => Ion.merge(IONKEYS.ACTIVE_CLIENTS, {clientID});
 
 /**
  * Remove this client ID from the array of active client IDs when this client is exited
  *
  * @returns {Promise}
  */
 function removeClient() {
-    return Ion.get(IONKEYS.ACTIVE_CLIENT_IDS)
+    return Ion.get(IONKEYS.ACTIVE_CLIENTS)
         .then(activeClientIDs => _.omit(activeClientIDs, clientID))
-        .then(newActiveClientIDs => Ion.set(IONKEYS.ACTIVE_CLIENT_IDS, newActiveClientIDs));
+        .then(newActiveClientIDs => Ion.set(IONKEYS.ACTIVE_CLIENTS, newActiveClientIDs));
 }
 
 /**
@@ -29,7 +29,7 @@ function removeClient() {
  * @returns {Promise}
  */
 function isClientTheLeader() {
-    return Ion.get(IONKEYS.ACTIVE_CLIENT_IDS)
+    return Ion.get(IONKEYS.ACTIVE_CLIENTS)
         .then(activeClientIDs => _.first(activeClientIDs) === clientID);
 }
 

src/lib/Network.js

@@ -16,10 +16,10 @@ let isOffline;
 Ion.connect({key: IONKEYS.NETWORK, path: 'isOffline', callback: val => isOffline = val});
 
 let credentials;
-Ion.connect({key: IONKEYS.CREDENTIALS, callback: c => credentials = c});
+Ion.connect({key: IONKEYS.CREDENTIALS, callback: val => credentials = val});
 
 let currentUrl;
-Ion.connect({key: IONKEYS.CURRENT_URL, callback: url => currentUrl = url});
+Ion.connect({key: IONKEYS.CURRENT_URL, callback: val => currentUrl = val});
 
 /**
  * When authTokens expire they will automatically be refreshed.