removed old appliction.js

ecency · Nov 21, 2018 · de141c7 · de141c7
1 parent 53db09b
commit de141c7
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 189 deletions.
diff --git a/app.json b/app.json
@@ -1,4 +1,4 @@
 {
-  "name": "esteem",
-  "displayName": "esteem"
+  "name": "eSteem",
+  "displayName": "eSteem"
 }
diff --git a/src/application.js b/src/application.js
diff --git a/src/index.js b/src/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Provider } from 'react-redux';
 
-import Application from './application';
+import { Application } from './screens/application';
 import store from './redux/store/store';
 
 export default () => (

diff --git a/src/screens/_settings/settings.js b/src/screens/_settings/settings.js
diff --git a/src/screens/application/screen/applicationScreen.js b/src/screens/application/screen/applicationScreen.js
@@ -6,8 +6,8 @@ import { flattenMessages } from '../../../utils/flattenMessages';
 import messages from '../../../config/locales';
 
 class ApplicationScreen extends Component {
-  constructor() {
-    super();
+  constructor(props) {
+    super(props);
     this.state = {};
   }
 

diff --git a/src/screens/settings/screen/settingsScreen.js b/src/screens/settings/screen/settingsScreen.js
@@ -53,19 +53,19 @@ class SettingsScreen extends Component {
               id: 'settings.currency',
             })}
             type="dropdown"
-            actionType="language"
-            options={LANGUAGE}
-            selectedOptionIndex={LANGUAGE_VALUE.indexOf(selectedLanguage)}
+            actionType="currency"
+            options={CURRENCY}
+            selectedOptionIndex={CURRENCY_VALUE.indexOf(selectedCurrency)}
             handleOnChange={handleOnChange}
           />
           <SettingsItem
             title={intl.formatMessage({
               id: 'settings.language',
             })}
             type="dropdown"
-            actionType="currency"
-            options={CURRENCY}
-            selectedOptionIndex={CURRENCY_VALUE.indexOf(selectedCurrency)}
+            actionType="language"
+            options={LANGUAGE}
+            selectedOptionIndex={LANGUAGE_VALUE.indexOf(selectedLanguage)}
             handleOnChange={handleOnChange}
           />
           <SettingsItem
@@ -88,7 +88,6 @@ class SettingsScreen extends Component {
             handleOnChange={handleOnChange}
           />
           <SettingsItem
-            title="Push Notification"
             title={intl.formatMessage({
               id: 'settings.push_notification',
             })}