Merge pull request ava-labs#141 from ava-labs/dev

Update Master

package.json

@@ -33,15 +33,15 @@
         "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$"
     },
     "dependencies": {
-        "@avalabs/vue_components": "0.6.2",
+        "@avalabs/vue_components": "0.7.3",
         "@fortawesome/fontawesome-svg-core": "1.2.26",
         "@fortawesome/free-brands-svg-icons": "5.12.0",
         "@fortawesome/free-regular-svg-icons": "5.12.0",
         "@fortawesome/free-solid-svg-icons": "5.12.0",
         "@fortawesome/vue-fontawesome": "0.1.9",
         "@ledgerhq/hw-transport-u2f": "5.22.0",
         "@ledgerhq/hw-transport-webusb": "5.22.0",
-        "@obsidiansystems/hw-app-avalanche": "0.1.0",
+        "@obsidiansystems/hw-app-avalanche": "0.2.2",
         "@toruslabs/torus-direct-web-sdk": "3.1.0",
         "@types/big.js": "4.0.5",
         "@types/bn.js": "4.11.6",
@@ -92,6 +92,7 @@
         "vue-i18n": "8.15.4",
         "vue-property-decorator": "8.4.2",
         "vue-router": "3.1.3",
+        "vue-virtual-scroll-list": "^2.3.2",
         "vuetify": "2.3.9",
         "vuex": "3.1.2",
         "web3": "^1.3.0",

src/App.vue

@@ -12,6 +12,7 @@
             </template>
         </v-main>
         <LedgerBlock ref="ledger_block"></LedgerBlock>
+        <NetworkLoadingBlock></NetworkLoadingBlock>
         <notifications></notifications>
         <TestNetBanner></TestNetBanner>
     </v-app>
@@ -22,9 +23,11 @@ import Navbar from './components/Navbar'
 import RememberWalletModal from '@/components/modals/RememberWallet/RememberWalletModal'
 import LedgerBlock from '@/components/modals/LedgerBlock'
 import TestNetBanner from '@/components/TestNetBanner'
+import NetworkLoadingBlock from '@/components/misc/NetworkLoadingBlock'
 
 export default {
     components: {
+        NetworkLoadingBlock,
         LedgerBlock,
         RememberWalletModal,
         Navbar,
@@ -126,7 +129,7 @@ p {
 
 @include main.mobile-device {
     #router_view {
-        padding: main.$container_padding_mobile !important;
+        padding: 9px !important;
     }
 
     #nav {

src/_light_theme.scss

@@ -1,12 +1,11 @@
-
-$purple: #4C2E56;
-$purple-light: #867E89;
-$pink: #E84970;
-$pink-light: #FF8080;
+$purple: #4c2e56;
+$purple-light: #867e89;
+$pink: #e84970;
+$pink-light: #ff8080;
 $pink-extra-light: #ffe6e6;
-$gray: #F5F6FA;
-$white: #FFF;
-$green: #6BC688;
+$gray: #f5f6fa;
+$white: #fff;
+$green: #6bc688;
 $green-light: #83f2a6;
 $green-extra-light: #a9efbf;
 
@@ -17,44 +16,41 @@ $secondary-color-light: $pink-light;
 $secondary-color-extra-light: $pink-extra-light;
 $background-color: $gray;
 
-
-
 hr {
-  color: #F5F6FA;
-  border-color: #F5F6FA;
-  border: none;
-  border-top: 1px solid;
-  margin: 10px 0;
+    color: #f5f6fa;
+    border-color: #f5f6fa;
+    border: none;
+    border-top: 1px solid;
+    margin: 10px 0;
 }
 
 a {
-  color: #4C2E56 !important;
-  text-decoration: none !important;
+    color: #4c2e56 !important;
+    text-decoration: none !important;
 }
 
-
 .but_primary {
-  background-color: #4C2E56;
-  color: #fff !important;
-  text-transform: none !important;
-  /*font-size: 13px;*/
-  padding: 8px 18px;
-  border-radius: 2px;
-
-  &:disabled{
-    color: $purple-light !important;
-    background-color: $gray !important;
-  }
+    background-color: #4c2e56;
+    color: #fff !important;
+    text-transform: none !important;
+    /*font-size: 13px;*/
+    padding: 8px 18px;
+    border-radius: 2px;
+
+    &:disabled {
+        color: $purple-light !important;
+        background-color: $gray !important;
+    }
 }
 
-.ava_button{
-  color: $white !important;
+.ava_button {
+    color: $white !important;
 }
 
-.ava_button_secondary{
-  color: $primary-color !important;
+.ava_button_secondary {
+    color: $primary-color !important;
 }
 
-.link{
-  color: $primary-color-light !important;
-}
+.link {
+    color: $primary-color-light !important;
+}