{{ notifyMessage.body }}
@@ -294,6 +290,7 @@ import { between, requiredIf } from "vuelidate/lib/validators"
import { track } from "scripts/google-analytics"
import { UserTransactionAdded } from "src/gql"
import config from "src/../config"
+import * as Sentry from "@sentry/browser"
import ActionManager from "../utils/ActionManager"
@@ -469,6 +466,22 @@ export default {
},
prettyIncludedHeight() {
return prettyInt(this.includedHeight)
+ },
+ // TODO lets slice this monstrocity
+ context() {
+ return {
+ url: this.network.api_url,
+ networkId: this.network.id,
+ chainId: this.network.chain_id,
+ connected: this.connected,
+ userAddress: this.session.address,
+ rewards: this.rewards,
+ totalRewards: this.overview.totalRewards,
+ delegations: this.delegations,
+ bondDenom: this.network.stakingDenom,
+ isExtensionAccount: this.isExtensionAccount,
+ account: this.overview.accountInformation
+ }
}
},
watch: {
@@ -480,15 +493,18 @@ export default {
this.selectedSignMethod = signMethods[0].value
}
}
+ },
+ context: {
+ immediate: true,
+ handler(context) {
+ this.actionManager.setContext(context)
+ }
}
},
created() {
this.$apollo.skipAll = true
},
updated: function() {
- // TODO do we need to set the context on every update of the component?
- const context = this.createContext()
- this.actionManager.setContext(context)
if (
(this.title === "Withdraw" || this.step === "fees") &&
this.$refs.next
@@ -497,21 +513,6 @@ export default {
}
},
methods: {
- createContext() {
- return {
- url: this.network.api_url, // state.connection.externals.node.url,
- networkId: this.network.id, // state.connection.lastHeader.chain_id,
- chainId: this.network.chain_id, // state.connection.lastHeader.chain_id,
- connected: this.connected,
- userAddress: this.session.address,
- rewards: this.rewards, // state.distribution.rewards,
- totalRewards: this.overview.totalRewards, // getters.totalRewards,
- delegations: this.delegations, // state.delegates.delegates,
- bondDenom: this.network.stakingDenom, // getters.bondDenom,
- isExtensionAccount: this.isExtensionAccount,
- account: this.overview.accountInformation
- }
- },
confirmModalOpen() {
let confirmResult = false
if (this.session.currrentModalOpen) {
@@ -618,7 +619,7 @@ export default {
this.gasEstimate = await this.actionManager.simulate(memo)
} else {
this.gasEstimate = await this.actionManager.simulateTxAPI(
- this.createContext(),
+ this.context,
type,
properties,
memo
@@ -656,8 +657,9 @@ export default {
if (!this.useTxService) {
hashResult = await this.actionManager.send(memo, feeProperties)
} else {
+ await this.$apollo.queries.overview.refetch()
hashResult = await this.actionManager.sendTxAPI(
- this.createContext(),
+ this.context,
type,
memo,
properties,
@@ -668,8 +670,8 @@ export default {
const { hash } = hashResult
this.txHash = hash
this.step = inclusionStep
- } catch ({ message }) {
- this.onSendingFailed(message)
+ } catch (error) {
+ this.onSendingFailed(error)
}
},
onTxIncluded() {
@@ -683,10 +685,17 @@ export default {
this.$emit(`txIncluded`)
this.$apollo.queries.overview.refetch()
},
- onSendingFailed(message) {
+ onSendingFailed(error) {
+ Sentry.withScope(scope => {
+ scope.setExtra("signMethod", this.selectedSignMethod)
+ scope.setExtra("transactionData", this.transactionData)
+ scope.setExtra("gasEstimate", this.gasEstimate)
+ scope.setExtra("gasPrice", this.gasPrice)
+ Sentry.captureException(error)
+ })
this.step = signStep
- this.submissionError = `${this.submissionErrorPrefix}: ${message}.`
- this.trackEvent(`event`, `failed-submit`, this.title, message)
+ this.submissionError = `${this.submissionErrorPrefix}: ${error.message}.`
+ this.trackEvent(`event`, `failed-submit`, this.title, error.message)
this.$apollo.queries.overview.refetch()
},
async connectLedger() {
@@ -842,7 +851,7 @@ export default {
this.onTxIncluded()
} else {
/* istanbul ignore next */
- this.onSendingFailed(log)
+ this.onSendingFailed(new Error(log))
}
}
this.txHash = null
diff --git a/src/ActionModal/utils/ActionManager.js b/src/ActionModal/utils/ActionManager.js
index b31926890e..65bb1d870a 100644
--- a/src/ActionModal/utils/ActionManager.js
+++ b/src/ActionModal/utils/ActionManager.js
@@ -200,7 +200,7 @@ export default class ActionManager {
if (result.success) {
return { hash: result.hash }
} else {
- throw Error("Broadcast was not successfull: " + result.error)
+ throw Error("Broadcast was not successful: " + result.error)
}
}
diff --git a/tests/unit/specs/components/ActionModal/components/ActionModal.spec.js b/tests/unit/specs/components/ActionModal/components/ActionModal.spec.js
index e62bdb380e..9f1c4d48f2 100644
--- a/tests/unit/specs/components/ActionModal/components/ActionModal.spec.js
+++ b/tests/unit/specs/components/ActionModal/components/ActionModal.spec.js
@@ -15,6 +15,11 @@ let mockSend = jest.fn(() => ({
}))
let mockSetContext = jest.fn()
+jest.mock("src/../config.js", () => ({
+ default_gas_price: 2.5e-8,
+ graphqlHost: "http://localhost:4000"
+}))
+
jest.mock(`src/ActionModal/utils/ActionManager.js`, () => {
return jest.fn(() => {
return {
@@ -28,6 +33,11 @@ jest.mock(`src/ActionModal/utils/ActionManager.js`, () => {
})
})
+// TODO move into global mock to not duplicate everywhere
+jest.mock("@sentry/browser", () => ({
+ withScope: () => {}
+}))
+
describe(`ActionModal`, () => {
let wrapper, $store, $apollo
@@ -132,7 +142,12 @@ describe(`ActionModal`, () => {
},
stubs: ["router-link"]
})
- wrapper.setData({ network, overview })
+ const context = {
+ account: {
+ sequence: 0
+ }
+ }
+ wrapper.setData({ network, overview, context })
wrapper.vm.open()
})
@@ -167,10 +182,10 @@ describe(`ActionModal`, () => {
}
await ActionModal.methods.submit.call(self)
expect(self.onSendingFailed).toHaveBeenCalledWith(
- "some kind of error message"
+ new Error("some kind of error message")
)
- ActionModal.methods.onSendingFailed.call(self, "some kind of error message")
+ ActionModal.methods.onSendingFailed.call(self, new Error("some kind of error message"))
expect(self.submissionError).toEqual(`PREFIX: some kind of error message.`)
})
@@ -618,7 +633,12 @@ describe(`ActionModal`, () => {
isValidInput: jest.fn(() => true),
selectedSignMethod: `local`,
step: `details`,
- validateChangeStep: jest.fn(() => {})
+ validateChangeStep: jest.fn(() => {}),
+ context: {
+ account: {
+ sequence: 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 e21ca4f2f3..f3de3fc2b1 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
@@ -34,7 +34,9 @@ exports[`ActionModal back button renders and functions 1`] = `
- Send
+
+ Send
+
-
-
-
-