diff --git a/.circleci/config.yml b/.circleci/config.yml
index 95c92f1e4f..a98d551ee0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -148,6 +148,13 @@ jobs:
           command: |
             nvm install v10.13.0
             nvm alias default v10.13.0
+      - run:
+          name: Install Chrome
+          command: |
+            wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+            sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+            sudo apt-get update
+            sudo apt-get -y install google-chrome-stable
       - run:
           name: Run testnet
           command: |
@@ -155,7 +162,7 @@ jobs:
             docker-compose up --build -d
       - run:
           name: Test
-          command: npm run serve:dist & npm run test:e2e:browserstack
+          command: npm run serve:dist & npm run test:e2e:local
           no_output_timeout: 120
       - store_artifacts:
           path: ./screenshots
diff --git a/config.js b/config.js
index ca9077b6d4..3905d84898 100644
--- a/config.js
+++ b/config.js
@@ -18,5 +18,5 @@ export default {
 
   graphqlHost: graphql,
 
-  e2e: process.env.VUE_APP_E2E
+  e2e: process.env.VUE_APP_E2E || false
 }
diff --git a/package.json b/package.json
index 2079aad440..47d8dac2e3 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "@sentry/integrations": "5.7.1",
     "apollo-boost": "^0.4.3",
     "apollo-cache-inmemory": "^1.6.2",
+    "apollo-link-persisted-queries": "0.2.2",
     "apollo-link-ws": "1.0.19",
     "apollo-utilities": "1.3.2",
     "autosize": "^4.0.2",
diff --git a/src/ActionModal/components/ActionModal.vue b/src/ActionModal/components/ActionModal.vue
index a15f9e8e2e..0f80d1d5bb 100644
--- a/src/ActionModal/components/ActionModal.vue
+++ b/src/ActionModal/components/ActionModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <transition v-if="show" name="slide-fade">
+  <transition v-if="show && !$apollo.loading" name="slide-fade">
     <div v-focus-last class="action-modal" tabindex="0" @keyup.esc="close">
       <div
         v-if="(step === feeStep || step === signStep) && !sending"
@@ -23,7 +23,7 @@
         <Steps
           v-if="
             [defaultStep, feeStep, signStep].includes(step) &&
-              featureAvailable &&
+              checkFeatureAvailable &&
               !isMobileApp
           "
           :steps="['Details', 'Fees', 'Sign']"
@@ -42,7 +42,7 @@
           extension.
         </p>
       </div>
-      <template v-if="!featureAvailable">
+      <template v-if="!checkFeatureAvailable">
         <FeatureNotAvailable :feature="title" />
       </template>
       <template v-else>
@@ -367,6 +367,10 @@ export default {
       type: [String, Number],
       default: `0`
     },
+    rewards: {
+      type: Array,
+      default: () => []
+    },
     transactionData: {
       type: Object,
       default: () => {}
@@ -410,6 +414,15 @@ export default {
     ...mapState([`extension`, `session`]),
     ...mapGetters([`connected`, `isExtensionAccount`]),
     ...mapGetters({ networkId: `network` }),
+    checkFeatureAvailable() {
+      /* istanbul ignore next */
+      if (this.network.testnet) {
+        return true
+      }
+
+      const action = `action_${this.title.toLowerCase().replace(" ", "_")}`
+      return this.network[action] === true
+    },
     requiresSignIn() {
       return !this.session.signedIn
     },
@@ -473,6 +486,9 @@ export default {
       }
     }
   },
+  created() {
+    this.$apollo.skipAll = true
+  },
   updated: function() {
     const context = this.createContext()
     this.actionManager.setContext(context)
@@ -511,13 +527,13 @@ export default {
     },
     open() {
       this.confirmModalOpen()
+      this.$apollo.skipAll = false
       if (this.session.currrentModalOpen) {
         return
       }
 
       this.$store.commit(`setCurrrentModalOpen`, this)
       this.trackEvent(`event`, `modal`, this.title)
-      this.checkFeatureAvailable()
       this.gasPrice = config.default_gas_price.toFixed(9)
       this.show = true
     },
@@ -529,6 +545,7 @@ export default {
       this.show = false
       this.sending = false
       this.includedHeight = undefined
+      this.$apollo.skipAll = true
 
       // reset form
       this.$v.$reset()
@@ -661,16 +678,6 @@ export default {
     },
     async connectLedger() {
       await this.$store.dispatch(`connectLedgerApp`)
-    },
-    async checkFeatureAvailable() {
-      /* istanbul ignore next */
-      if (this.network === "testnet") {
-        this.featureAvailable = true
-        return
-      }
-
-      const action = `action_${this.title.toLowerCase().replace(" ", "_")}`
-      this.featureAvailable = this.network[action] === true
     }
   },
   validations() {
@@ -698,7 +705,7 @@ export default {
   apollo: {
     overview: {
       query: gql`
-        query overview($networkId: String!, $address: String!) {
+        query OverviewActionModal($networkId: String!, $address: String!) {
           overview(networkId: $networkId, address: $address) {
             totalRewards
             liquidStake
@@ -729,6 +736,7 @@ export default {
         query NetworkActionModal($networkId: String!) {
           network(id: $networkId) {
             id
+            testnet
             stakingDenom
             chain_id
             rpc_url
@@ -751,12 +759,16 @@ export default {
       },
       update(data) {
         /* istanbul ignore next */
+
         return data.network
       }
     },
     delegations: {
       query: gql`
-        query Delegations($networkId: String!, $delegatorAddress: String!) {
+        query DelegationsActionModal(
+          $networkId: String!
+          $delegatorAddress: String!
+        ) {
           delegations(
             networkId: $networkId
             delegatorAddress: $delegatorAddress
@@ -782,28 +794,6 @@ export default {
         return data.delegations
       }
     },
-    rewards: {
-      query: gql`
-        query RewardsActionModal(
-          $networkId: String!
-          $delegatorAddress: String!
-        ) {
-          rewards(networkId: $networkId, delegatorAddress: $delegatorAddress) {
-            validator {
-              operatorAddress
-            }
-            amount
-          }
-        }
-      `,
-      variables() {
-        return {
-          networkId: this.networkId,
-          delegatorAddress: this.session.address
-        }
-      },
-      update: result => result.rewards
-    },
     $subscribe: {
       userTransactionAdded: {
         variables() {
diff --git a/src/ActionModal/components/DelegationModal.vue b/src/ActionModal/components/DelegationModal.vue
index 34e73d67ae..995592d4d3 100644
--- a/src/ActionModal/components/DelegationModal.vue
+++ b/src/ActionModal/components/DelegationModal.vue
@@ -10,6 +10,7 @@
     :transaction-data="transactionData"
     :notify-message="notifyMessage"
     @close="clear"
+    @txIncluded="onSuccess"
   >
     <TmFormGroup class="action-modal-form-group">
       <div class="form-message notice">
@@ -143,6 +144,7 @@ import ActionModal from "./ActionModal"
 import transaction from "../utils/transactionTypes"
 import { toMicroDenom } from "src/scripts/common"
 import { formatBech32 } from "src/filters"
+import { UserTransactionAdded } from "src/gql"
 
 export default {
   name: `delegation-modal`,
@@ -253,6 +255,10 @@ export default {
       return this.fromOptions[this.selectedIndex].maximum
     }
   },
+  mounted() {
+    this.$apollo.queries.balance.refetch()
+    this.$apollo.queries.delegations.refetch()
+  },
   methods: {
     open(options) {
       if (options && options.redelegation && this.fromOptions.length > 1) {
@@ -279,6 +285,9 @@ export default {
     },
     enterPressed() {
       this.$refs.actionModal.validateChangeStep()
+    },
+    onSuccess(event) {
+      this.$emit(`success`, event)
     }
   },
   validations() {
@@ -293,7 +302,10 @@ export default {
   apollo: {
     delegations: {
       query: gql`
-        query Delegations($networkId: String!, $delegatorAddress: String!) {
+        query DelegationsDelegationModal(
+          $networkId: String!
+          $delegatorAddress: String!
+        ) {
           delegations(
             networkId: $networkId
             delegatorAddress: $delegatorAddress
@@ -322,7 +334,11 @@ export default {
     },
     balance: {
       query: gql`
-        query balance($networkId: String!, $address: String!, $denom: String!) {
+        query BalanceDelegationModal(
+          $networkId: String!
+          $address: String!
+          $denom: String!
+        ) {
           balance(networkId: $networkId, address: $address, denom: $denom) {
             amount
             denom
@@ -342,7 +358,7 @@ export default {
     },
     denom: {
       query: gql`
-        query Networks($networkId: String!) {
+        query NetworksDelegationModal($networkId: String!) {
           network(id: $networkId) {
             id
             stakingDenom
@@ -359,6 +375,25 @@ export default {
         return data.network.stakingDenom
       }
     }
+  },
+  $subscribe: {
+    userTransactionAdded: {
+      variables() {
+        return {
+          networkId: this.network,
+          address: this.address
+        }
+      },
+      skip() {
+        return !this.address
+      },
+      query: UserTransactionAdded,
+      result({ data }) {
+        if (data.userTransactionAdded.success) {
+          this.$apollo.queries.delegations.refetch()
+        }
+      }
+    }
   }
 }
 </script>
diff --git a/src/ActionModal/components/ModalDeposit.vue b/src/ActionModal/components/ModalDeposit.vue
index ca3d444f3b..dcedd3b428 100644
--- a/src/ActionModal/components/ModalDeposit.vue
+++ b/src/ActionModal/components/ModalDeposit.vue
@@ -146,7 +146,11 @@ export default {
   apollo: {
     balance: {
       query: gql`
-        query balance($networkId: String!, $address: String!, $denom: String!) {
+        query BalanceModalDeposit(
+          $networkId: String!
+          $address: String!
+          $denom: String!
+        ) {
           balance(networkId: $networkId, address: $address, denom: $denom) {
             amount
             denom
diff --git a/src/ActionModal/components/ModalPropose.vue b/src/ActionModal/components/ModalPropose.vue
index a2ee9a0f2d..ed70d55b2b 100644
--- a/src/ActionModal/components/ModalPropose.vue
+++ b/src/ActionModal/components/ModalPropose.vue
@@ -233,7 +233,11 @@ export default {
   apollo: {
     balance: {
       query: gql`
-        query balance($networkId: String!, $address: String!, $denom: String!) {
+        query BalanceModalPropos(
+          $networkId: String!
+          $address: String!
+          $denom: String!
+        ) {
           balance(networkId: $networkId, address: $address, denom: $denom) {
             amount
             denom
diff --git a/src/ActionModal/components/ModalWithdrawRewards.vue b/src/ActionModal/components/ModalWithdrawRewards.vue
index be7338acfa..68cf7e0847 100644
--- a/src/ActionModal/components/ModalWithdrawRewards.vue
+++ b/src/ActionModal/components/ModalWithdrawRewards.vue
@@ -7,6 +7,7 @@
     title="Claim Rewards"
     class="modal-withdraw-rewards"
     submission-error-prefix="Withdrawal failed"
+    :rewards="rewards"
     :disable="validatorsWithRewards"
   >
     <span class="form-message notice withdraw-limit">
diff --git a/src/ActionModal/components/SendModal.vue b/src/ActionModal/components/SendModal.vue
index 6dcb12e599..de40889757 100644
--- a/src/ActionModal/components/SendModal.vue
+++ b/src/ActionModal/components/SendModal.vue
@@ -9,6 +9,7 @@
     :transaction-data="transactionData"
     :notify-message="notifyMessage"
     @close="clear"
+    @txIncluded="onSuccess"
   >
     <TmFormGroup
       :error="$v.address.$error && $v.address.$invalid"
@@ -194,6 +195,9 @@ export default {
     open() {
       this.$refs.actionModal.open()
     },
+    onSuccess(event) {
+      this.$emit(`success`, event)
+    },
     validateForm() {
       this.$v.$touch()
 
@@ -257,7 +261,11 @@ export default {
   apollo: {
     balance: {
       query: gql`
-        query balance($networkId: String!, $address: String!, $denom: String!) {
+        query BalanceSendModal(
+          $networkId: String!
+          $address: String!
+          $denom: String!
+        ) {
           balance(networkId: $networkId, address: $address, denom: $denom) {
             amount
             denom
diff --git a/src/ActionModal/components/UndelegationModal.vue b/src/ActionModal/components/UndelegationModal.vue
index 155e4d7016..f25378489b 100644
--- a/src/ActionModal/components/UndelegationModal.vue
+++ b/src/ActionModal/components/UndelegationModal.vue
@@ -10,6 +10,7 @@
     :transaction-data="transactionData"
     :notify-message="notifyMessage"
     @close="clear"
+    @txIncluded="onSuccess"
   >
     <TmFormGroup class="action-modal-form-group">
       <div class="form-message notice">
@@ -174,12 +175,18 @@ export default {
     switchToRedelegation() {
       this.$refs.actionModal.close()
       this.$emit("switchToRedelegation")
+    },
+    onSuccess(event) {
+      this.$emit(`success`, event)
     }
   },
   apollo: {
     delegations: {
       query: gql`
-        query Delegations($networkId: String!, $delegatorAddress: String!) {
+        query DelegationsUndelegationModal(
+          $networkId: String!
+          $delegatorAddress: String!
+        ) {
           delegations(
             networkId: $networkId
             delegatorAddress: $delegatorAddress
@@ -207,7 +214,7 @@ export default {
     },
     denom: {
       query: gql`
-        query Networks($networkId: String!) {
+        query NetworksUndelegationModal($networkId: String!) {
           network(id: $networkId) {
             id
             stakingDenom
diff --git a/src/components/common/TmBalance.vue b/src/components/common/TmBalance.vue
index fb9baed1f0..18863e8f8b 100644
--- a/src/components/common/TmBalance.vue
+++ b/src/components/common/TmBalance.vue
@@ -42,6 +42,7 @@
 </template>
 <script>
 import { shortDecimals } from "scripts/num"
+import refetchNetworkOnly from "scripts/refetch-network-only"
 import { noBlanks } from "src/filters"
 import TmBtn from "common/TmBtn"
 import SendModal from "src/ActionModal/components/SendModal"
@@ -144,7 +145,7 @@ export default {
         query: UserTransactionAdded,
         result() {
           // query if successful or not as even an unsuccessful tx costs fees
-          this.$apollo.queries.overview.refetch()
+          refetchNetworkOnly(this.$apollo.query.overview)
         }
       }
     }
diff --git a/src/components/governance/PageProposal.vue b/src/components/governance/PageProposal.vue
index 746d8b5cc9..b6ccff6f3d 100644
--- a/src/components/governance/PageProposal.vue
+++ b/src/components/governance/PageProposal.vue
@@ -240,6 +240,7 @@ export default {
         proposalId: this.proposal.id,
         address: this.address
       })
+      this.$store.commit("invalidateCache", [`overview`, `transactions`])
     },
     onDeposit() {
       this.$refs.modalDeposit.open()
@@ -248,6 +249,7 @@ export default {
       this.$apollo.queries.proposal.refetch({
         id: this.proposal.id
       })
+      this.$store.commit("invalidateCache", [`overview`, `transactions`])
     }
   },
   apollo: {
diff --git a/src/components/governance/PageProposals.vue b/src/components/governance/PageProposals.vue
index 0083f593c8..6f1c14c129 100644
--- a/src/components/governance/PageProposals.vue
+++ b/src/components/governance/PageProposals.vue
@@ -81,6 +81,7 @@ export default {
     },
     afterPropose() {
       this.$apollo.queries.proposals.refetch()
+      this.$store.commit("invalidateCache", [`overview`, `transactions`])
     }
   },
   apollo: {
diff --git a/src/components/staking/DelegationsOverview.vue b/src/components/staking/DelegationsOverview.vue
index 537b023991..98c2fb6f7f 100644
--- a/src/components/staking/DelegationsOverview.vue
+++ b/src/components/staking/DelegationsOverview.vue
@@ -28,6 +28,7 @@ import { mapGetters } from "vuex"
 import TmDataMsg from "common/TmDataMsg"
 import TableValidators from "staking/TableValidators"
 import { DelegationsForDelegator, UserTransactionAdded } from "src/gql"
+import refetchNetworkOnly from "scripts/refetch-network-only"
 
 export default {
   name: `delegations-overview`,
@@ -72,7 +73,7 @@ export default {
         query: UserTransactionAdded,
         result({ data }) {
           if (data.userTransactionAdded.success) {
-            this.$apollo.queries.delegations.refetch()
+            refetchNetworkOnly(this.$apollo.query.delegations)
           }
         }
       }
diff --git a/src/components/staking/PageValidator.vue b/src/components/staking/PageValidator.vue
index 1c857693ea..648b446d58 100644
--- a/src/components/staking/PageValidator.vue
+++ b/src/components/staking/PageValidator.vue
@@ -1,9 +1,6 @@
 <template>
   <TmPage
     :managed="true"
-    :loading="$apollo.loading"
-    :loaded="!$apollo.loading"
-    :error="error"
     :data-empty="!validator.operatorAddress"
     :hide-header="true"
     data-title="Validator"
@@ -136,11 +133,16 @@
         </li>
       </ul>
 
-      <DelegationModal ref="delegationModal" :target-validator="validator" />
+      <DelegationModal
+        ref="delegationModal"
+        :target-validator="validator"
+        @success="clearDelegationCache"
+      />
       <UndelegationModal
         ref="undelegationModal"
         :source-validator="validator"
         @switchToRedelegation="onDelegation({ redelegation: true })"
+        @success="clearUndelegationCache"
       />
     </template>
     <template v-else>
@@ -215,6 +217,10 @@ export default {
     ...mapGetters([`network`]),
     ...mapGetters({ userAddress: `address` })
   },
+  mounted() {
+    this.$apollo.queries.rewards.refetch()
+    this.$apollo.queries.delegation.refetch()
+  },
   methods: {
     shortDecimals,
     atoms,
@@ -225,6 +231,21 @@ export default {
     },
     onUndelegation() {
       this.$refs.undelegationModal.open()
+    },
+    clearDelegationCache() {
+      this.$store.commit("invalidateCache", [
+        `overview`,
+        `delegations`,
+        `transactions`
+      ]) // TODO use more finegrained query string (network and address)
+    },
+    clearUndelegationCache() {
+      this.$store.commit("invalidateCache", [
+        `overview`,
+        `delegations`,
+        `undelegations`,
+        `transactions`
+      ]) // TODO use more finegrained query string (network and address)
     }
   },
   apollo: {
@@ -288,9 +309,7 @@ export default {
         }
       },
       update: result => {
-        const r = result.rewards.length > 0 ? result.rewards[0] : { amount: 0 }
-        console.log(r)
-        return r
+        return result.rewards.length > 0 ? result.rewards[0] : { amount: 0 }
       }
     },
     validator: {
diff --git a/src/components/staking/PageValidators.vue b/src/components/staking/PageValidators.vue
index 0dc258ddf5..cf2202f4e1 100644
--- a/src/components/staking/PageValidators.vue
+++ b/src/components/staking/PageValidators.vue
@@ -1,9 +1,5 @@
 <template>
-  <TmPage
-    :managed="true"
-    :data-empty="validators && validators.length === 0"
-    hide-header
-  >
+  <TmPage :managed="true" hide-header>
     <template slot="managed-body">
       <div class="filterOptions">
         <TmField
@@ -36,12 +32,14 @@
       >
         No results for these search terms
       </div>
+      <TmDataLoading v-if="$apollo.loading" />
     </template>
   </TmPage>
 </template>
 
 <script>
 import { mapGetters } from "vuex"
+import TmDataLoading from "common/TmDataLoading"
 import TableValidators from "staking/TableValidators"
 import TmPage from "common/TmPage"
 import TmField from "common/TmField"
@@ -52,6 +50,7 @@ export default {
   name: `tab-validators`,
   components: {
     TableValidators,
+    TmDataLoading,
     TmPage,
     TmField,
     TmBtn
@@ -86,18 +85,7 @@ export default {
             name
             operatorAddress
             consensusPubkey
-            jailed
-            details
-            website
-            identity
             votingPower
-            startHeight
-            uptimePercentage
-            tokens
-            commissionUpdateTime
-            commission
-            maxCommission
-            maxChangeCommission
             status
             statusDetailed
             picture
diff --git a/src/components/staking/TableValidators.vue b/src/components/staking/TableValidators.vue
index 3b1d082e1f..f71fdc46bd 100644
--- a/src/components/staking/TableValidators.vue
+++ b/src/components/staking/TableValidators.vue
@@ -110,6 +110,9 @@ export default {
       this.showing = 15
     }
   },
+  mounted() {
+    this.$apollo.queries.rewards.startPolling(1000 * 60 * 5)
+  },
   methods: {
     loadMore() {
       this.showing += 10
@@ -146,28 +149,8 @@ export default {
           delegatorAddress: this.address
         }
       },
-      update: result => result.rewards || []
-    },
-    $subscribe: {
-      blockAdded: {
-        variables() {
-          return {
-            networkId: this.network
-          }
-        },
-        query() {
-          return gql`
-            subscription($networkId: String!) {
-              blockAdded(networkId: $networkId) {
-                height
-                chainId
-              }
-            }
-          `
-        },
-        result() {
-          this.$apollo.queries.rewards.refetch()
-        }
+      update: result => {
+        return result.rewards || []
       }
     }
   }
diff --git a/src/components/staking/Undelegations.vue b/src/components/staking/Undelegations.vue
index 4d293a4fb8..baadcc9b13 100644
--- a/src/components/staking/Undelegations.vue
+++ b/src/components/staking/Undelegations.vue
@@ -10,6 +10,7 @@
 <script>
 import { mapGetters } from "vuex"
 import TableUndelegations from "staking/TableUndelegations"
+import refetchNetworkOnly from "scripts/refetch-network-only"
 import { UndelegationsForDelegator, UserTransactionAdded } from "src/gql"
 
 export default {
@@ -51,7 +52,7 @@ export default {
         query: UserTransactionAdded,
         result({ data }) {
           if (data.userTransactionAdded.success) {
-            this.$apollo.queries.undelegations.refetch()
+            refetchNetworkOnly(this.$apollo.query.undelegations)
           }
         }
       }
diff --git a/src/gql/apollo.js b/src/gql/apollo.js
index d37ca42208..3b17e8813b 100644
--- a/src/gql/apollo.js
+++ b/src/gql/apollo.js
@@ -1,9 +1,10 @@
 import Vue from "vue"
 import { ApolloClient } from "apollo-boost"
-import { split } from "apollo-link"
+import { createPersistedQueryLink } from "apollo-link-persisted-queries"
 import { createHttpLink } from "apollo-link-http"
 import { WebSocketLink } from "apollo-link-ws"
 import { InMemoryCache } from "apollo-cache-inmemory"
+import { split } from "apollo-link"
 import { getMainDefinition } from "apollo-utilities"
 import VueApollo from "vue-apollo"
 import config from "src/../config"
@@ -15,10 +16,15 @@ const graphqlHost = urlParams => urlParams.graphql || config.graphqlHost
 const makeHttpLink = urlParams => {
   const host = graphqlHost(urlParams)
   const uri = host
-  console.log("http", uri)
-  return createHttpLink({
-    uri
-  })
+
+  // We create a createPersistedQueryLink to lower network usage.
+  // With this, a prefetch is done using a hash of the query.
+  // if the server recognises the hash, it will reply with the full reponse.
+  return createPersistedQueryLink().concat(
+    createHttpLink({
+      uri
+    })
+  )
 }
 
 const makeWebSocketLink = urlParams => {
diff --git a/src/scripts/refetch-network-only.js b/src/scripts/refetch-network-only.js
new file mode 100644
index 0000000000..b0a3d5de31
--- /dev/null
+++ b/src/scripts/refetch-network-only.js
@@ -0,0 +1,10 @@
+// when refetching always force to load from the network
+export default apolloQuery => {
+  apolloQuery.setOptions({
+    fetchPolicy: "network-only"
+  })
+  apolloQuery.refetch()
+  apolloQuery.setOptions({
+    fetchPolicy: "cache-and-network"
+  })
+}
diff --git a/src/vuex/modules/session.js b/src/vuex/modules/session.js
index 8fbcfc3deb..04ed9b81f2 100644
--- a/src/vuex/modules/session.js
+++ b/src/vuex/modules/session.js
@@ -9,7 +9,7 @@ const windowsWarning = `If you’re using Windows 10 (May 2019 update), signing
 transactions with your Ledger Nano S will not work. Please use another
 operating system, or version of Windows.`
 
-export default () => {
+export default ({ apollo }) => {
   const USER_PREFERENCES_KEY = `lunie_user_preferences`
 
   const state = {
@@ -63,8 +63,8 @@ export default () => {
     setExperimentalMode(state) {
       state.experimentalMode = true
     },
-    setInsecureMode(state, insecureMode) {
-      state.insecureMode = insecureMode
+    setInsecureMode(state) {
+      state.insecureMode = true
     },
     addHistory(state, path) {
       state.history.push(path)
@@ -80,6 +80,19 @@ export default () => {
     },
     setCurrrentModalOpen(state, modal) {
       state.currrentModalOpen = modal
+    },
+
+    // TODO to own store module?
+    // clear the cache manually so we can force reloading of stale data in not mounted components
+    invalidateCache(state, queries) {
+      let rootQuery = apollo.cache.data.data.ROOT_QUERY
+      Object.keys(rootQuery)
+        .filter(query =>
+          queries.find(queryToClear => query.startsWith(queryToClear))
+        )
+        .forEach(query => {
+          delete rootQuery[query]
+        })
     }
   }
 
diff --git a/tests/e2e/delegation.spec.js b/tests/e2e/delegation.spec.js
index 75885f1baf..3265e63fc7 100644
--- a/tests/e2e/delegation.spec.js
+++ b/tests/e2e/delegation.spec.js
@@ -1,113 +1,117 @@
-// const { actionModalCheckout, nextBlock, waitForText } = require("./helpers.js")
-
-// module.exports = {
-//   "Delegate Action": async function(browser) {
-//     // move to according page
-//     browser.url(browser.launch_url + "/#/validators")
-
-//     // move to validator page
-//     browser.expect.element(".li-validator").to.be.visible.before(10000)
-//     browser.click(".li-validator[data-moniker=main_account]")
-
-//     const value = "10.42"
-//     await actionModalCheckout(
-//       browser,
-//       "#delegation-btn",
-//       // actions to do on details page
-//       () => {
-//         browser.setValue("#amount", value)
-//       },
-//       value,
-//       0,
-//       value
-//     )
-
-//     // check if tx shows
-//     browser.url(browser.launch_url + "/#/transactions")
-//     await waitForText(
-//       browser,
-//       ".tx:first-child .tx__content__caption",
-//       `Delegated ${value} STAKE`
-//     )
-//   },
-//   "Redelegate Action": async function(browser) {
-//     // move to according page
-//     browser.url(browser.launch_url + "/#/validators")
-
-//     // move to validator page
-//     browser.expect.element(".li-validator").to.be.visible.before(10000)
-//     browser.click(".li-validator[data-moniker=operator_account_1]")
-
-//     const value = "5.53"
-//     await actionModalCheckout(
-//       browser,
-//       "#delegation-btn",
-//       // actions to do on details page
-//       () => {
-//         setSelect(browser, "#from select", "1")
-//         browser.expect
-//           .element(".action-modal-title")
-//           .text.to.contain(`Redelegate`)
-//           .before(2000)
-//         browser.setValue("#amount", value)
-//       },
-//       // expected subtotal
-//       "0"
-//     )
-
-//     // check if tx shows
-//     browser.url(browser.launch_url + "/#/transactions")
-//     await waitForText(
-//       browser,
-//       ".tx:first-child .tx__content__caption",
-//       `Redelegated ${value} STAKE`
-//     )
-//   },
-//   "Undelegate Action": async function(browser) {
-//     // be sure that the balance has updated, if we don't wait, the baseline (balance) shifts
-//     await nextBlock(browser)
-
-//     // move to according page
-//     browser.url(browser.launch_url + "/#/validators")
-
-//     // move to validator page
-//     browser.expect.element(".li-validator").to.be.visible.before(10000)
-//     browser.click(".li-validator[data-moniker=operator_account_1]")
-
-//     const value = "4.2"
-//     await actionModalCheckout(
-//       browser,
-//       "#undelegation-btn",
-//       // actions to do on details page
-//       () => {
-//         browser.setValue("#amount", value)
-//       },
-//       // expected subtotal
-//       "0"
-//     )
-
-//     // check if tx shows
-//     browser.url(browser.launch_url + "/#/transactions")
-//     await waitForText(
-//       browser,
-//       ".tx:first-child .tx__content__caption",
-//       `Undelegated ${value} STAKE`
-//     )
-//   }
-// }
-
-// function setSelect(browser, selector, option) {
-//   browser.execute(
-//     function(selector, option) {
-//       const select = document.querySelector(selector)
-//       select.value = option
-
-//       // Create a new 'change' event
-//       var event = new Event("input")
-
-//       // Dispatch it.
-//       select.dispatchEvent(event)
-//     },
-//     [selector, option]
-//   )
-// }
+const { actionModalCheckout, nextBlock, waitForText } = require("./helpers.js")
+
+module.exports = {
+  "Delegate Action": async function(browser) {
+    // move to according page
+    browser.url(browser.launch_url + "/#/validators")
+
+    // move to validator page
+    browser.expect.element(".li-validator").to.be.visible.before(10000)
+    browser.click(".li-validator[data-name=main_account]")
+
+    const value = "10.42"
+    await actionModalCheckout(
+      browser,
+      "#delegation-btn",
+      // actions to do on details page
+      () => {
+        browser.setValue("#amount", value)
+      },
+      value,
+      0,
+      value
+    )
+
+    await nextBlock(browser)
+
+    // check if tx shows
+    browser.url(browser.launch_url + "/#/transactions")
+    await waitForText(
+      browser,
+      ".tx:nth-child(2) .tx__content__caption",
+      `Delegated ${value} STAKE`
+    )
+  },
+  "Redelegate Action": async function(browser) {
+    // move to according page
+    browser.url(browser.launch_url + "/#/validators")
+
+    // move to validator page
+    browser.expect.element(".li-validator").to.be.visible.before(10000)
+    browser.click(".li-validator[data-name=operator_account_1]")
+
+    const value = "5.53"
+    await actionModalCheckout(
+      browser,
+      "#delegation-btn",
+      // actions to do on details page
+      () => {
+        setSelect(browser, "#from select", "1")
+        browser.expect
+          .element(".action-modal-title")
+          .text.to.contain(`Redelegate`)
+          .before(2000)
+        browser.setValue("#amount", value)
+      },
+      // expected subtotal
+      "0"
+    )
+
+    await nextBlock(browser)
+
+    // check if tx shows
+    browser.url(browser.launch_url + "/#/transactions")
+    await waitForText(
+      browser,
+      ".tx:nth-child(2) .tx__content__caption",
+      `Redelegated ${value} STAKE`
+    )
+  },
+  "Undelegate Action": async function(browser) {
+    // be sure that the balance has updated, if we don't wait, the baseline (balance) shifts
+    await nextBlock(browser)
+
+    // move to according page
+    browser.url(browser.launch_url + "/#/validators")
+
+    // move to validator page
+    browser.expect.element(".li-validator").to.be.visible.before(10000)
+    browser.click(".li-validator[data-name=operator_account_1]")
+
+    const value = "4.2"
+    await actionModalCheckout(
+      browser,
+      "#undelegation-btn",
+      // actions to do on details page
+      () => {
+        browser.setValue("#amount", value)
+      },
+      // expected subtotal
+      "0"
+    )
+
+    // check if tx shows
+    browser.url(browser.launch_url + "/#/transactions")
+    await waitForText(
+      browser,
+      ".tx:nth-child(2) .tx__content__caption",
+      `Undelegated ${value} STAKE`
+    )
+  }
+}
+
+function setSelect(browser, selector, option) {
+  browser.execute(
+    function(selector, option) {
+      const select = document.querySelector(selector)
+      select.value = option
+
+      // Create a new 'change' event
+      var event = new Event("input")
+
+      // Dispatch it.
+      select.dispatchEvent(event)
+    },
+    [selector, option]
+  )
+}
diff --git a/tests/e2e/globals.js b/tests/e2e/globals.js
index dcf8912a4c..35dfcbc910 100644
--- a/tests/e2e/globals.js
+++ b/tests/e2e/globals.js
@@ -15,7 +15,7 @@ module.exports = {
   },
 
   beforeEach(browser, done) {
-    browser.url(browser.launch_url).execute(function() {
+    browser.url(browser.launch_url).execute(function () {
       window.localStorage.setItem(
         `cosmos-wallets-cosmos1ek9cd8ewgxg9w5xllq9um0uf4aaxaruvcw4v9e`,
         JSON.stringify({
@@ -57,7 +57,7 @@ module.exports = {
    *
    * @param results
    */
-  reporter: function(results) {
+  reporter: function (results) {
     if (
       (typeof results.failed === `undefined` || results.failed === 0) &&
       (typeof results.error === `undefined` || results.error === 0)
@@ -85,7 +85,7 @@ async function apiUp() {
       if (response.data.errors) {
         throw new Error(JSON.stringify(response.data.errors))
       }
-      if (response.data.data.overview.totalStake === 0) {
+      if (response.data.data.overview.totalStake !== "1000") {
         continue
       }
       apiUp = true
diff --git a/tests/e2e/helpers.js b/tests/e2e/helpers.js
index 652a400b71..1ff7043f58 100644
--- a/tests/e2e/helpers.js
+++ b/tests/e2e/helpers.js
@@ -34,7 +34,8 @@ async function waitFor(check, iterations = 10, timeout = 1000) {
     }
   }
 
-  throw new Error("Condition was not meet in time")
+  console.error("Condition was not meet in time")
+  process.exit(2) // exiting here so the e2e tests actually fail. if not they pass
 }
 async function waitForText(
   browser,
@@ -50,10 +51,7 @@ async function waitForText(
     },
     iterations,
     timeout
-  ).catch(err => {
-    console.log(err.message)
-    process.exit(2)
-  })
+  )
 }
 
 // performs some details actions and handles checking of the invoice step + signing
@@ -140,12 +138,14 @@ async function actionModalCheckout(
 
   // check if balance header updates as expected
   // TODO find a way to know the rewards on an undelegation to know the final balance 100%
+  console.log("Wait for total balance to update")
   await waitFor(async () => {
     const approximatedBalanceAfter = balanceBefore - expectedTotalChange - fees
     expect(
       Math.abs(approximatedBalanceAfter - (await getBalance(browser)))
     ).to.be.lessThan(2) // acounting for rewards being withdrawn on an undelegation
   })
+  console.log("Wait for liquid balance to update")
   await waitFor(async () => {
     const approximatedAvailableBalanceAfter =
       availableTokensBefore - expectedAvailableTokensChange - fees
diff --git a/tests/unit/specs/components/ActionModal/components/ActionModal.spec.js b/tests/unit/specs/components/ActionModal/components/ActionModal.spec.js
index 8211da60d9..2f1732052e 100644
--- a/tests/unit/specs/components/ActionModal/components/ActionModal.spec.js
+++ b/tests/unit/specs/components/ActionModal/components/ActionModal.spec.js
@@ -26,24 +26,12 @@ jest.mock(`src/ActionModal/utils/ActionManager.js`, () => {
   })
 })
 
-const $apollo = {
-  query: () => ({
-    data: {
-      networks: [
-        {
-          action_action_modal: true
-        }
-      ]
-    }
-  })
-}
-
 describe(`ActionModal`, () => {
-  let wrapper, $store
+  let wrapper, $store, $apollo
 
   const overview = {
     totalRewards: 100000,
-    liquidStake: 1230000000,
+    liquidStake: 1230.0,
     totalStake: 1430000000
   }
 
@@ -60,7 +48,8 @@ describe(`ActionModal`, () => {
     action_undelegate: false,
     action_deposit: false,
     action_vote: false,
-    action_proposal: false
+    action_proposal: false,
+    testnet: true
   }
 
   const delegations = [
@@ -94,6 +83,10 @@ describe(`ActionModal`, () => {
     }
   ]
 
+  $apollo = {
+    skipAll: jest.fn(() => false)
+  }
+
   beforeEach(() => {
     $store = {
       commit: jest.fn(),
@@ -134,11 +127,12 @@ describe(`ActionModal`, () => {
         $store,
         $router: {
           push: jest.fn()
-        }
-        // $apollo
+        },
+        $apollo
       },
       stubs: ["router-link"]
     })
+    wrapper.setData({ network, overview })
     wrapper.vm.open()
   })
 
@@ -176,11 +170,11 @@ describe(`ActionModal`, () => {
     expect(self.submissionError).toEqual(`PREFIX: some kind of error message.`)
   })
 
-  xit(`should default to submissionError being null`, () => {
+  it(`should default to submissionError being null`, () => {
     expect(wrapper.vm.submissionError).toBe(null)
   })
 
-  xit(`opens`, () => {
+  it(`opens`, () => {
     wrapper.vm.trackEvent = jest.fn()
     wrapper.vm.open()
 
@@ -188,7 +182,7 @@ describe(`ActionModal`, () => {
     expect(wrapper.vm.trackEvent).toHaveBeenCalled()
   })
 
-  xit(`should confirm modal closing`, () => {
+  it(`should confirm modal closing`, () => {
     global.confirm = () => true
     const closeModal = jest.fn()
     wrapper.vm.session.currrentModalOpen = {
@@ -198,7 +192,7 @@ describe(`ActionModal`, () => {
     expect(closeModal).toHaveBeenCalled()
   })
 
-  xit(`should not open second modal`, () => {
+  it(`should not open second modal`, () => {
     wrapper.setData({ show: false })
     global.confirm = () => false
     wrapper.vm.session.currrentModalOpen = true
@@ -206,7 +200,7 @@ describe(`ActionModal`, () => {
     expect(wrapper.vm.show).toBe(false)
   })
 
-  xit(`opens session modal and closes itself`, () => {
+  it(`opens session modal and closes itself`, () => {
     const $store = { commit: jest.fn() }
     const self = { $store, close: jest.fn(), $router: { push: jest.fn() } }
     ActionModal.methods.goToSession.call(self)
@@ -214,21 +208,21 @@ describe(`ActionModal`, () => {
     expect(self.$router.push).toHaveBeenCalledWith(`/welcome`)
   })
 
-  xit(`shows a password input for local signing`, async () => {
+  it(`shows a password input for local signing`, async () => {
     wrapper.vm.step = `sign`
     expect(wrapper.vm.selectedSignMethod).toBe(`local`)
     await wrapper.vm.$nextTick()
     expect(wrapper.find(`#password`).exists()).toBe(true)
   })
 
-  xit(`hides password input if signing with Ledger`, async () => {
+  it(`hides password input if signing with Ledger`, async () => {
     wrapper.vm.session.sessionType = `ledger`
     wrapper.vm.step = `sign`
     expect(wrapper.vm.selectedSignMethod).toBe(`ledger`)
     expect(wrapper.find(`#password`).exists()).toBe(false)
   })
 
-  xit(`should dispatch connectLedgerApp`, () => {
+  it(`should dispatch connectLedgerApp`, () => {
     const $store = { dispatch: jest.fn() }
     const self = { $store }
     ActionModal.methods.connectLedger.call(self)
@@ -254,25 +248,25 @@ describe(`ActionModal`, () => {
       })
     })
 
-    xit(`when user hasn't logged in`, async () => {
+    it(`when user hasn't logged in`, async () => {
       wrapper.vm.session.signedIn = false
       await wrapper.vm.$nextTick()
       expect(wrapper.element).toMatchSnapshot()
     })
 
-    xit(`waiting on inclusion`, async () => {
+    it(`waiting on inclusion`, async () => {
       wrapper.vm.step = "inclusion"
       expect(wrapper.element).toMatchSnapshot()
     })
 
-    xit(`on success`, async () => {
+    it(`on success`, async () => {
       wrapper.vm.step = "success"
       expect(wrapper.element).toMatchSnapshot()
     })
   })
 
   describe(`back button`, () => {
-    xit(`renders and functions`, () => {
+    it(`renders and functions`, () => {
       wrapper.setData({ step: "sign" })
       expect(wrapper.element).toMatchSnapshot()
       wrapper.find("#prevBtn").trigger("click")
@@ -283,43 +277,43 @@ describe(`ActionModal`, () => {
   })
 
   describe(`close modal`, () => {
-    xit(`closes`, () => {
+    it(`closes`, () => {
       wrapper.vm.open()
       wrapper.vm.close()
       expect(wrapper.isEmpty()).toBe(true)
     })
 
-    xit(`should erase password on close`, () => {
+    it(`should erase password on close`, () => {
       wrapper.vm.password = `mySecretPassword`
       wrapper.vm.close()
       expect(wrapper.vm.password).toBeNull()
     })
 
-    xit(`should clear error on close`, () => {
+    it(`should clear error on close`, () => {
       wrapper.vm.submissionError = `TRUMP`
       wrapper.vm.close()
       expect(wrapper.vm.submissionError).toBeNull()
     })
 
-    xit(`should set the step to transaction details`, () => {
+    it(`should set the step to transaction details`, () => {
       wrapper.vm.step = `sign`
       wrapper.vm.close()
       expect(wrapper.vm.step).toBe(`details`)
     })
 
-    xit(`should close on escape key press`, () => {
+    it(`should close on escape key press`, () => {
       wrapper.trigger("keyup.esc")
       expect(wrapper.isEmpty()).toBe(true)
     })
   })
 
   describe(`validates child form`, () => {
-    xit(`default`, () => {
+    it(`default`, () => {
       const isValid = ActionModal.computed.isValidChildForm.call({})
       expect(isValid).toBe(true)
     })
 
-    xit(`when validation function is present`, () => {
+    it(`when validation function is present`, () => {
       const self = {
         validate: jest.fn(() => true)
       }
@@ -331,14 +325,14 @@ describe(`ActionModal`, () => {
 
   describe(`validates password and gas price`, () => {
     describe(`success`, () => {
-      xit(`when password is required`, () => {
+      it(`when password is required`, () => {
         wrapper.vm.step = `sign`
         wrapper.vm.session.sessionType = `localKeystore`
         wrapper.setData({ password: `1234567890` })
         expect(wrapper.vm.isValidInput(`password`)).toBe(true)
       })
 
-      xit(`when gas price is set on dev mode session`, () => {
+      it(`when gas price is set on dev mode session`, () => {
         wrapper.vm.step = `fees`
         wrapper.vm.session.experimentalMode = true
         wrapper.setData({ gasPrice: 2.5e-8 })
@@ -347,21 +341,21 @@ describe(`ActionModal`, () => {
     })
 
     describe(`fails`, () => {
-      xit(`if password is undefined`, () => {
+      it(`if password is undefined`, () => {
         wrapper.vm.step = `sign`
         wrapper.vm.session.sessionType = `localKeystore`
         wrapper.setData({ password: undefined })
         expect(wrapper.vm.isValidInput(`password`)).toBe(false)
       })
 
-      xit(`if gas price is out of range`, () => {
+      it(`if gas price is out of range`, () => {
         wrapper.vm.step = `fees`
         wrapper.vm.session.experimentalMode = true
-        wrapper.setData({ gasPrice: 1500000 })
+        wrapper.setData({ gasPrice: 150003456700 })
         expect(wrapper.vm.isValidInput(`gasPrice`)).toBe(false)
       })
 
-      xit(`if gas price is undefined`, () => {
+      it(`if gas price is undefined`, () => {
         wrapper.vm.step = `fees`
         wrapper.vm.session.experimentalMode = true
         wrapper.setData({ gasPrice: undefined })
@@ -377,14 +371,14 @@ describe(`ActionModal`, () => {
     })
 
     describe(`success`, () => {
-      xit(`when the total invoice amount is less than the balance`, () => {
+      it(`when the total invoice amount is less than the balance`, () => {
         wrapper.setProps({ amount: 1210 })
         expect(wrapper.vm.isValidInput(`invoiceTotal`)).toBe(true)
       })
     })
 
     describe(`fails`, () => {
-      xit(`when the total invoice amount is more than the balance`, () => {
+      it(`when the total invoice amount is more than the balance`, () => {
         wrapper.setProps({ amount: 1211 })
         expect(wrapper.vm.isValidInput(`invoiceTotal`)).toBe(false)
       })
@@ -392,7 +386,7 @@ describe(`ActionModal`, () => {
   })
 
   describe(`simulate`, () => {
-    xit(`should simulate transaction to get estimated gas`, async () => {
+    it(`should simulate transaction to get estimated gas`, async () => {
       const transactionProperties = {
         type: "MsgSend",
         toAddress: "comsos12345",
@@ -420,7 +414,7 @@ describe(`ActionModal`, () => {
       })
     })
 
-    xit(`should max fees to the available amount`, async () => {
+    it(`should max fees to the available amount`, async () => {
       const transactionProperties = {
         type: "MsgSend",
         toAddress: "comsos12345",
@@ -448,7 +442,7 @@ describe(`ActionModal`, () => {
       })
     })
 
-    xit("should fail if simulation fails", async () => {
+    it("should fail if simulation fails", async () => {
       const mockSimulateFail = jest.fn(() =>
         Promise.reject(new Error(`invalid request`))
       )
@@ -487,14 +481,16 @@ describe(`ActionModal`, () => {
   })
 
   describe(`submit`, () => {
+    // Transactions are confirmed int the apollo subscription methods
+    // which we are yet to test.
     xit(`should submit transaction`, async () => {
       const transactionProperties = {
         type: "MsgSend",
         toAddress: "comsos12345",
         amounts: [
           {
-            amount: "100000",
-            denom: "uatoms"
+            amount: "10",
+            denom: "atoms"
           }
         ],
         memo: "A memo"
@@ -508,7 +504,7 @@ describe(`ActionModal`, () => {
       wrapper.setProps({ transactionProperties })
       wrapper.setData(data)
       wrapper.vm.$emit = jest.fn()
-      await wrapper.vm.submxit()
+      await wrapper.vm.submit()
       expect(wrapper.vm.submissionError).toBe(null)
       expect(wrapper.vm.$emit).toHaveBeenCalledWith(`txIncluded`, {
         txMeta: {
@@ -521,7 +517,7 @@ describe(`ActionModal`, () => {
       })
     })
 
-    xit("should fail if submitting fails", async () => {
+    it("should fail if submitting fails", async () => {
       const mockSubmitFail = jest.fn(() =>
         Promise.reject(new Error(`invalid request`))
       )
@@ -549,14 +545,14 @@ describe(`ActionModal`, () => {
 
       wrapper.setProps({ transactionProperties })
       wrapper.setData(data)
-      wrapper.vm.submxit()
+      wrapper.vm.submit()
       await wrapper.vm.$nextTick()
 
       expect(wrapper.html()).toContain("Transaction failed: invalid request.")
       expect(wrapper.vm.step).toBe("sign")
     })
 
-    xit("should fail if can't connect to Ledger", async () => {
+    it("should fail if can't connect to Ledger", async () => {
       $store.dispatch = jest.fn(() =>
         Promise.reject(new Error(`couldn't find Ledger`))
       )
@@ -583,7 +579,7 @@ describe(`ActionModal`, () => {
 
       wrapper.setProps({ transactionProperties })
       wrapper.setData(data)
-      wrapper.vm.submxit()
+      wrapper.vm.submit()
       await wrapper.vm.$nextTick()
       await wrapper.vm.$nextTick()
 
@@ -612,12 +608,12 @@ describe(`ActionModal`, () => {
     })
 
     describe(`on tx details step`, () => {
-      xit(`when using local keystore`, async () => {
+      it(`when using local keystore`, async () => {
         await ActionModal.methods.validateChangeStep.call(self)
         expect(self.simulate).toHaveBeenCalled()
       })
 
-      xit(`when using ledger`, async () => {
+      it(`when using ledger`, async () => {
         self.session.sessionType = `ledger`
         self.selectedSignMethod = `ledger`
 
@@ -631,12 +627,12 @@ describe(`ActionModal`, () => {
         self.step = `fees`
       })
 
-      xit(`success`, async () => {
+      it(`success`, async () => {
         await ActionModal.methods.validateChangeStep.call(self)
         expect(self.step).toBe(`sign`)
       })
 
-      xit(`fails if gas price is invalid`, async () => {
+      it(`fails if gas price is invalid`, async () => {
         self.isValidInput = jest.fn(() => false)
         await ActionModal.methods.validateChangeStep.call(self)
         expect(self.step).toBe(`fees`)
@@ -648,20 +644,20 @@ describe(`ActionModal`, () => {
         self.step = `sign`
       })
 
-      xit(`when using local keystore`, async () => {
+      it(`when using local keystore`, async () => {
         self.password = `1234567890`
         await ActionModal.methods.validateChangeStep.call(self)
         expect(self.submit).toHaveBeenCalled()
       })
 
-      xit(`fails validation if the password is missing`, async () => {
+      it(`fails validation if the password is missing`, async () => {
         self.password = null
         self.isValidInput = jest.fn(() => false)
         await ActionModal.methods.validateChangeStep.call(self)
         expect(self.submit).not.toHaveBeenCalled()
       })
 
-      xit(`when using ledger`, async () => {
+      it(`when using ledger`, async () => {
         self.session.sessionType = `ledger`
         self.selectedSignMethod = `ledger`
 
@@ -669,7 +665,7 @@ describe(`ActionModal`, () => {
         expect(self.submit).toHaveBeenCalled()
       })
 
-      xit(`when using extension`, async () => {
+      it(`when using extension`, async () => {
         self.session.sessionType = `extension`
         self.selectedSignMethod = `extension`
 
@@ -677,14 +673,14 @@ describe(`ActionModal`, () => {
         expect(self.submit).toHaveBeenCalled()
       })
 
-      xit(`doesn't submit on failed validation`, async () => {
+      it(`doesn't submit on failed validation`, async () => {
         self.isValidInput = jest.fn(() => false)
         await ActionModal.methods.validateChangeStep.call(self)
         expect(self.submit).not.toHaveBeenCalled()
       })
 
-      xit("should dispaly warning when using an address not in the extension", () => {
-        wrapper.vm.isExtensionAccount = false
+      it("should dispaly warning when using an address not in the extension", () => {
+        $store.getters.isExtensionAccount = false
         wrapper.vm.step = "sign"
         wrapper.vm.selectedSignMethod = "extension"
         expect(
@@ -695,7 +691,7 @@ describe(`ActionModal`, () => {
     })
 
     describe(`invalid step`, () => {
-      xit(`does anything`, async () => {
+      it(`does anything`, async () => {
         self.step = `other`
         await ActionModal.methods.validateChangeStep.call(self)
       })
@@ -720,7 +716,7 @@ describe(`ActionModal`, () => {
       }
     })
 
-    xit(`when signing with local keystore`, done => {
+    it(`when signing with local keystore`, done => {
       jest.useFakeTimers()
       self.isValidChildForm = true
       ActionModal.methods.validateChangeStep.call(self).then(() => {
@@ -731,7 +727,7 @@ describe(`ActionModal`, () => {
       jest.runAllTimers()
     })
 
-    xit(`when signing with ledger`, done => {
+    it(`when signing with ledger`, done => {
       self.session.sessionType = `ledger`
       self.step = `sign`
       jest.useFakeTimers()
@@ -745,7 +741,7 @@ describe(`ActionModal`, () => {
   })
 
   describe(`selected sign method`, () => {
-    xit(`selects local signed in with account`, () => {
+    it(`selects local signed in with account`, () => {
       expect(wrapper.vm.selectedSignMethod).toBe(`local`)
       expect(wrapper.vm.signMethods).toEqual([
         {
@@ -755,7 +751,7 @@ describe(`ActionModal`, () => {
       ])
     })
 
-    xit(`selects ledger if device is connected`, () => {
+    it(`selects ledger if device is connected`, () => {
       $store.state.session.sessionType = `ledger`
       expect(wrapper.vm.selectedSignMethod).toBe(`ledger`)
       expect(wrapper.vm.signMethods).toEqual([
@@ -767,7 +763,7 @@ describe(`ActionModal`, () => {
     })
   })
 
-  xit("shows a feature unavailable message", async () => {
+  it("shows a feature unavailable message", async () => {
     wrapper.vm.$apollo = {
       query: () => ({
         data: {
@@ -781,38 +777,13 @@ describe(`ActionModal`, () => {
   })
 
   describe(`windows`, () => {
-    beforeEach(() => {
-      wrapper = shallowMount(ActionModal, {
-        localVue,
-        propsData: {
-          title: `Action Modal`
-        },
-        mocks: {
-          $store: {
-            state: {
-              session: {
-                windowsDevice: true,
-                windowsWarning: "WINDOWS WARNING MESSAGE"
-              },
-              connection: {
-                network: "testnet"
-              },
-              extension: {
-                enabled: true
-              }
-            },
-            getters: {
-              network: "testnet"
-            },
-            commit: jest.fn()
-          },
-          $apollo
-        },
-        stubs: ["router-link"]
+    it(`shows windows warning`, async () => {
+      wrapper.setData({
+        session: {
+          windowsDevice: true,
+          windowsWarning: "WINDOWS WARNING MESSAGE"
+        }
       })
-      wrapper.vm.open()
-    })
-    xit(`shows windows warning`, async () => {
       expect(wrapper.element).toMatchSnapshot()
       expect(wrapper.text()).toMatch(/WINDOWS WARNING MESSAGE/)
     })
diff --git a/tests/unit/specs/components/ActionModal/components/DelegationModal.spec.js b/tests/unit/specs/components/ActionModal/components/DelegationModal.spec.js
index eb4bf35f1e..a93ab27589 100644
--- a/tests/unit/specs/components/ActionModal/components/DelegationModal.spec.js
+++ b/tests/unit/specs/components/ActionModal/components/DelegationModal.spec.js
@@ -46,7 +46,13 @@ describe(`DelegationModal`, () => {
     wrapper = shallowMount(DelegationModal, {
       localVue,
       mocks: {
-        $store: { getters, state }
+        $store: { getters, state },
+        $apollo: {
+          queries: {
+            balance: { refetch: () => {} },
+            delegations: { refetch: () => {} }
+          }
+        }
       },
       propsData: {
         targetValidator: validators[0]
diff --git a/tests/unit/specs/components/ActionModal/components/__snapshots__/ActionModal.spec.js.snap b/tests/unit/specs/components/ActionModal/components/__snapshots__/ActionModal.spec.js.snap
index 5b611bfb72..aec8f9e02b 100644
--- a/tests/unit/specs/components/ActionModal/components/__snapshots__/ActionModal.spec.js.snap
+++ b/tests/unit/specs/components/ActionModal/components/__snapshots__/ActionModal.spec.js.snap
@@ -37,14 +37,56 @@ exports[`ActionModal back button renders and functions 1`] = `
       Action Modal
     </span>
      
+    <steps-stub
+      activestep="sign"
+      steps="Details,Fees,Sign"
+    />
+     
+    <!---->
+  </div>
+   
+  <!---->
+   
+  <div
+    class="action-modal-form"
+  >
     <!---->
      
     <!---->
+     
+    <form>
+      <tmformgroup-stub
+        class="action-modal-group"
+        fieldid="password"
+        fieldlabel="Password"
+      >
+        <tmfield-stub
+          id="password"
+          placeholder="Password"
+          type="password"
+        />
+         
+        <!---->
+      </tmformgroup-stub>
+    </form>
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          value="Send"
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -85,7 +127,10 @@ exports[`ActionModal runs validation and changes step on sign step should dispal
       Action Modal
     </span>
      
-    <!---->
+    <steps-stub
+      activestep="sign"
+      steps="Details,Fees,Sign"
+    />
      
     <p
       class="form-message notice extension-address"
@@ -97,9 +142,47 @@ exports[`ActionModal runs validation and changes step on sign step should dispal
     </p>
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <!---->
+   
+  <div
+    class="action-modal-form"
+  >
+    <!---->
+     
+    <!---->
+     
+    <hardwarestate-stub
+      icon="info"
+    >
+      <div>
+        
+            Please send the transaction to be signed in the Lunie Browser
+            Extension.
+          
+      </div>
+       
+      <!---->
+       
+      <!---->
+    </hardwarestate-stub>
+  </div>
+   
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          value="Send"
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -136,9 +219,45 @@ exports[`ActionModal should show the action modal on success 1`] = `
     <!---->
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <!---->
+   
+  <div
+    class="action-modal-form success-step"
+  >
+    <tmdatamsg-stub
+      icon="check"
+    >
+      <div>
+        
+            Successful transaction
+          
+      </div>
+       
+      <div>
+        
+            You have successfully completed a transaction.
+            
+        <br />
+         
+        <br />
+        Block
+            
+        <router-link-stub
+          to="/blocks/undefined"
+        >
+          #0
+        </router-link-stub>
+      </div>
+    </tmdatamsg-stub>
+  </div>
+   
+  <div
+    class="action-modal-footer"
+  >
+    <!---->
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -175,9 +294,17 @@ exports[`ActionModal should show the action modal waiting on inclusion 1`] = `
     <!---->
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <!---->
+   
+  <!---->
+   
+  <div
+    class="action-modal-footer"
+  >
+    <!---->
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -218,14 +345,46 @@ exports[`ActionModal should show the action modal when user has logged in with e
       Action Modal
     </span>
      
+    <steps-stub
+      activestep="fees"
+      steps="Details,Fees,Sign"
+    />
+     
     <!---->
+  </div>
+   
+  <!---->
+   
+  <div
+    class="action-modal-form"
+  >
+    <!---->
+     
+    <tableinvoice-stub
+      amount="0"
+      bonddenom="STAKE"
+      estimatedfee="0"
+    />
      
     <!---->
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          value="Next"
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -266,14 +425,67 @@ exports[`ActionModal should show the action modal when user has logged in with e
       Action Modal
     </span>
      
+    <steps-stub
+      activestep="sign"
+      steps="Details,Fees,Sign"
+    />
+     
     <!---->
+  </div>
+   
+  <!---->
+   
+  <div
+    class="action-modal-form"
+  >
+    <tmformgroup-stub
+      class="action-modal-form-group"
+      fieldid="sign-method"
+      fieldlabel="Signing Method"
+    >
+      <tmfield-stub
+        id="sign-method"
+        options="[object Object],[object Object]"
+        type="select"
+        value="local"
+      />
+    </tmformgroup-stub>
      
     <!---->
+     
+    <form>
+      <tmformgroup-stub
+        class="action-modal-group"
+        fieldid="password"
+        fieldlabel="Password"
+      >
+        <tmfield-stub
+          id="password"
+          placeholder="Password"
+          type="password"
+        />
+         
+        <!---->
+      </tmformgroup-stub>
+    </form>
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          value="Send"
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -305,14 +517,68 @@ exports[`ActionModal should show the action modal when user has logged in with e
       Action Modal
     </span>
      
+    <steps-stub
+      activestep="sign"
+      steps="Details,Fees,Sign"
+    />
+     
     <!---->
+  </div>
+   
+  <!---->
+   
+  <div
+    class="action-modal-form"
+  >
+    <tmformgroup-stub
+      class="action-modal-form-group"
+      fieldid="sign-method"
+      fieldlabel="Signing Method"
+    >
+      <tmfield-stub
+        id="sign-method"
+        options="[object Object],[object Object]"
+        type="select"
+        value="local"
+      />
+    </tmformgroup-stub>
      
     <!---->
+     
+    <form>
+      <tmformgroup-stub
+        class="action-modal-group"
+        fieldid="password"
+        fieldlabel="Password"
+      >
+        <tmfield-stub
+          id="password"
+          placeholder="Password"
+          type="password"
+        />
+         
+        <!---->
+      </tmformgroup-stub>
+    </form>
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          disabled="true"
+          value="Sending..."
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -353,14 +619,46 @@ exports[`ActionModal should show the action modal when user has logged in with e
       Action Modal
     </span>
      
+    <steps-stub
+      activestep="fees"
+      steps="Details,Fees,Sign"
+    />
+     
+    <!---->
+  </div>
+   
+  <!---->
+   
+  <div
+    class="action-modal-form"
+  >
     <!---->
      
+    <tableinvoice-stub
+      amount="0"
+      bonddenom="STAKE"
+      estimatedfee="0"
+    />
+     
     <!---->
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          value="Next"
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -401,7 +699,10 @@ exports[`ActionModal should show the action modal when user has logged in with e
       Action Modal
     </span>
      
-    <!---->
+    <steps-stub
+      activestep="sign"
+      steps="Details,Fees,Sign"
+    />
      
     <p
       class="form-message notice extension-address"
@@ -413,9 +714,47 @@ exports[`ActionModal should show the action modal when user has logged in with e
     </p>
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <!---->
+   
+  <div
+    class="action-modal-form"
+  >
+    <!---->
+     
+    <!---->
+     
+    <hardwarestate-stub
+      icon="info"
+    >
+      <div>
+        
+            Please send the transaction to be signed in the Lunie Browser
+            Extension.
+          
+      </div>
+       
+      <!---->
+       
+      <!---->
+    </hardwarestate-stub>
+  </div>
+   
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          value="Send"
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -447,7 +786,10 @@ exports[`ActionModal should show the action modal when user has logged in with e
       Action Modal
     </span>
      
-    <!---->
+    <steps-stub
+      activestep="sign"
+      steps="Details,Fees,Sign"
+    />
      
     <p
       class="form-message notice extension-address"
@@ -459,9 +801,49 @@ exports[`ActionModal should show the action modal when user has logged in with e
     </p>
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <!---->
+   
+  <div
+    class="action-modal-form"
+  >
+    <!---->
+     
+    <!---->
+     
+    <hardwarestate-stub
+      icon="info"
+      loading="true"
+    >
+      <!---->
+       
+      <div>
+        
+            Please open the Lunie Browser Extension, review the details, and
+            approve the transaction.
+          
+      </div>
+       
+      <!---->
+    </hardwarestate-stub>
+  </div>
+   
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          disabled="true"
+          value="Waiting for Extension"
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -502,14 +884,46 @@ exports[`ActionModal should show the action modal when user has logged in with l
       Action Modal
     </span>
      
+    <steps-stub
+      activestep="fees"
+      steps="Details,Fees,Sign"
+    />
+     
     <!---->
+  </div>
+   
+  <!---->
+   
+  <div
+    class="action-modal-form"
+  >
+    <!---->
+     
+    <tableinvoice-stub
+      amount="0"
+      bonddenom="STAKE"
+      estimatedfee="0"
+    />
      
     <!---->
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          value="Next"
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -550,14 +964,51 @@ exports[`ActionModal should show the action modal when user has logged in with l
       Action Modal
     </span>
      
+    <steps-stub
+      activestep="sign"
+      steps="Details,Fees,Sign"
+    />
+     
+    <!---->
+  </div>
+   
+  <!---->
+   
+  <div
+    class="action-modal-form"
+  >
     <!---->
      
+    <hardwarestate-stub
+      icon="info"
+    >
+      <div>
+        
+            Please use Chrome, Brave, or Opera. Ledger is not supported in
+            this browser.
+          
+      </div>
+    </hardwarestate-stub>
+     
     <!---->
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          value="Send"
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -589,14 +1040,53 @@ exports[`ActionModal should show the action modal when user has logged in with l
       Action Modal
     </span>
      
+    <steps-stub
+      activestep="sign"
+      steps="Details,Fees,Sign"
+    />
+     
     <!---->
+  </div>
+   
+  <!---->
+   
+  <div
+    class="action-modal-form"
+  >
+    <!---->
+     
+    <hardwarestate-stub
+      icon="info"
+      loading="true"
+    >
+      <div>
+        
+            Please use Chrome, Brave, or Opera. Ledger is not supported in
+            this browser.
+          
+      </div>
+    </hardwarestate-stub>
      
     <!---->
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          disabled="true"
+          value="Waiting for Ledger"
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -637,14 +1127,46 @@ exports[`ActionModal should show the action modal when user has logged in with l
       Action Modal
     </span>
      
+    <steps-stub
+      activestep="fees"
+      steps="Details,Fees,Sign"
+    />
+     
     <!---->
+  </div>
+   
+  <!---->
+   
+  <div
+    class="action-modal-form"
+  >
+    <!---->
+     
+    <tableinvoice-stub
+      amount="0"
+      bonddenom="STAKE"
+      estimatedfee="0"
+    />
      
     <!---->
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          value="Next"
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -685,14 +1207,56 @@ exports[`ActionModal should show the action modal when user has logged in with l
       Action Modal
     </span>
      
+    <steps-stub
+      activestep="sign"
+      steps="Details,Fees,Sign"
+    />
+     
+    <!---->
+  </div>
+   
+  <!---->
+   
+  <div
+    class="action-modal-form"
+  >
     <!---->
      
     <!---->
+     
+    <form>
+      <tmformgroup-stub
+        class="action-modal-group"
+        fieldid="password"
+        fieldlabel="Password"
+      >
+        <tmfield-stub
+          id="password"
+          placeholder="Password"
+          type="password"
+        />
+         
+        <!---->
+      </tmformgroup-stub>
+    </form>
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          value="Send"
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -724,14 +1288,57 @@ exports[`ActionModal should show the action modal when user has logged in with l
       Action Modal
     </span>
      
+    <steps-stub
+      activestep="sign"
+      steps="Details,Fees,Sign"
+    />
+     
+    <!---->
+  </div>
+   
+  <!---->
+   
+  <div
+    class="action-modal-form"
+  >
     <!---->
      
     <!---->
+     
+    <form>
+      <tmformgroup-stub
+        class="action-modal-group"
+        fieldid="password"
+        fieldlabel="Password"
+      >
+        <tmfield-stub
+          id="password"
+          placeholder="Password"
+          type="password"
+        />
+         
+        <!---->
+      </tmformgroup-stub>
+    </form>
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          disabled="true"
+          value="Sending..."
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -763,14 +1370,44 @@ exports[`ActionModal should show the action modal when user hasn't logged in 1`]
       Sign in required
     </span>
      
-    <!---->
+    <steps-stub
+      activestep="details"
+      steps="Details,Fees,Sign"
+    />
      
     <!---->
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
-  />
+  <!---->
+   
+  <div
+    class="action-modal-form"
+  >
+    <p
+      class="form-message notice"
+    >
+      
+          You need to sign in to submit a transaction.
+        
+    </p>
+  </div>
+   
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          value="Sign In"
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -802,14 +1439,36 @@ exports[`ActionModal shows a feature unavailable message 1`] = `
       Action Modal
     </span>
      
-    <!---->
+    <steps-stub
+      activestep="details"
+      steps="Details,Fees,Sign"
+    />
      
     <!---->
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
+  <!---->
+   
+  <div
+    class="action-modal-form"
   />
+   
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          value="Next"
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
 
@@ -838,16 +1497,44 @@ exports[`ActionModal windows shows windows warning 1`] = `
     <span
       class="action-modal-title"
     >
-      Sign in required
+      Action Modal
     </span>
      
-    <!---->
+    <steps-stub
+      activestep="details"
+      steps="Details,Fees,Sign"
+    />
      
     <!---->
   </div>
    
-  <featurenotavailable-stub
-    feature="Action Modal"
+  <p
+    class="form-message notice"
+  >
+    
+        WINDOWS WARNING MESSAGE
+      
+  </p>
+   
+  <div
+    class="action-modal-form"
   />
+   
+  <div
+    class="action-modal-footer"
+  >
+    <tmformgroup-stub
+      class="action-modal-group"
+    >
+      <div>
+        <tmbtn-stub
+          color="primary"
+          value="Next"
+        />
+      </div>
+    </tmformgroup-stub>
+     
+    <!---->
+  </div>
 </div>
 `;
diff --git a/tests/unit/specs/components/ActionModal/components/__snapshots__/DelegationModal.spec.js.snap b/tests/unit/specs/components/ActionModal/components/__snapshots__/DelegationModal.spec.js.snap
index 027bb5b353..d0f4b90615 100644
--- a/tests/unit/specs/components/ActionModal/components/__snapshots__/DelegationModal.spec.js.snap
+++ b/tests/unit/specs/components/ActionModal/components/__snapshots__/DelegationModal.spec.js.snap
@@ -6,6 +6,7 @@ exports[`DelegationModal should display the delegation modal form 1`] = `
   class="delegation-modal"
   id="delegation-modal"
   notifymessage="[object Object]"
+  rewards=""
   submissionerrorprefix="Delegating failed"
   title="Delegate"
   transactiondata="[object Object]"
diff --git a/tests/unit/specs/components/ActionModal/components/__snapshots__/ModalDeposit.spec.js.snap b/tests/unit/specs/components/ActionModal/components/__snapshots__/ModalDeposit.spec.js.snap
index cacbb9ea04..6a6483c43f 100644
--- a/tests/unit/specs/components/ActionModal/components/__snapshots__/ModalDeposit.spec.js.snap
+++ b/tests/unit/specs/components/ActionModal/components/__snapshots__/ModalDeposit.spec.js.snap
@@ -6,6 +6,7 @@ exports[`ModalDeposit should display deposit modal form 1`] = `
   class="modal-deposit"
   id="modal-deposit"
   notifymessage="[object Object]"
+  rewards=""
   submissionerrorprefix="Depositing failed"
   title="Deposit"
   transactiondata="[object Object]"
diff --git a/tests/unit/specs/components/ActionModal/components/__snapshots__/ModalPropose.spec.js.snap b/tests/unit/specs/components/ActionModal/components/__snapshots__/ModalPropose.spec.js.snap
index e69f86613f..439bf93868 100644
--- a/tests/unit/specs/components/ActionModal/components/__snapshots__/ModalPropose.spec.js.snap
+++ b/tests/unit/specs/components/ActionModal/components/__snapshots__/ModalPropose.spec.js.snap
@@ -5,6 +5,7 @@ exports[`ModalPropose should display proposal modal form 1`] = `
   amount="0"
   id="modal-propose"
   notifymessage="[object Object]"
+  rewards=""
   submissionerrorprefix="Submitting proposal failed"
   title="Proposal"
   transactiondata="[object Object]"
diff --git a/tests/unit/specs/components/ActionModal/components/__snapshots__/ModalVote.spec.js.snap b/tests/unit/specs/components/ActionModal/components/__snapshots__/ModalVote.spec.js.snap
index 825b26bdb9..ceeb37d7dd 100644
--- a/tests/unit/specs/components/ActionModal/components/__snapshots__/ModalVote.spec.js.snap
+++ b/tests/unit/specs/components/ActionModal/components/__snapshots__/ModalVote.spec.js.snap
@@ -6,6 +6,7 @@ exports[`ModalVote should display vote modal form 1`] = `
   class="modal-vote"
   id="modal-vote"
   notifymessage="[object Object]"
+  rewards=""
   submissionerrorprefix="Voting failed"
   title="Vote"
   transactiondata="[object Object]"
diff --git a/tests/unit/specs/components/ActionModal/components/__snapshots__/SendModal.spec.js.snap b/tests/unit/specs/components/ActionModal/components/__snapshots__/SendModal.spec.js.snap
index 0e8a977ec3..fe1598ae33 100644
--- a/tests/unit/specs/components/ActionModal/components/__snapshots__/SendModal.spec.js.snap
+++ b/tests/unit/specs/components/ActionModal/components/__snapshots__/SendModal.spec.js.snap
@@ -4,6 +4,7 @@ exports[`SendModal should display send modal form 1`] = `
 <actionmodal-stub
   id="send-modal"
   notifymessage="[object Object]"
+  rewards=""
   submissionerrorprefix="Sending tokens failed"
   title="Send"
   transactiondata="[object Object]"
@@ -66,6 +67,7 @@ exports[`SendModal validation should show address required error 1`] = `
   amount="2"
   id="send-modal"
   notifymessage="[object Object]"
+  rewards=""
   submissionerrorprefix="Sending tokens failed"
   title="Send"
   transactiondata="[object Object]"
@@ -134,6 +136,7 @@ exports[`SendModal validation should show bech32 error when address length is to
   amount="2"
   id="send-modal"
   notifymessage="[object Object]"
+  rewards=""
   submissionerrorprefix="Sending tokens failed"
   title="Send"
   transactiondata="[object Object]"
@@ -202,6 +205,7 @@ exports[`SendModal validation should show bech32 error when address length is to
   amount="2"
   id="send-modal"
   notifymessage="[object Object]"
+  rewards=""
   submissionerrorprefix="Sending tokens failed"
   title="Send"
   transactiondata="[object Object]"
@@ -269,6 +273,7 @@ exports[`SendModal validation should show bech32 error when alphanumeric is wron
 <actionmodal-stub
   id="send-modal"
   notifymessage="[object Object]"
+  rewards=""
   submissionerrorprefix="Sending tokens failed"
   title="Send"
   transactiondata="[object Object]"
diff --git a/tests/unit/specs/components/ActionModal/components/__snapshots__/UndelegationModal.spec.js.snap b/tests/unit/specs/components/ActionModal/components/__snapshots__/UndelegationModal.spec.js.snap
index 505e9e7c37..71525ec61b 100644
--- a/tests/unit/specs/components/ActionModal/components/__snapshots__/UndelegationModal.spec.js.snap
+++ b/tests/unit/specs/components/ActionModal/components/__snapshots__/UndelegationModal.spec.js.snap
@@ -6,6 +6,7 @@ exports[`UndelegationModal should display undelegation modal form 1`] = `
   class="undelegation-modal"
   id="undelegation-modal"
   notifymessage="[object Object]"
+  rewards=""
   submissionerrorprefix="Undelegating failed"
   title="Undelegate"
   transactiondata="[object Object]"
diff --git a/tests/unit/specs/components/staking/PageValidator.spec.js b/tests/unit/specs/components/staking/PageValidator.spec.js
index 514df12540..e8d6fdbd01 100644
--- a/tests/unit/specs/components/staking/PageValidator.spec.js
+++ b/tests/unit/specs/components/staking/PageValidator.spec.js
@@ -54,7 +54,16 @@ describe(`PageValidator`, () => {
       queries: {
         validator: {
           loading: false,
-          error: false
+          error: false,
+          refetch: () => {}
+        },
+        rewards: {
+          loading: false,
+          error: false,
+          refetch: () => {}
+        },
+        delegation: {
+          refetch: () => {}
         }
       }
     }
diff --git a/tests/unit/specs/components/staking/TableValidators.spec.js b/tests/unit/specs/components/staking/TableValidators.spec.js
index d648ba4849..1a20ed4b46 100644
--- a/tests/unit/specs/components/staking/TableValidators.spec.js
+++ b/tests/unit/specs/components/staking/TableValidators.spec.js
@@ -20,13 +20,26 @@ const validators = [
 ]
 
 describe(`TableValidators`, () => {
-  let wrapper
+  let wrapper, $apollo
+
+  $apollo = {
+    queries: {
+      rewards: {
+        loading: false,
+        error: false,
+        startPolling: jest.fn()
+      }
+    }
+  }
 
   beforeEach(() => {
     wrapper = shallowMount(TableValidators, {
       propsData: { validators },
       directives: {
         infiniteScroll: () => {}
+      },
+      mocks: {
+        $apollo
       }
     })
   })
diff --git a/tests/unit/specs/components/staking/__snapshots__/PageValidator.spec.js.snap b/tests/unit/specs/components/staking/__snapshots__/PageValidator.spec.js.snap
index 091e13bc7b..693651e626 100644
--- a/tests/unit/specs/components/staking/__snapshots__/PageValidator.spec.js.snap
+++ b/tests/unit/specs/components/staking/__snapshots__/PageValidator.spec.js.snap
@@ -6,7 +6,6 @@ exports[`PageValidator if user has signed in 1`] = `
   data-title="Validator"
   dataempty="true"
   hideheader="true"
-  loaded="true"
   managed="true"
   subtitle=""
   title=""
@@ -37,7 +36,6 @@ exports[`PageValidator if user hasn't signed in 1`] = `
   data-title="Validator"
   dataempty="true"
   hideheader="true"
-  loaded="true"
   managed="true"
   subtitle=""
   title=""
diff --git a/tests/unit/specs/components/staking/__snapshots__/PageValidators.spec.js.snap b/tests/unit/specs/components/staking/__snapshots__/PageValidators.spec.js.snap
index fb137b0e29..8552625e78 100644
--- a/tests/unit/specs/components/staking/__snapshots__/PageValidators.spec.js.snap
+++ b/tests/unit/specs/components/staking/__snapshots__/PageValidators.spec.js.snap
@@ -42,13 +42,14 @@ exports[`PageValidators shows a list of validators 1`] = `
     />
      
     <!---->
+     
+    <!---->
   </template>
 </tmpage-stub>
 `;
 
 exports[`PageValidators shows a message if still loading 1`] = `
 <tmpage-stub
-  dataempty="true"
   hideheader="true"
   managed="true"
   subtitle=""
@@ -89,13 +90,14 @@ exports[`PageValidators shows a message if still loading 1`] = `
     />
      
     <!---->
+     
+    <!---->
   </template>
 </tmpage-stub>
 `;
 
 exports[`PageValidators shows a message if there is an error to display 1`] = `
 <tmpage-stub
-  dataempty="true"
   hideheader="true"
   managed="true"
   subtitle=""
@@ -136,13 +138,14 @@ exports[`PageValidators shows a message if there is an error to display 1`] = `
     />
      
     <!---->
+     
+    <!---->
   </template>
 </tmpage-stub>
 `;
 
 exports[`PageValidators shows a message if there is nothing to display 1`] = `
 <tmpage-stub
-  dataempty="true"
   hideheader="true"
   managed="true"
   subtitle=""
@@ -183,6 +186,8 @@ exports[`PageValidators shows a message if there is nothing to display 1`] = `
     />
      
     <!---->
+     
+    <!---->
   </template>
 </tmpage-stub>
 `;
diff --git a/yarn.lock b/yarn.lock
index 51800017f9..e1c52fa7b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1737,6 +1737,14 @@ apollo-link-http@^1.3.1:
     apollo-link-http-common "^0.2.15"
     tslib "^1.9.3"
 
+apollo-link-persisted-queries@0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/apollo-link-persisted-queries/-/apollo-link-persisted-queries-0.2.2.tgz#156597cb259b7bb56cf4e967a7be0312954f4591"
+  integrity sha512-YL7XBu/5QsSbbYaWUXgm87T2Hn/2AQZk5Wr8CLXGDr3Wl3E/TRhBhKgQQTly9xhaTi7jgBO+AeIyTH5wCBHA9w==
+  dependencies:
+    apollo-link "^1.2.1"
+    hash.js "^1.1.3"
+
 apollo-link-ws@1.0.19:
   version "1.0.19"
   resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.19.tgz#dfa871d4df883a8777c9556c872fc892e103daa5"
@@ -1745,7 +1753,7 @@ apollo-link-ws@1.0.19:
     apollo-link "^1.2.13"
     tslib "^1.9.3"
 
-apollo-link@^1.0.0, apollo-link@^1.0.6, apollo-link@^1.2.13:
+apollo-link@^1.0.0, apollo-link@^1.0.6, apollo-link@^1.2.1, apollo-link@^1.2.13:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.13.tgz#dff00fbf19dfcd90fddbc14b6a3f9a771acac6c4"
   integrity sha512-+iBMcYeevMm1JpYgwDEIDt/y0BB7VWyvlm/7x+TIPNLHCTCMgcEgDuW5kH86iQZWo0I7mNwQiTOz+/3ShPFmBw==
@@ -5632,7 +5640,7 @@ hash-sum@^1.0.2:
   resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
   integrity sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=
 
-hash.js@^1.0.0, hash.js@^1.0.3:
+hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.3:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
   integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==