Merge pull request MyEtherWallet#1025 from MyEtherWallet/devop/fix-ha…

…rdware-icons Devop/fix hardware icons
EthersocialNetwork · May 1, 2019 · deba41f · deba41f
2 parents a8ccade + d26ef80
commit deba41f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Add presale eth and old mew eth wallet support [#985](https://github.com/MyEtherWallet/MyEtherWallet/pull/985)
 - Check private key format [#1014](https://github.com/MyEtherWallet/MyEtherWallet/pull/1014)
 - Update usage of Kyber supplied gas limits and serverless provider [#969](https://github.com/MyEtherWallet/MyEtherWallet/pull/969)
+- Fix hardware access icons not displaying [#1025](https://github.com/MyEtherWallet/MyEtherWallet/pull/1025)
 
 
 ### Bug

diff --git a/src/layouts/AccessWalletLayout/components/HardwareModal/HardwareModal.vue b/src/layouts/AccessWalletLayout/components/HardwareModal/HardwareModal.vue
@@ -51,7 +51,7 @@ import bitbox from '@/assets/images/icons/HardwareWallet/bitbox.svg';
 import secalot from '@/assets/images/icons/HardwareWallet/secalot.svg';
 import trezor from '@/assets/images/icons/HardwareWallet/trezor.svg';
 import keepkey from '@/assets/images/icons/HardwareWallet/keepkey.svg';
-import finney from '@/assets/images/icons/button-finney.png';
+import finney from '@/assets/images/icons/button-finney-hover.png';
 import WalletOption from '../WalletOption';
 import { Toast } from '@/helpers';
 import { isSupported } from 'u2f-api';

diff --git a/src/layouts/AccessWalletLayout/components/WalletOption/WalletOption.vue b/src/layouts/AccessWalletLayout/components/WalletOption/WalletOption.vue
@@ -13,7 +13,7 @@
       ]"
     >
       <div class="img-title-container">
-        <img :src="hoverIcon" class="icon" />
+        <img :src="hoverIcon ? hoverIcon : regularIcon" class="icon" />
         <div class="title-link-container">
           <span>{{ text }}</span>
           <a
@@ -65,6 +65,10 @@ export default {
     link: {
       type: String,
       default: ''
+    },
+    regularIcon: {
+      type: String,
+      default: ''
     }
   },
   data() {

diff --git a/vue.config.js b/vue.config.js
@@ -123,7 +123,7 @@ if (process.env.NODE_ENV === 'production') {
           'src/components/Notification/components/NotificationTypes/SwapNotification/index.js',
           'src/components/Notification/components/NotificationTypes/TransactionNotification/index.js',
           // Images
-          'src/assets/images/icons/button-finney-hover.png',
+          'src/assets/images/icons/button-finney.png',
           'src/assets/images/background/bg-left.png',
           'src/assets/images/background/bg-right.png',
           'src/assets/images/currency/coins/AllImages/_icon-config.json',