From 4ffb51631dc89c7ed840c7d4db584f10c5ea1bb0 Mon Sep 17 00:00:00 2001
From: Fabian Weber <frznhope@gmail.com>
Date: Fri, 8 Nov 2019 23:09:58 +0100
Subject: [PATCH 1/5] some fixes

---
 config.js                                     |  2 +-
 .../components/DelegationModal.vue            | 24 +++++++++++++++++++
 .../staking/DelegationsOverview.vue           |  3 +++
 src/components/staking/PageValidator.vue      |  8 ++++---
 src/vuex/modules/session.js                   |  4 ++--
 5 files changed, 35 insertions(+), 6 deletions(-)

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/src/ActionModal/components/DelegationModal.vue b/src/ActionModal/components/DelegationModal.vue
index 7562b275a0..0fccfa4422 100644
--- a/src/ActionModal/components/DelegationModal.vue
+++ b/src/ActionModal/components/DelegationModal.vue
@@ -143,6 +143,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 +254,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) {
@@ -366,6 +371,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/components/staking/DelegationsOverview.vue b/src/components/staking/DelegationsOverview.vue
index 537b023991..8129dc50ae 100644
--- a/src/components/staking/DelegationsOverview.vue
+++ b/src/components/staking/DelegationsOverview.vue
@@ -41,6 +41,9 @@ export default {
   computed: {
     ...mapGetters(["address", `network`])
   },
+  mounted() {
+    this.$apollo.queries.delegations.refetch()
+  },
   apollo: {
     delegations: {
       query() {
diff --git a/src/components/staking/PageValidator.vue b/src/components/staking/PageValidator.vue
index 7f620af976..cf06f54b84 100644
--- a/src/components/staking/PageValidator.vue
+++ b/src/components/staking/PageValidator.vue
@@ -212,6 +212,10 @@ export default {
     ...mapGetters([`network`]),
     ...mapGetters({ userAddress: `address` })
   },
+  mounted() {
+    this.$apollo.queries.rewards.refetch()
+    this.$apollo.queries.delegation.refetch()
+  },
   methods: {
     shortDecimals,
     atoms,
@@ -285,9 +289,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/vuex/modules/session.js b/src/vuex/modules/session.js
index 8fbcfc3deb..6c2fca8b5f 100644
--- a/src/vuex/modules/session.js
+++ b/src/vuex/modules/session.js
@@ -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)

From 9557202927148b44b1fc3b0f2b7f61e57916cbf8 Mon Sep 17 00:00:00 2001
From: Fabian Weber <frznhope@gmail.com>
Date: Mon, 11 Nov 2019 00:19:09 +0100
Subject: [PATCH 2/5] fixed fetching and caching issues

---
 src/ActionModal/components/DelegationModal.vue   |  4 ++++
 src/ActionModal/components/SendModal.vue         |  4 ++++
 src/ActionModal/components/UndelegationModal.vue |  4 ++++
 src/components/common/TmBalance.vue              |  9 ++-------
 src/components/governance/PageProposal.vue       |  2 ++
 src/components/governance/PageProposals.vue      |  1 +
 src/components/staking/DelegationsOverview.vue   |  6 ++----
 src/components/staking/PageValidator.vue         | 13 ++++++++++++-
 src/components/staking/Undelegations.vue         |  3 ++-
 src/scripts/apollo-refetch.js                    |  7 +++++++
 src/vuex/modules/session.js                      | 15 ++++++++++++++-
 11 files changed, 54 insertions(+), 14 deletions(-)
 create mode 100644 src/scripts/apollo-refetch.js

diff --git a/src/ActionModal/components/DelegationModal.vue b/src/ActionModal/components/DelegationModal.vue
index 0fccfa4422..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">
@@ -284,6 +285,9 @@ export default {
     },
     enterPressed() {
       this.$refs.actionModal.validateChangeStep()
+    },
+    onSuccess(event) {
+      this.$emit(`success`, event)
     }
   },
   validations() {
diff --git a/src/ActionModal/components/SendModal.vue b/src/ActionModal/components/SendModal.vue
index ac4bb2301f..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()
 
diff --git a/src/ActionModal/components/UndelegationModal.vue b/src/ActionModal/components/UndelegationModal.vue
index 06617015b0..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,6 +175,9 @@ export default {
     switchToRedelegation() {
       this.$refs.actionModal.close()
       this.$emit("switchToRedelegation")
+    },
+    onSuccess(event) {
+      this.$emit(`success`, event)
     }
   },
   apollo: {
diff --git a/src/components/common/TmBalance.vue b/src/components/common/TmBalance.vue
index 31931b712d..9f244320de 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 refetch from "scripts/apollo-refetch"
 import { noBlanks } from "src/filters"
 import TmBtn from "common/TmBtn"
 import SendModal from "src/ActionModal/components/SendModal"
@@ -74,12 +75,6 @@ export default {
       return this.overview.totalRewards > 0
     }
   },
-  mounted() {
-    // We need to account or a small delay in the node processing of balances.
-    // TODO: Find a cleaner solution.
-    const refetch = () => this.$apollo.queries.overview.refetch()
-    setTimeout(refetch, 2000)
-  },
   methods: {
     onWithdrawal() {
       this.$refs.ModalWithdrawRewards.open()
@@ -150,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()
+          refetch(this.$apollo.query.overview)
         }
       }
     }
diff --git a/src/components/governance/PageProposal.vue b/src/components/governance/PageProposal.vue
index 746d8b5cc9..dc306f84e9 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`])
     },
     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`])
     }
   },
   apollo: {
diff --git a/src/components/governance/PageProposals.vue b/src/components/governance/PageProposals.vue
index 0083f593c8..ca2a0a8e11 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`])
     }
   },
   apollo: {
diff --git a/src/components/staking/DelegationsOverview.vue b/src/components/staking/DelegationsOverview.vue
index 8129dc50ae..6d862e4e9e 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 refetch from "scripts/apollo-refetch"
 
 export default {
   name: `delegations-overview`,
@@ -41,9 +42,6 @@ export default {
   computed: {
     ...mapGetters(["address", `network`])
   },
-  mounted() {
-    this.$apollo.queries.delegations.refetch()
-  },
   apollo: {
     delegations: {
       query() {
@@ -75,7 +73,7 @@ export default {
         query: UserTransactionAdded,
         result({ data }) {
           if (data.userTransactionAdded.success) {
-            this.$apollo.queries.delegations.refetch()
+            refetch(this.$apollo.query.delegations)
           }
         }
       }
diff --git a/src/components/staking/PageValidator.vue b/src/components/staking/PageValidator.vue
index cf06f54b84..0b430b3db3 100644
--- a/src/components/staking/PageValidator.vue
+++ b/src/components/staking/PageValidator.vue
@@ -133,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="clearUnelegationCache"
       />
     </template>
     <template v-else>
@@ -226,6 +231,12 @@ export default {
     },
     onUndelegation() {
       this.$refs.undelegationModal.open()
+    },
+    clearDelegationCache() {
+      this.$store.commit("invalidateCache", [`overview`, `delegations`]) // TODO use more finegrained query string (network and address)
+    },
+    clearUndelegationCache() {
+      this.$store.commit("invalidateCache", [`overview`, `delegations`]) // TODO use more finegrained query string (network and address)
     }
   },
   apollo: {
diff --git a/src/components/staking/Undelegations.vue b/src/components/staking/Undelegations.vue
index 4d293a4fb8..82444a311a 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 refetch from "scripts/apollo-refetch"
 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()
+            refetch(this.$apollo.query.undelegations)
           }
         }
       }
diff --git a/src/scripts/apollo-refetch.js b/src/scripts/apollo-refetch.js
new file mode 100644
index 0000000000..2a65e50ffb
--- /dev/null
+++ b/src/scripts/apollo-refetch.js
@@ -0,0 +1,7 @@
+// when refetching always force to load from the network
+export default (apolloQuery) => {
+    apolloQuery.setOptions({
+        fetchPolicy: "network-only"
+    })
+    apolloQuery.refetch()
+}
diff --git a/src/vuex/modules/session.js b/src/vuex/modules/session.js
index 6c2fca8b5f..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 = {
@@ -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]
+        })
     }
   }
 

From a38b2e3918c6124b994c4a15f31990141541cbc0 Mon Sep 17 00:00:00 2001
From: Fabian Weber <frznhope@gmail.com>
Date: Mon, 11 Nov 2019 00:32:45 +0100
Subject: [PATCH 3/5] fixed tests

---
 .../ActionModal/components/DelegationModal.spec.js    | 10 ++++++++--
 .../specs/components/staking/PageValidator.spec.js    | 11 ++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/tests/unit/specs/components/ActionModal/components/DelegationModal.spec.js b/tests/unit/specs/components/ActionModal/components/DelegationModal.spec.js
index eb4bf35f1e..ae012ec0cb 100644
--- a/tests/unit/specs/components/ActionModal/components/DelegationModal.spec.js
+++ b/tests/unit/specs/components/ActionModal/components/DelegationModal.spec.js
@@ -29,7 +29,7 @@ describe(`DelegationModal`, () => {
   let wrapper
   const localVue = createLocalVue()
   localVue.use(Vuelidate)
-  localVue.directive("focus", () => {})
+  localVue.directive("focus", () => { })
 
   const state = {
     session: {
@@ -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/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: () => {}
         }
       }
     }

From b86bb06175fb21a022300cbefac7a39b7980c978 Mon Sep 17 00:00:00 2001
From: Fabian Weber <frznhope@gmail.com>
Date: Mon, 11 Nov 2019 00:54:59 +0100
Subject: [PATCH 4/5] better failing of e2e tests

---
 tests/e2e/helpers.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/e2e/helpers.js b/tests/e2e/helpers.js
index 652a400b71..bdc950bd3c 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
@@ -67,7 +65,7 @@ async function actionModalCheckout(
 ) {
   // grab page we came from as we want to go to another page and come back
   let sourcePage
-  browser.url(function(result) {
+  browser.url(function (result) {
     sourcePage = result.value
   })
 
@@ -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

From d32f82cbe104f29edf3e8a7e2943ce0a27b33e35 Mon Sep 17 00:00:00 2001
From: Fabian Weber <frznhope@gmail.com>
Date: Mon, 11 Nov 2019 11:14:51 +0100
Subject: [PATCH 5/5] renaming

---
 src/components/common/TmBalance.vue            |  4 ++--
 src/components/staking/DelegationsOverview.vue |  4 ++--
 src/components/staking/Undelegations.vue       |  4 ++--
 src/scripts/apollo-refetch.js                  |  7 -------
 src/scripts/refetch-network-only.js            | 10 ++++++++++
 5 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 src/scripts/apollo-refetch.js
 create mode 100644 src/scripts/refetch-network-only.js

diff --git a/src/components/common/TmBalance.vue b/src/components/common/TmBalance.vue
index 9f244320de..18863e8f8b 100644
--- a/src/components/common/TmBalance.vue
+++ b/src/components/common/TmBalance.vue
@@ -42,7 +42,7 @@
 </template>
 <script>
 import { shortDecimals } from "scripts/num"
-import refetch from "scripts/apollo-refetch"
+import refetchNetworkOnly from "scripts/refetch-network-only"
 import { noBlanks } from "src/filters"
 import TmBtn from "common/TmBtn"
 import SendModal from "src/ActionModal/components/SendModal"
@@ -145,7 +145,7 @@ export default {
         query: UserTransactionAdded,
         result() {
           // query if successful or not as even an unsuccessful tx costs fees
-          refetch(this.$apollo.query.overview)
+          refetchNetworkOnly(this.$apollo.query.overview)
         }
       }
     }
diff --git a/src/components/staking/DelegationsOverview.vue b/src/components/staking/DelegationsOverview.vue
index 6d862e4e9e..98c2fb6f7f 100644
--- a/src/components/staking/DelegationsOverview.vue
+++ b/src/components/staking/DelegationsOverview.vue
@@ -28,7 +28,7 @@ import { mapGetters } from "vuex"
 import TmDataMsg from "common/TmDataMsg"
 import TableValidators from "staking/TableValidators"
 import { DelegationsForDelegator, UserTransactionAdded } from "src/gql"
-import refetch from "scripts/apollo-refetch"
+import refetchNetworkOnly from "scripts/refetch-network-only"
 
 export default {
   name: `delegations-overview`,
@@ -73,7 +73,7 @@ export default {
         query: UserTransactionAdded,
         result({ data }) {
           if (data.userTransactionAdded.success) {
-            refetch(this.$apollo.query.delegations)
+            refetchNetworkOnly(this.$apollo.query.delegations)
           }
         }
       }
diff --git a/src/components/staking/Undelegations.vue b/src/components/staking/Undelegations.vue
index 82444a311a..baadcc9b13 100644
--- a/src/components/staking/Undelegations.vue
+++ b/src/components/staking/Undelegations.vue
@@ -10,7 +10,7 @@
 <script>
 import { mapGetters } from "vuex"
 import TableUndelegations from "staking/TableUndelegations"
-import refetch from "scripts/apollo-refetch"
+import refetchNetworkOnly from "scripts/refetch-network-only"
 import { UndelegationsForDelegator, UserTransactionAdded } from "src/gql"
 
 export default {
@@ -52,7 +52,7 @@ export default {
         query: UserTransactionAdded,
         result({ data }) {
           if (data.userTransactionAdded.success) {
-            refetch(this.$apollo.query.undelegations)
+            refetchNetworkOnly(this.$apollo.query.undelegations)
           }
         }
       }
diff --git a/src/scripts/apollo-refetch.js b/src/scripts/apollo-refetch.js
deleted file mode 100644
index 2a65e50ffb..0000000000
--- a/src/scripts/apollo-refetch.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// when refetching always force to load from the network
-export default (apolloQuery) => {
-    apolloQuery.setOptions({
-        fetchPolicy: "network-only"
-    })
-    apolloQuery.refetch()
-}
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"
+  })
+}