From ae908c0fed498c7e126e7be06091a60563194782 Mon Sep 17 00:00:00 2001
From: GOVINDDIXIT <govinddixit93@gmail.com>
Date: Wed, 29 Jul 2020 12:58:05 +0530
Subject: [PATCH] minor updates and fixes

---
 android/app/src/official/google-services.json                | 2 +-
 android/app/src/official/res/values-night/colors.xml         | 2 +-
 android/app/src/official/res/values/colors.xml               | 2 +-
 android/app/src/official/res/xml/network_security_config.xml | 2 +-
 android/gradle.properties                                    | 2 +-
 app/constants/credentials.js                                 | 2 +-
 app/sagas/init.js                                            | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/src/official/google-services.json b/android/app/src/official/google-services.json
index f6e7e6b9a..d3373a731 100644
--- a/android/app/src/official/google-services.json
+++ b/android/app/src/official/google-services.json
@@ -228,4 +228,4 @@
     }
   ],
   "configuration_version": "1"
-}
\ No newline at end of file
+}
diff --git a/android/app/src/official/res/values-night/colors.xml b/android/app/src/official/res/values-night/colors.xml
index 1e24e3159..3c1a14f89 100644
--- a/android/app/src/official/res/values-night/colors.xml
+++ b/android/app/src/official/res/values-night/colors.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<item name="splashBackground" type="color">#000000</item>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/android/app/src/official/res/values/colors.xml b/android/app/src/official/res/values/colors.xml
index 8ba17e337..35e0dfb6d 100644
--- a/android/app/src/official/res/values/colors.xml
+++ b/android/app/src/official/res/values/colors.xml
@@ -3,4 +3,4 @@
 	<color name="primary_dark">#660B0B0B</color>
 	<item name="splashBackground" type="color">#eeeff1</item>
 	<item name="notification_text" type="color">#CC3333</item>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/android/app/src/official/res/xml/network_security_config.xml b/android/app/src/official/res/xml/network_security_config.xml
index bb6ab93df..8a76775f8 100644
--- a/android/app/src/official/res/xml/network_security_config.xml
+++ b/android/app/src/official/res/xml/network_security_config.xml
@@ -6,4 +6,4 @@
             <certificates src="user" />
         </trust-anchors>
     </base-config>
-</network-security-config>
\ No newline at end of file
+</network-security-config>
diff --git a/android/gradle.properties b/android/gradle.properties
index 997e93dae..dacaf8d30 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -34,4 +34,4 @@ VERSIONCODE=999999999
 BugsnagAPIKey=""
 
 OFFICIAL_VERSIONCODE=1
-OFFICIAL_BugsnagAPIKey="0e62781637138bc11e6ad3ca14c03899"
\ No newline at end of file
+OFFICIAL_BugsnagAPIKey="0e62781637138bc11e6ad3ca14c03899"
diff --git a/app/constants/credentials.js b/app/constants/credentials.js
index 036280c1d..a6fca2a8a 100644
--- a/app/constants/credentials.js
+++ b/app/constants/credentials.js
@@ -8,4 +8,4 @@ export const USER_ID = isIOS ? 'kUserId' : 'userId';
 export const SERVER_URL = isIOS ? 'kAuthServerURL' : 'serverUrl';
 export const SERVER_NAME = isIOS ? 'kServerName' : 'serverName';
 export const SERVER_ICON = isIOS ? 'kServerIconURL' : 'serverLogoUrl';
-export const ANDROID_PACKAGE_CONTEXT = 'chat.rocket.android';
\ No newline at end of file
+export const ANDROID_PACKAGE_CONTEXT = 'chat.rocket.android';
diff --git a/app/sagas/init.js b/app/sagas/init.js
index c7d7fb33c..dab31139c 100644
--- a/app/sagas/init.js
+++ b/app/sagas/init.js
@@ -29,11 +29,11 @@ export const initLocalSettings = function* initLocalSettings() {
 };
 
 const restore = function* restore() {
+	let hasMigration;
 	try {
 		if (isOfficialBuild) {
-			const hasMigration = yield AsyncStorage.getItem('hasMigration');
+			hasMigration = yield AsyncStorage.getItem('hasMigration');
 		} else {
-			let hasMigration;
 			if (isIOS) {
 				hasMigration = yield AsyncStorage.getItem('hasMigration');
 			}