Hide ETH conversion rate

5 files changed, 15 insertions, 17 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49c64787..e8bcdcdc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1205,6 +1205,8 @@ Made seed word restoring BIP44 compatible.
 Added the ability to restore accounts from seed words.
 ## Current Master
 
+## 1.0.5 Fri Nov 09 2018
+
 ## 1.0.4 Fri Nov 09 2018
 
 ## 1.0.3 Fri Nov 09 2018
diff --git a/app/manifest.json b/app/manifest.json
index ea74ada8..34f498aa 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "manifest_version": 2,
   "author": "https://dexon.org",
   "description": "__MSG_appDescription__",
diff --git a/app/scripts/controllers/currency.js b/app/scripts/controllers/currency.js
index 295046af..ebefe6ba 100644
--- a/app/scripts/controllers/currency.js
+++ b/app/scripts/controllers/currency.js
@@ -29,7 +29,7 @@ class CurrencyController {
       currentCurrency: 'usd',
       conversionRate: 0,
       conversionDate: 'N/A',
-      nativeCurrency: 'ETH',
+      nativeCurrency: 'DEX',
     }, opts.initState)
     this.store = new ObservableStore(initState)
   }
@@ -135,8 +135,8 @@ class CurrencyController {
       nativeCurrency = this.getNativeCurrency()
       // select api
       let apiUrl
-      if (nativeCurrency === 'ETH') {
-        // ETH
+      if (nativeCurrency === 'DEX') {
+        // DEX
         apiUrl = `https://api.infura.io/v1/ticker/eth${currentCurrency.toLowerCase()}`
       } else {
        // ETC
@@ -161,8 +161,8 @@ class CurrencyController {
         return
       }
       // set conversion rate
-      if (nativeCurrency === 'ETH') {
-        // ETH
+      if (nativeCurrency === 'DEX') {
+        // DEX
         this.setConversionRate(Number(parsedResponse.bid))
         this.setConversionDate(Number(parsedResponse.timestamp))
       } else {
@@ -176,12 +176,8 @@ class CurrencyController {
         }
       }
     } catch (err) {
-<<<<<<< HEAD
       // reset current conversion rate
-      log.warn(`MetaMask - Failed to query currency conversion:`, nativeCurrency, currentCurrency, err)
-=======
-      log.warn(`DekuSan - Failed to query currency conversion:`, currentCurrency, err)
->>>>>>> Complete onboarding flow
+      log.warn(`DekuSan - Failed to query currency conversion:`, nativeCurrency, currentCurrency, err)
       this.setConversionRate(0)
       this.setConversionDate('N/A')
       // throw error
diff --git a/ui/app/components/pages/settings/settings-tab/settings-tab.component.js b/ui/app/components/pages/settings/settings-tab/settings-tab.component.js
index f6af62bc..a110d3c4 100644
--- a/ui/app/components/pages/settings/settings-tab/settings-tab.component.js
+++ b/ui/app/components/pages/settings/settings-tab/settings-tab.component.js
@@ -442,11 +442,7 @@ export default class SettingsTab extends PureComponent {
                   htmlFor="native-primary-currency"
                   className="settings-tab__radio-label"
                 >
-<<<<<<< HEAD
                   { nativeCurrency }
-=======
-                  { t('dex') }
->>>>>>> Update translations
                 </label>
               </div>
               <div className="settings-tab__radio-button">
diff --git a/ui/app/css/itcss/components/account-dropdown-mini.scss b/ui/app/css/itcss/components/account-dropdown-mini.scss
index 996993db..36a57204 100644
--- a/ui/app/css/itcss/components/account-dropdown-mini.scss
+++ b/ui/app/css/itcss/components/account-dropdown-mini.scss
@@ -23,7 +23,7 @@
     border: 1px solid $geyser;
     border-radius: 4px;
     background-color: $white;
-    box-shadow: 0 3px 6px 0 rgba(0 ,0 ,0 ,.11);
+    box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.11);
     overflow-y: scroll;
   }
 
@@ -36,6 +36,10 @@
     overflow: hidden;
     white-space: nowrap;
     width: 80px;
+    max-width: 220px;
+    max-height: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 
   .account-list-item__top-row {
@@ -45,4 +49,4 @@
   .account-list-item__icon {
     position: initial;
   }
-}
\ No newline at end of file
+}