From bf97bfea04c1fbfb2b59f4db14288a8c9297cf42 Mon Sep 17 00:00:00 2001 From: Fabian Date: Sat, 6 Apr 2019 22:53:02 +0200 Subject: [PATCH 1/4] fixed issues --- app/src/renderer/components/wallet/SendModal.vue | 1 + app/src/renderer/vuex/modules/governance/parameters.js | 4 ++++ app/src/renderer/vuex/modules/parameters.js | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/app/src/renderer/components/wallet/SendModal.vue b/app/src/renderer/components/wallet/SendModal.vue index 3e97ef89c3..f2bbd761d2 100644 --- a/app/src/renderer/components/wallet/SendModal.vue +++ b/app/src/renderer/components/wallet/SendModal.vue @@ -5,6 +5,7 @@ :submit-fn="submitForm" :simulate-fn="simulateForm" :validate="validateForm" + :amount="amount" title="Send" submission-error-prefix="Sending tokens failed" @close="clear" diff --git a/app/src/renderer/vuex/modules/governance/parameters.js b/app/src/renderer/vuex/modules/governance/parameters.js index 77be2b7e02..a14633d046 100644 --- a/app/src/renderer/vuex/modules/governance/parameters.js +++ b/app/src/renderer/vuex/modules/governance/parameters.js @@ -20,6 +20,10 @@ export default ({ node }) => { } const actions = { + initalizeWallet({ dispatch }) { + // needed for deposit denom for governance + dispatch(`getGovParameters`) + }, async getGovParameters({ state, commit, rootState }) { state.loading = true diff --git a/app/src/renderer/vuex/modules/parameters.js b/app/src/renderer/vuex/modules/parameters.js index f3b9c8a679..9b3221900d 100644 --- a/app/src/renderer/vuex/modules/parameters.js +++ b/app/src/renderer/vuex/modules/parameters.js @@ -16,6 +16,10 @@ export default ({ node }) => { } const actions = { + initalizeWallet({ dispatch }) { + // needed for bond denom for gas calculation + dispatch(`getStakingParameters`) + }, async getStakingParameters({ state, commit, rootState }) { state.loading = true From 32e61a29f7c6a1038d632c6b7b60b45467d2ea4f Mon Sep 17 00:00:00 2001 From: Fabian Date: Sat, 6 Apr 2019 22:53:02 +0200 Subject: [PATCH 2/4] fixed issues --- app/src/renderer/components/wallet/SendModal.vue | 1 + app/src/renderer/vuex/modules/governance/parameters.js | 4 ++++ app/src/renderer/vuex/modules/parameters.js | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/app/src/renderer/components/wallet/SendModal.vue b/app/src/renderer/components/wallet/SendModal.vue index 3e97ef89c3..f2bbd761d2 100644 --- a/app/src/renderer/components/wallet/SendModal.vue +++ b/app/src/renderer/components/wallet/SendModal.vue @@ -5,6 +5,7 @@ :submit-fn="submitForm" :simulate-fn="simulateForm" :validate="validateForm" + :amount="amount" title="Send" submission-error-prefix="Sending tokens failed" @close="clear" diff --git a/app/src/renderer/vuex/modules/governance/parameters.js b/app/src/renderer/vuex/modules/governance/parameters.js index 77be2b7e02..be2ab7385b 100644 --- a/app/src/renderer/vuex/modules/governance/parameters.js +++ b/app/src/renderer/vuex/modules/governance/parameters.js @@ -20,6 +20,10 @@ export default ({ node }) => { } const actions = { + initializeWallet({ dispatch }) { + // needed for deposit denom for governance + dispatch(`getGovParameters`) + }, async getGovParameters({ state, commit, rootState }) { state.loading = true diff --git a/app/src/renderer/vuex/modules/parameters.js b/app/src/renderer/vuex/modules/parameters.js index f3b9c8a679..f23b82521f 100644 --- a/app/src/renderer/vuex/modules/parameters.js +++ b/app/src/renderer/vuex/modules/parameters.js @@ -16,6 +16,10 @@ export default ({ node }) => { } const actions = { + initializeWallet({ dispatch }) { + // needed for bond denom for gas calculation + dispatch(`getStakingParameters`) + }, async getStakingParameters({ state, commit, rootState }) { state.loading = true From ad43820712941dd05a93822d42eb011a3eef3225 Mon Sep 17 00:00:00 2001 From: Fabian Date: Mon, 8 Apr 2019 13:53:13 +0200 Subject: [PATCH 3/4] added tests --- app/src/renderer/vuex/modules/governance/parameters.js | 2 +- app/src/renderer/vuex/modules/parameters.js | 2 +- test/unit/specs/store/governance/parameters.spec.js | 7 +++++++ test/unit/specs/store/parameters.spec.js | 7 +++++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/src/renderer/vuex/modules/governance/parameters.js b/app/src/renderer/vuex/modules/governance/parameters.js index be2ab7385b..3b06862333 100644 --- a/app/src/renderer/vuex/modules/governance/parameters.js +++ b/app/src/renderer/vuex/modules/governance/parameters.js @@ -20,7 +20,7 @@ export default ({ node }) => { } const actions = { - initializeWallet({ dispatch }) { + signIn({ dispatch }) { // needed for deposit denom for governance dispatch(`getGovParameters`) }, diff --git a/app/src/renderer/vuex/modules/parameters.js b/app/src/renderer/vuex/modules/parameters.js index f23b82521f..6f2d10bca8 100644 --- a/app/src/renderer/vuex/modules/parameters.js +++ b/app/src/renderer/vuex/modules/parameters.js @@ -16,7 +16,7 @@ export default ({ node }) => { } const actions = { - initializeWallet({ dispatch }) { + signIn({ dispatch }) { // needed for bond denom for gas calculation dispatch(`getStakingParameters`) }, diff --git a/test/unit/specs/store/governance/parameters.spec.js b/test/unit/specs/store/governance/parameters.spec.js index 478b6485b5..204b8a960d 100644 --- a/test/unit/specs/store/governance/parameters.spec.js +++ b/test/unit/specs/store/governance/parameters.spec.js @@ -39,6 +39,13 @@ describe(`Module: Governance Parameters`, () => { ]) }) + it(`fetches all governance parameters on sign in`, async () => { + const { actions } = module + const dispatch = jest.fn() + await actions.signIn({ dispatch }) + expect(dispatch).toHaveBeenCalledWith(`getGovParameters`) + }) + it(`should store an error if failed to load governance deposit parameters`, async () => { node.getGovDepositParameters = () => Promise.reject(new Error(`Error`)) const { actions, state } = module diff --git a/test/unit/specs/store/parameters.spec.js b/test/unit/specs/store/parameters.spec.js index 24c8dbcf7d..e9b8770d31 100644 --- a/test/unit/specs/store/parameters.spec.js +++ b/test/unit/specs/store/parameters.spec.js @@ -31,6 +31,13 @@ describe(`Module: Staking Parameters`, () => { ]) }) + it(`fetches all staking parameters on sign in`, async () => { + const { actions } = module + const dispatch = jest.fn() + await actions.signIn({ dispatch }) + expect(dispatch).toHaveBeenCalledWith(`getStakingParameters`) + }) + it(`should add staking parameters to state`, () => { const { mutations, state } = module mutations.setStakingParameters(state, stakingParameters.parameters) From 84cf554aaba81b6249022169e00498fabd3d0258 Mon Sep 17 00:00:00 2001 From: Fabian Date: Mon, 8 Apr 2019 14:02:08 +0200 Subject: [PATCH 4/4] snaps --- .../wallet/__snapshots__/SendModal.spec.js.snap | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/test/unit/specs/components/wallet/__snapshots__/SendModal.spec.js.snap b/test/unit/specs/components/wallet/__snapshots__/SendModal.spec.js.snap index ecfc4d2462..70bf008238 100644 --- a/test/unit/specs/components/wallet/__snapshots__/SendModal.spec.js.snap +++ b/test/unit/specs/components/wallet/__snapshots__/SendModal.spec.js.snap @@ -2,7 +2,6 @@ exports[`SendModal should display send modal form 1`] = `