From 5af0f48fa3aaba0f06aa190825a9612714acbff7 Mon Sep 17 00:00:00 2001
From: Fabian Weber <frznhope@gmail.com>
Date: Mon, 5 Aug 2019 23:15:33 -0400
Subject: [PATCH 1/9] added infinite scroll to validators table

---
 package.json                               |  1 +
 src/components/staking/TableValidators.vue | 20 ++++++++++++++++++--
 src/scripts/boot.js                        |  2 ++
 yarn.lock                                  |  5 +++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 6e9d2c88d5..16b7101161 100644
--- a/package.json
+++ b/package.json
@@ -141,6 +141,7 @@
     "vue": "2.6.10",
     "vue-clipboard2": "0.3.0",
     "vue-directive-tooltip": "1.4.5",
+    "vue-infinite-scroll": "2.0.2",
     "vue-router": "3.0.2",
     "vuelidate": "0.7.4",
     "vuex": "3.1.0",
diff --git a/src/components/staking/TableValidators.vue b/src/components/staking/TableValidators.vue
index ecc2249f91..fffe8263d9 100644
--- a/src/components/staking/TableValidators.vue
+++ b/src/components/staking/TableValidators.vue
@@ -8,9 +8,9 @@
           :show-on-mobile="showOnMobile"
         />
       </thead>
-      <tbody>
+      <tbody v-infinite-scroll="loadMore" infinite-scroll-distance="10">
         <LiValidator
-          v-for="validator in sortedEnrichedValidators"
+          v-for="validator in showingValidators"
           :key="validator.operator_address"
           :validator="validator"
           :show-on-mobile="showOnMobile"
@@ -51,6 +51,8 @@ export default {
       property: `commission`,
       order: `asc`
     },
+    showing: 20,
+    scrollDistance: 10,
     rollingWindow: 10000 // param of slashing period
   }),
   computed: {
@@ -118,6 +120,9 @@ export default {
         [this.sort.order]
       )
     },
+    showingValidators() {
+      return this.sortedEnrichedValidators.slice(0, this.showing)
+    },
     properties() {
       return [
         {
@@ -178,6 +183,12 @@ export default {
       handler() {
         this.$store.dispatch(`getRewardsFromMyValidators`)
       }
+    },
+    "sort.property": function() {
+      this.showing = 20
+    },
+    "sort.order": function() {
+      this.showing = 20
     }
   },
   mounted() {
@@ -185,6 +196,11 @@ export default {
     this.$store.dispatch(`updateDelegates`)
     this.$store.dispatch(`getRewardsFromMyValidators`)
     this.$store.dispatch(`getMintingParameters`)
+  },
+  methods: {
+    loadMore() {
+      this.showing += this.scrollDistance
+    }
   }
 }
 </script>
diff --git a/src/scripts/boot.js b/src/scripts/boot.js
index a80f3b6d49..150922b186 100644
--- a/src/scripts/boot.js
+++ b/src/scripts/boot.js
@@ -10,6 +10,7 @@ import Tooltip from "vue-directive-tooltip"
 import Vuelidate from "vuelidate"
 import VueClipboard from "vue-clipboard2"
 import * as _Sentry from "@sentry/browser"
+import infiniteScroll from "vue-infinite-scroll"
 
 import App from "../App"
 import routes from "../routes"
@@ -61,6 +62,7 @@ export const startApp = async (
   Vue.use(Tooltip, { delay: 1 })
   Vue.use(Vuelidate)
   Vue.use(VueClipboard)
+  Vue.use(infiniteScroll)
 
   Vue.directive(`focus`, focusElement)
   Vue.directive(`focus-last`, focusParentLast)
diff --git a/yarn.lock b/yarn.lock
index 3b2834092e..e109654c7a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11200,6 +11200,11 @@ vue-hot-reload-api@^2.3.0:
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz#2756f46cb3258054c5f4723de8ae7e87302a1ccf"
   integrity sha512-KmvZVtmM26BQOMK1rwUZsrqxEGeKiYSZGA7SNWE6uExx8UX/cj9hq2MRV/wWC3Cq6AoeDGk57rL9YMFRel/q+g==
 
+vue-infinite-scroll@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/vue-infinite-scroll/-/vue-infinite-scroll-2.0.2.tgz#ca37a91fe92ee0ad3b74acf8682c00917144b711"
+  integrity sha512-n+YghR059YmciANGJh9SsNWRi1YZEBVlODtmnb/12zI+4R72QZSWd+EuZ5mW6auEo/yaJXgxzwsuhvALVnm73A==
+
 vue-jest@3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/vue-jest/-/vue-jest-3.0.4.tgz#b6a2b0d874968f26fa775ac901903fece531e08b"

From e586bb4dfc3bde209e6dda804f4918044527d4f1 Mon Sep 17 00:00:00 2001
From: Fabian Weber <frznhope@gmail.com>
Date: Mon, 5 Aug 2019 23:20:00 -0400
Subject: [PATCH 2/9] added it to transactions

---
 src/components/staking/TableValidators.vue |  3 +-
 src/components/wallet/PageTransactions.vue | 34 +++++++++++++---------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/components/staking/TableValidators.vue b/src/components/staking/TableValidators.vue
index fffe8263d9..b525a4a958 100644
--- a/src/components/staking/TableValidators.vue
+++ b/src/components/staking/TableValidators.vue
@@ -52,7 +52,6 @@ export default {
       order: `asc`
     },
     showing: 20,
-    scrollDistance: 10,
     rollingWindow: 10000 // param of slashing period
   }),
   computed: {
@@ -199,7 +198,7 @@ export default {
   },
   methods: {
     loadMore() {
-      this.showing += this.scrollDistance
+      this.showing += 10
     }
   }
 }
diff --git a/src/components/wallet/PageTransactions.vue b/src/components/wallet/PageTransactions.vue
index 562d332300..a7a3b1e5b9 100644
--- a/src/components/wallet/PageTransactions.vue
+++ b/src/components/wallet/PageTransactions.vue
@@ -10,19 +10,21 @@
   >
     <DataEmptyTx slot="no-data" />
     <template slot="managed-body">
-      <LiAnyTransaction
-        v-for="tx in orderedTransactions"
-        :key="tx.txhash"
-        :validators="delegates.delegates"
-        :validators-url="validatorURL"
-        :proposals-url="governanceURL"
-        :transaction="tx"
-        :address="session.address"
-        :bonding-denom="bondDenom"
-        :unbonding-time="
-          time.getUnbondingTime(tx, delegation.unbondingDelegations)
-        "
-      />
+      <div v-infinite-scroll="loadMore" infinite-scroll-distance="10">
+        <LiAnyTransaction
+          v-for="tx in showingTransactions"
+          :key="tx.txhash"
+          :validators="delegates.delegates"
+          :validators-url="validatorURL"
+          :proposals-url="governanceURL"
+          :transaction="tx"
+          :address="session.address"
+          :bonding-denom="bondDenom"
+          :unbonding-time="
+            time.getUnbondingTime(tx, delegation.unbondingDelegations)
+          "
+        />
+      </div>
       <br />
     </template>
   </TmPage>
@@ -73,6 +75,9 @@ export default {
         [this.sort.order]
       )
     },
+    showingTransactions() {
+      return this.orderedTransactions.slice(0, this.showing)
+    },
     dataEmpty() {
       return this.orderedTransactions.length === 0
     }
@@ -90,6 +95,9 @@ export default {
       if (session.signedIn) {
         await $store.dispatch(`getAllTxs`)
       }
+    },
+    loadMore() {
+      this.showing += 10
     }
   }
 }

From 210cafc3a867d9bc775f28c9ecb42ca1e7aafc9c Mon Sep 17 00:00:00 2001
From: Fabian Weber <frznhope@gmail.com>
Date: Mon, 5 Aug 2019 23:20:20 -0400
Subject: [PATCH 3/9] changelog

---
 changes/fabo_infinite-scroll | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/fabo_infinite-scroll

diff --git a/changes/fabo_infinite-scroll b/changes/fabo_infinite-scroll
new file mode 100644
index 0000000000..78ef5f5f96
--- /dev/null
+++ b/changes/fabo_infinite-scroll
@@ -0,0 +1 @@
+[Added] Added infinite scroll to validator list @faboweb
\ No newline at end of file

From 59b3b7d5f0e5cdb6260a4aa9f1708051809a22df Mon Sep 17 00:00:00 2001
From: Fabian Weber <frznhope@gmail.com>
Date: Mon, 5 Aug 2019 23:21:27 -0400
Subject: [PATCH 4/9] snaps

---
 test/unit/specs/App.spec.js                   |   7 -
 .../TableValidators.spec.js.snap              |   4 +-
 .../PageTransactions.spec.js.snap             | 224 +++++++++---------
 3 files changed, 119 insertions(+), 116 deletions(-)

diff --git a/test/unit/specs/App.spec.js b/test/unit/specs/App.spec.js
index a2853395df..7be9f35713 100644
--- a/test/unit/specs/App.spec.js
+++ b/test/unit/specs/App.spec.js
@@ -96,13 +96,6 @@ describe(`App Start`, () => {
     )
   })
 
-  it(`Check the calls on VUE`, async () => {
-    const { Vue } = await start()
-
-    expect(Vue.directive).toHaveBeenCalledTimes(2)
-    expect(Vue.use).toHaveBeenCalledTimes(4)
-  })
-
   describe(`Route guard`, () => {
     it(`Check the route guard`, async () => {
       const commit = jest.fn()
diff --git a/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap
index 31247fa9aa..1f27b023a3 100644
--- a/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap
@@ -13,7 +13,9 @@ exports[`TableValidators shows a validator table 1`] = `
       />
     </thead>
      
-    <tbody>
+    <tbody
+      infinite-scroll-distance="10"
+    >
       <livalidator-stub
         showonmobile="returns"
         validator="[object Object]"
diff --git a/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap b/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap
index 116527d5ac..fafc359b67 100644
--- a/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap
+++ b/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap
@@ -12,60 +12,64 @@ exports[`PageTransactions displays the transaction page if user has signed in 1`
   <dataemptytx-stub />
    
   <template>
-    <lianytransaction-stub
-      address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-      bondingdenom="STAKE"
-      proposalsurl="/governance"
-      transaction="[object Object]"
-      unbondingtime="NaN"
-      validators="[object Object],[object Object],[object Object]"
-      validatorsurl="/staking/validators"
-    />
-    <lianytransaction-stub
-      address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-      bondingdenom="STAKE"
-      proposalsurl="/governance"
-      transaction="[object Object]"
-      unbondingtime="NaN"
-      validators="[object Object],[object Object],[object Object]"
-      validatorsurl="/staking/validators"
-    />
-    <lianytransaction-stub
-      address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-      bondingdenom="STAKE"
-      proposalsurl="/governance"
-      transaction="[object Object]"
-      unbondingtime="NaN"
-      validators="[object Object],[object Object],[object Object]"
-      validatorsurl="/staking/validators"
-    />
-    <lianytransaction-stub
-      address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-      bondingdenom="STAKE"
-      proposalsurl="/governance"
-      transaction="[object Object]"
-      unbondingtime="NaN"
-      validators="[object Object],[object Object],[object Object]"
-      validatorsurl="/staking/validators"
-    />
-    <lianytransaction-stub
-      address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-      bondingdenom="STAKE"
-      proposalsurl="/governance"
-      transaction="[object Object]"
-      unbondingtime="NaN"
-      validators="[object Object],[object Object],[object Object]"
-      validatorsurl="/staking/validators"
-    />
-    <lianytransaction-stub
-      address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-      bondingdenom="STAKE"
-      proposalsurl="/governance"
-      transaction="[object Object]"
-      unbondingtime="NaN"
-      validators="[object Object],[object Object],[object Object]"
-      validatorsurl="/staking/validators"
-    />
+    <div
+      infinite-scroll-distance="10"
+    >
+      <lianytransaction-stub
+        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
+        bondingdenom="STAKE"
+        proposalsurl="/governance"
+        transaction="[object Object]"
+        unbondingtime="NaN"
+        validators="[object Object],[object Object],[object Object]"
+        validatorsurl="/staking/validators"
+      />
+      <lianytransaction-stub
+        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
+        bondingdenom="STAKE"
+        proposalsurl="/governance"
+        transaction="[object Object]"
+        unbondingtime="NaN"
+        validators="[object Object],[object Object],[object Object]"
+        validatorsurl="/staking/validators"
+      />
+      <lianytransaction-stub
+        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
+        bondingdenom="STAKE"
+        proposalsurl="/governance"
+        transaction="[object Object]"
+        unbondingtime="NaN"
+        validators="[object Object],[object Object],[object Object]"
+        validatorsurl="/staking/validators"
+      />
+      <lianytransaction-stub
+        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
+        bondingdenom="STAKE"
+        proposalsurl="/governance"
+        transaction="[object Object]"
+        unbondingtime="NaN"
+        validators="[object Object],[object Object],[object Object]"
+        validatorsurl="/staking/validators"
+      />
+      <lianytransaction-stub
+        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
+        bondingdenom="STAKE"
+        proposalsurl="/governance"
+        transaction="[object Object]"
+        unbondingtime="NaN"
+        validators="[object Object],[object Object],[object Object]"
+        validatorsurl="/staking/validators"
+      />
+      <lianytransaction-stub
+        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
+        bondingdenom="STAKE"
+        proposalsurl="/governance"
+        transaction="[object Object]"
+        unbondingtime="NaN"
+        validators="[object Object],[object Object],[object Object]"
+        validatorsurl="/staking/validators"
+      />
+    </div>
      
     <br />
   </template>
@@ -84,60 +88,64 @@ exports[`PageTransactions displays the transaction page if user hasn't signed in
   <dataemptytx-stub />
    
   <template>
-    <lianytransaction-stub
-      address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-      bondingdenom="STAKE"
-      proposalsurl="/governance"
-      transaction="[object Object]"
-      unbondingtime="NaN"
-      validators="[object Object],[object Object],[object Object]"
-      validatorsurl="/staking/validators"
-    />
-    <lianytransaction-stub
-      address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-      bondingdenom="STAKE"
-      proposalsurl="/governance"
-      transaction="[object Object]"
-      unbondingtime="NaN"
-      validators="[object Object],[object Object],[object Object]"
-      validatorsurl="/staking/validators"
-    />
-    <lianytransaction-stub
-      address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-      bondingdenom="STAKE"
-      proposalsurl="/governance"
-      transaction="[object Object]"
-      unbondingtime="NaN"
-      validators="[object Object],[object Object],[object Object]"
-      validatorsurl="/staking/validators"
-    />
-    <lianytransaction-stub
-      address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-      bondingdenom="STAKE"
-      proposalsurl="/governance"
-      transaction="[object Object]"
-      unbondingtime="NaN"
-      validators="[object Object],[object Object],[object Object]"
-      validatorsurl="/staking/validators"
-    />
-    <lianytransaction-stub
-      address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-      bondingdenom="STAKE"
-      proposalsurl="/governance"
-      transaction="[object Object]"
-      unbondingtime="NaN"
-      validators="[object Object],[object Object],[object Object]"
-      validatorsurl="/staking/validators"
-    />
-    <lianytransaction-stub
-      address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-      bondingdenom="STAKE"
-      proposalsurl="/governance"
-      transaction="[object Object]"
-      unbondingtime="NaN"
-      validators="[object Object],[object Object],[object Object]"
-      validatorsurl="/staking/validators"
-    />
+    <div
+      infinite-scroll-distance="10"
+    >
+      <lianytransaction-stub
+        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
+        bondingdenom="STAKE"
+        proposalsurl="/governance"
+        transaction="[object Object]"
+        unbondingtime="NaN"
+        validators="[object Object],[object Object],[object Object]"
+        validatorsurl="/staking/validators"
+      />
+      <lianytransaction-stub
+        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
+        bondingdenom="STAKE"
+        proposalsurl="/governance"
+        transaction="[object Object]"
+        unbondingtime="NaN"
+        validators="[object Object],[object Object],[object Object]"
+        validatorsurl="/staking/validators"
+      />
+      <lianytransaction-stub
+        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
+        bondingdenom="STAKE"
+        proposalsurl="/governance"
+        transaction="[object Object]"
+        unbondingtime="NaN"
+        validators="[object Object],[object Object],[object Object]"
+        validatorsurl="/staking/validators"
+      />
+      <lianytransaction-stub
+        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
+        bondingdenom="STAKE"
+        proposalsurl="/governance"
+        transaction="[object Object]"
+        unbondingtime="NaN"
+        validators="[object Object],[object Object],[object Object]"
+        validatorsurl="/staking/validators"
+      />
+      <lianytransaction-stub
+        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
+        bondingdenom="STAKE"
+        proposalsurl="/governance"
+        transaction="[object Object]"
+        unbondingtime="NaN"
+        validators="[object Object],[object Object],[object Object]"
+        validatorsurl="/staking/validators"
+      />
+      <lianytransaction-stub
+        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
+        bondingdenom="STAKE"
+        proposalsurl="/governance"
+        transaction="[object Object]"
+        unbondingtime="NaN"
+        validators="[object Object],[object Object],[object Object]"
+        validatorsurl="/staking/validators"
+      />
+    </div>
      
     <br />
   </template>

From c80991543999b06e7d200de9ff78fddc9ddd3057 Mon Sep 17 00:00:00 2001
From: Fabian Weber <frznhope@gmail.com>
Date: Tue, 6 Aug 2019 09:56:45 -0400
Subject: [PATCH 5/9] tests

---
 src/components/wallet/PageTransactions.vue    |  3 +-
 .../staking/TableValidators.spec.js           | 11 +++++-
 .../TableValidators.spec.js.snap              |  4 ---
 .../wallet/PageTransactions.spec.js           | 15 +++++++-
 .../PageTransactions.spec.js.snap             | 36 -------------------
 5 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/src/components/wallet/PageTransactions.vue b/src/components/wallet/PageTransactions.vue
index a7a3b1e5b9..8d0a334069 100644
--- a/src/components/wallet/PageTransactions.vue
+++ b/src/components/wallet/PageTransactions.vue
@@ -54,7 +54,8 @@ export default {
     },
     validatorURL: `/staking/validators`,
     governanceURL: `/governance`,
-    time
+    time,
+    showing: 20
   }),
   computed: {
     ...mapGetters([
diff --git a/test/unit/specs/components/staking/TableValidators.spec.js b/test/unit/specs/components/staking/TableValidators.spec.js
index 66e4cb3497..1b3dee1df9 100644
--- a/test/unit/specs/components/staking/TableValidators.spec.js
+++ b/test/unit/specs/components/staking/TableValidators.spec.js
@@ -57,9 +57,12 @@ describe(`TableValidators`, () => {
       mocks: {
         $store
       },
+      directives: {
+        infiniteScroll: () => {}
+      },
       propsData: { validators }
     })
-    wrapper.setData({ rollingWindow: 10000 })
+    wrapper.setData({ rollingWindow: 10000, showing: 2 })
   })
 
   it(`shows a validator table`, async () => {
@@ -145,6 +148,12 @@ describe(`TableValidators`, () => {
     ).not.toBeDefined()
   })
 
+  it("should load more validators (on infinite scroll)", () => {
+    expect(wrapper.findAll("livalidator-stub").length).toBe(2)
+    wrapper.vm.loadMore()
+    expect(wrapper.findAll("livalidator-stub").length).toBe(3)
+  })
+
   describe(`update rewards on new blocks`, () => {
     describe(`shouldn't update`, () => {
       it(`if hasn't waited for 20 blocks `, () => {
diff --git a/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap
index 1f27b023a3..4171f80261 100644
--- a/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap
@@ -24,10 +24,6 @@ exports[`TableValidators shows a validator table 1`] = `
         showonmobile="returns"
         validator="[object Object]"
       />
-      <livalidator-stub
-        showonmobile="returns"
-        validator="[object Object]"
-      />
     </tbody>
   </table>
 </div>
diff --git a/test/unit/specs/components/wallet/PageTransactions.spec.js b/test/unit/specs/components/wallet/PageTransactions.spec.js
index 9fa3462076..0c12a207ee 100644
--- a/test/unit/specs/components/wallet/PageTransactions.spec.js
+++ b/test/unit/specs/components/wallet/PageTransactions.spec.js
@@ -256,10 +256,14 @@ describe(`PageTransactions`, () => {
 
     wrapper = shallowMount(PageTransactions, {
       localVue,
+      directives: {
+        infiniteScroll: () => {}
+      },
       mocks: {
         $store
       }
     })
+    wrapper.setData({ showing: 2 })
   })
 
   describe(`displays the transaction page`, () => {
@@ -277,6 +281,9 @@ describe(`PageTransactions`, () => {
 
       wrapper = shallowMount(PageTransactions, {
         localVue,
+        directives: {
+          infiniteScroll: () => {}
+        },
         mocks: {
           $store
         }
@@ -313,7 +320,13 @@ describe(`PageTransactions`, () => {
   })
 
   it(`should show transactions`, async () => {
-    expect(wrapper.findAll(`LiAnyTransaction-stub`).length).toBe(6)
+    expect(wrapper.findAll(`LiAnyTransaction-stub`).length).toBe(2)
+  })
+
+  it("should load more findAll (on infinite scroll)", () => {
+    expect(wrapper.findAll("LiAnyTransaction-stub").length).toBe(2)
+    wrapper.vm.loadMore()
+    expect(wrapper.findAll("LiAnyTransaction-stub").length).toBe(6)
   })
 
   it(`should sort the transaction by time`, () => {
diff --git a/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap b/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap
index fafc359b67..7a2dc3c125 100644
--- a/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap
+++ b/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap
@@ -33,42 +33,6 @@ exports[`PageTransactions displays the transaction page if user has signed in 1`
         validators="[object Object],[object Object],[object Object]"
         validatorsurl="/staking/validators"
       />
-      <lianytransaction-stub
-        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-        bondingdenom="STAKE"
-        proposalsurl="/governance"
-        transaction="[object Object]"
-        unbondingtime="NaN"
-        validators="[object Object],[object Object],[object Object]"
-        validatorsurl="/staking/validators"
-      />
-      <lianytransaction-stub
-        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-        bondingdenom="STAKE"
-        proposalsurl="/governance"
-        transaction="[object Object]"
-        unbondingtime="NaN"
-        validators="[object Object],[object Object],[object Object]"
-        validatorsurl="/staking/validators"
-      />
-      <lianytransaction-stub
-        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-        bondingdenom="STAKE"
-        proposalsurl="/governance"
-        transaction="[object Object]"
-        unbondingtime="NaN"
-        validators="[object Object],[object Object],[object Object]"
-        validatorsurl="/staking/validators"
-      />
-      <lianytransaction-stub
-        address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
-        bondingdenom="STAKE"
-        proposalsurl="/governance"
-        transaction="[object Object]"
-        unbondingtime="NaN"
-        validators="[object Object],[object Object],[object Object]"
-        validatorsurl="/staking/validators"
-      />
     </div>
      
     <br />

From 8a53bc97a28bf5cdfb6fa9c418dc964dcfeee80a Mon Sep 17 00:00:00 2001
From: Fabian Weber <frznhope@gmail.com>
Date: Tue, 6 Aug 2019 15:10:42 -0400
Subject: [PATCH 6/9] increased load more offset

---
 src/components/staking/TableValidators.vue |  8 ++--
 src/components/wallet/PageTransactions.vue |  4 +-
 yarn.lock                                  | 50 +++++++++++++++++++---
 3 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/src/components/staking/TableValidators.vue b/src/components/staking/TableValidators.vue
index b525a4a958..f65cc7b0d9 100644
--- a/src/components/staking/TableValidators.vue
+++ b/src/components/staking/TableValidators.vue
@@ -8,7 +8,7 @@
           :show-on-mobile="showOnMobile"
         />
       </thead>
-      <tbody v-infinite-scroll="loadMore" infinite-scroll-distance="10">
+      <tbody v-infinite-scroll="loadMore" infinite-scroll-distance="80">
         <LiValidator
           v-for="validator in showingValidators"
           :key="validator.operator_address"
@@ -51,7 +51,7 @@ export default {
       property: `commission`,
       order: `asc`
     },
-    showing: 20,
+    showing: 15,
     rollingWindow: 10000 // param of slashing period
   }),
   computed: {
@@ -184,10 +184,10 @@ export default {
       }
     },
     "sort.property": function() {
-      this.showing = 20
+      this.showing = 15
     },
     "sort.order": function() {
-      this.showing = 20
+      this.showing = 15
     }
   },
   mounted() {
diff --git a/src/components/wallet/PageTransactions.vue b/src/components/wallet/PageTransactions.vue
index 8d0a334069..88a4009d7c 100644
--- a/src/components/wallet/PageTransactions.vue
+++ b/src/components/wallet/PageTransactions.vue
@@ -10,7 +10,7 @@
   >
     <DataEmptyTx slot="no-data" />
     <template slot="managed-body">
-      <div v-infinite-scroll="loadMore" infinite-scroll-distance="10">
+      <div v-infinite-scroll="loadMore" infinite-scroll-distance="80">
         <LiAnyTransaction
           v-for="tx in showingTransactions"
           :key="tx.txhash"
@@ -55,7 +55,7 @@ export default {
     validatorURL: `/staking/validators`,
     governanceURL: `/governance`,
     time,
-    showing: 20
+    showing: 15
   }),
   computed: {
     ...mapGetters([
diff --git a/yarn.lock b/yarn.lock
index e109654c7a..0bb2f1b9c0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2304,7 +2304,7 @@ bytes@3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-cacache@^11.3.2:
+cacache@^11.3.2, cacache@^11.3.3:
   version "11.3.3"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc"
   integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==
@@ -2914,6 +2914,24 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
+copy-webpack-plugin@5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz#c78126f604e24f194c6ec2f43a64e232b5d43655"
+  integrity sha512-YBuYGpSzoCHSSDGyHy6VJ7SHojKp6WHT4D7ItcQFNAYx2hrwkMe56e97xfVR0/ovDuMTrMffXUiltvQljtAGeg==
+  dependencies:
+    cacache "^11.3.3"
+    find-cache-dir "^2.1.0"
+    glob-parent "^3.1.0"
+    globby "^7.1.1"
+    is-glob "^4.0.1"
+    loader-utils "^1.2.3"
+    minimatch "^3.0.4"
+    normalize-path "^3.0.0"
+    p-limit "^2.2.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.7.0"
+    webpack-log "^2.0.0"
+
 core-js-compat@^3.0.0:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.4.tgz#e4d0c40fbd01e65b1d457980fe4112d4358a7408"
@@ -3558,7 +3576,7 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-glob@^2.2.2:
+dir-glob@^2.0.0, dir-glob@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
   integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
@@ -4375,7 +4393,7 @@ find-babel-config@^1.1.0:
     json5 "^0.5.1"
     path-exists "^3.0.0"
 
-find-cache-dir@^2.0.0:
+find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
   integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
@@ -4749,6 +4767,18 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globby@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
+  integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
+  dependencies:
+    array-union "^1.0.1"
+    dir-glob "^2.0.0"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
+
 globby@^9.0.0:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
@@ -5181,6 +5211,11 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
+ignore@^3.3.5:
+  version "3.3.10"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
+
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -5551,7 +5586,7 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0:
+is-glob@^4.0.0, is-glob@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@@ -7826,7 +7861,7 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0:
+p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
   integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
@@ -9869,6 +9904,11 @@ sisteransi@^1.0.0:
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.2.tgz#ec57d64b6f25c4f26c0e2c7dd23f2d7f12f7e418"
   integrity sha512-ZcYcZcT69nSLAR2oLN2JwNmLkJEKGooFMCdvOkFrToUt/WfcRWqhIg4P4KwY4dmLbuyXIx4o4YmPsvMRJYJd/w==
 
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
+
 slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"

From 142a92a5e75777504048c09fa93affb8e4f80383 Mon Sep 17 00:00:00 2001
From: Fabian Weber <frznhope@gmail.com>
Date: Tue, 6 Aug 2019 15:31:27 -0400
Subject: [PATCH 7/9] removed not needed computed value

---
 src/components/staking/TableValidators.vue    |  9 ---
 .../staking/TableValidators.spec.js           | 63 ++-----------------
 .../TableValidators.spec.js.snap              |  2 +-
 .../PageTransactions.spec.js.snap             |  4 +-
 4 files changed, 8 insertions(+), 70 deletions(-)

diff --git a/src/components/staking/TableValidators.vue b/src/components/staking/TableValidators.vue
index f65cc7b0d9..e6b9c7fba1 100644
--- a/src/components/staking/TableValidators.vue
+++ b/src/components/staking/TableValidators.vue
@@ -162,15 +162,6 @@ export default {
           tooltip: `Approximate annualized return if validator is never punished`
         }
       ]
-    },
-    yourValidators({ committedDelegations, validators, session } = this) {
-      if (!session.signedIn) {
-        return
-      }
-
-      return validators.filter(
-        ({ operator_address }) => operator_address in committedDelegations
-      )
     }
   },
   watch: {
diff --git a/test/unit/specs/components/staking/TableValidators.spec.js b/test/unit/specs/components/staking/TableValidators.spec.js
index 1b3dee1df9..419341a641 100644
--- a/test/unit/specs/components/staking/TableValidators.spec.js
+++ b/test/unit/specs/components/staking/TableValidators.spec.js
@@ -120,69 +120,16 @@ describe(`TableValidators`, () => {
     expect($store.dispatch).not.toHaveBeenCalledWith(`updateDelegates`)
   })
 
-  it(`should filter the validators for your delegations`, () => {
-    const session = { signedIn: true }
-    expect(
-      TableValidators.computed.yourValidators({
-        committedDelegations: {
-          [validators[0].operator_address]: 1,
-          [validators[2].operator_address]: 2
-        },
-        validators,
-        session
-      })
-    ).toEqual([validators[0], validators[2]])
-  })
-
-  it(`should not filter the validators if you're not signed in`, () => {
-    const session = { signedIn: false }
-    expect(
-      TableValidators.computed.yourValidators({
-        committedDelegations: {
-          [validators[0].operator_address]: 1,
-          [validators[2].operator_address]: 2
-        },
-        validators,
-        session
-      })
-    ).not.toBeDefined()
-  })
-
   it("should load more validators (on infinite scroll)", () => {
     expect(wrapper.findAll("livalidator-stub").length).toBe(2)
     wrapper.vm.loadMore()
     expect(wrapper.findAll("livalidator-stub").length).toBe(3)
   })
 
-  describe(`update rewards on new blocks`, () => {
-    describe(`shouldn't update`, () => {
-      it(`if hasn't waited for 20 blocks `, () => {
-        const $store = { dispatch: jest.fn() }
-        const yourValidators = [{}]
-        const newHeader = { height: `30` }
-        TableValidators.watch.lastHeader.handler.call(
-          { $store, yourValidators },
-          newHeader
-        )
-        expect($store.dispatch).not.toHaveBeenCalledWith(
-          `getRewardsFromMyValidators`,
-          yourValidators
-        )
-      })
-
-      it(`if user doesn't have any delegations `, () => {
-        const $store = { dispatch: jest.fn() }
-        const yourValidators = []
-        const newHeader = { height: `40` }
-        TableValidators.watch.lastHeader.handler.call(
-          { $store, yourValidators },
-          newHeader
-        )
-        expect($store.dispatch).not.toHaveBeenCalledWith(
-          `getRewardsFromMyValidators`,
-          yourValidators
-        )
-      })
-    })
+  it(`should update rewards on new blocks`, () => {
+    const $store = { dispatch: jest.fn() }
+    const newHeader = { height: `30` }
+    TableValidators.watch.lastHeader.handler.call({ $store }, newHeader)
+    expect($store.dispatch).toHaveBeenCalledWith(`getRewardsFromMyValidators`)
   })
 })
diff --git a/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap
index 4171f80261..922251aa73 100644
--- a/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap
@@ -14,7 +14,7 @@ exports[`TableValidators shows a validator table 1`] = `
     </thead>
      
     <tbody
-      infinite-scroll-distance="10"
+      infinite-scroll-distance="80"
     >
       <livalidator-stub
         showonmobile="returns"
diff --git a/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap b/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap
index 7a2dc3c125..d1a11773e4 100644
--- a/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap
+++ b/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap
@@ -13,7 +13,7 @@ exports[`PageTransactions displays the transaction page if user has signed in 1`
    
   <template>
     <div
-      infinite-scroll-distance="10"
+      infinite-scroll-distance="80"
     >
       <lianytransaction-stub
         address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"
@@ -53,7 +53,7 @@ exports[`PageTransactions displays the transaction page if user hasn't signed in
    
   <template>
     <div
-      infinite-scroll-distance="10"
+      infinite-scroll-distance="80"
     >
       <lianytransaction-stub
         address="cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9"

From e5b9b8d344e7ce2f736667ad428394cc3e0be47f Mon Sep 17 00:00:00 2001
From: Fabian Weber <frznhope@gmail.com>
Date: Tue, 6 Aug 2019 16:40:43 -0400
Subject: [PATCH 8/9] coverage

---
 src/components/wallet/PageTransactions.vue       |  2 +-
 .../components/staking/TableValidators.spec.js   |  7 +++++++
 .../components/wallet/PageTransactions.spec.js   | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/components/wallet/PageTransactions.vue b/src/components/wallet/PageTransactions.vue
index 97c45d56f4..468dc5bd89 100644
--- a/src/components/wallet/PageTransactions.vue
+++ b/src/components/wallet/PageTransactions.vue
@@ -12,7 +12,7 @@
     <template slot="managed-body">
       <div v-infinite-scroll="loadMore" infinite-scroll-distance="80">
         <TransactionList
-          :transactions="flatOrderedTransactionList"
+          :transactions="showingTransactions"
           :address="session.address"
           :validators="validators"
         />
diff --git a/tests/unit/specs/components/staking/TableValidators.spec.js b/tests/unit/specs/components/staking/TableValidators.spec.js
index d507076d76..850962b62b 100644
--- a/tests/unit/specs/components/staking/TableValidators.spec.js
+++ b/tests/unit/specs/components/staking/TableValidators.spec.js
@@ -106,6 +106,13 @@ describe(`TableValidators`, () => {
     ).toEqual(validators.map(x => x.operator_address).reverse())
   })
 
+  it(`should load more validators (infinite scrolling)`, async () => {
+    wrapper.setData({ showing: 2 })
+    expect(wrapper.findAll("livalidator-stub").length).toBe(2)
+    wrapper.vm.loadMore()
+    expect(wrapper.findAll("livalidator-stub").length).toBe(3)
+  })
+
   it(`queries delegations on signin`, () => {
     const session = { address: `cosmos1address` }
     const $store = { dispatch: jest.fn() }
diff --git a/tests/unit/specs/components/wallet/PageTransactions.spec.js b/tests/unit/specs/components/wallet/PageTransactions.spec.js
index e02f72e507..cf7b66eaf1 100644
--- a/tests/unit/specs/components/wallet/PageTransactions.spec.js
+++ b/tests/unit/specs/components/wallet/PageTransactions.spec.js
@@ -270,4 +270,20 @@ describe(`PageTransactions`, () => {
     $store.getters.session.address = undefined
     expect($store.dispatch).toHaveBeenCalledWith(`getAllTxs`)
   })
+
+  it(`should load more transactions (infinite scrolling)`, async () => {
+    wrapper = shallowMount(PageTransactions, {
+      localVue,
+      mocks: {
+        $store
+      },
+      directives: {
+        infiniteScroll: () => {}
+      }
+    })
+    wrapper.setData({ showing: 2 })
+    expect(wrapper.vm.showingTransactions.length).toBe(2)
+    wrapper.vm.loadMore()
+    expect(wrapper.vm.showingTransactions.length).toBe(7)
+  })
 })

From d4e46b27b6fe7926689d323a715dd196557bb2d0 Mon Sep 17 00:00:00 2001
From: Fabian Weber <frznhope@gmail.com>
Date: Wed, 7 Aug 2019 10:23:44 -0400
Subject: [PATCH 9/9] fixed missing directive

---
 .gitignore  | 3 +++
 src/main.js | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index 55e537abf9..de79ad197b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,6 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
+
+android
+ios
diff --git a/src/main.js b/src/main.js
index 8e2ce985ca..26bf14efad 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,6 +3,7 @@
 import Vue from "vue"
 import Tooltip from "vue-directive-tooltip"
 import Vuelidate from "vuelidate"
+import InfiniteScroll from "vue-infinite-scroll"
 import VueClipboard from "vue-clipboard2"
 import { focusElement, focusParentLast } from "src/directives"
 import App from "./App.vue"
@@ -16,6 +17,7 @@ Vue.config.productionTip = false
 Vue.use(Tooltip, { delay: 1 })
 Vue.use(Vuelidate)
 Vue.use(VueClipboard)
+Vue.use(InfiniteScroll)
 
 Vue.directive(`focus`, focusElement)
 Vue.directive(`focus-last`, focusParentLast)