From 94f4577a09c9581da0e52bf1afcb95b35263dc20 Mon Sep 17 00:00:00 2001 From: koderholic <22542946+koderholic@users.noreply.github.com> Date: Wed, 30 Nov 2022 22:49:07 +0100 Subject: [PATCH] fix: report error iff users want to - add a copy error button - errors get report if analytics is enabled or or if reportExperiment is turned on else they are sent to state --- .env | 4 +- src/components/CopyError.vue | 69 ++++++++++++++++++++++++++ src/components/OperationErrorModal.vue | 40 +++++++++++---- src/locales/cb/common.json | 1 + src/locales/cb/pages.json | 4 +- src/locales/en/common.json | 1 + src/locales/en/pages.json | 4 +- src/locales/es/common.json | 1 + src/locales/es/pages.json | 4 +- src/locales/ph/common.json | 1 + src/locales/ph/pages.json | 4 +- src/locales/pt/common.json | 1 + src/locales/pt/pages.json | 4 +- src/locales/zh/common.json | 1 + src/locales/zh/pages.json | 4 +- src/swaps/views/Timeline.vue | 14 +++++- src/views/Experiments.vue | 14 ++++++ src/views/Send/Send.vue | 4 +- src/views/Send/SendNFT.vue | 4 +- src/views/Swap/Swap.vue | 6 +-- 20 files changed, 158 insertions(+), 27 deletions(-) create mode 100644 src/components/CopyError.vue diff --git a/.env b/.env index 739f65730..928b4d049 100644 --- a/.env +++ b/.env @@ -20,5 +20,5 @@ VUE_APP_FIREBASE_MESSAGING_SENDER_ID= VUE_APP_FIREBASE_APP_ID= VUE_APP_FIREBASE_MEASUREMENT_ID= VUE_APP_FIREBASE_DATABASE_URL= -VUE_APP_REPORT_TARGETS=Discord -VUE_APP_DISCORD_WEBHOOK=https://discord.com/api/webhooks/1034115035603161188/sO2KOyAJakks1e9_Ae-OQFSMRb8rsgl-sZ93HRDGWRWFqNJwhDhGEDJl_SfxwgkxcQHU +VUE_APP_MAX_ERROR_LOG_SIZE=100 +VUE_APP_REPORT_TARGETS= diff --git a/src/components/CopyError.vue b/src/components/CopyError.vue new file mode 100644 index 000000000..01ef535ac --- /dev/null +++ b/src/components/CopyError.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/components/OperationErrorModal.vue b/src/components/OperationErrorModal.vue index 088669877..332ccb720 100644 --- a/src/components/OperationErrorModal.vue +++ b/src/components/OperationErrorModal.vue @@ -17,18 +17,22 @@
  • {{ $t('components.operationErrorModal.instructions4') }}

    • - {{ error }} + {{ translatedError }}

    -

    - {{ error }} -

    +

    {{ translatedError }}

    @@ -36,11 +40,13 @@ - + diff --git a/src/locales/cb/common.json b/src/locales/cb/common.json index ba777c525..be3babf5e 100644 --- a/src/locales/cb/common.json +++ b/src/locales/cb/common.json @@ -56,6 +56,7 @@ "transactionFee": "Transaction Fee", "copied": "Gikopya!", "copyAddress": "Kopyaha ang Address", + "copyError": "Copy Error", "clickToCopy": "I-klick para copyahon", "viewInExplorer": "Tan-awa sa Explorer", "noItems": "Walay items", diff --git a/src/locales/cb/pages.json b/src/locales/cb/pages.json index b6a87a427..34657522d 100644 --- a/src/locales/cb/pages.json +++ b/src/locales/cb/pages.json @@ -81,7 +81,9 @@ "experiments": { "experiments": "Experiments", "multiaccounts": "Multi-Accounts", - "multiaccountsDescription": "Tugoti ang pagdumala sa account ug daghang mga account matag network" + "multiaccountsDescription": "Tugoti ang pagdumala sa account ug daghang mga account matag network", + "errorReporting": "Error Reporting", + "errorReportingDescription": "Allow auto reporting of errors to support" }, "manageAssets": { "assetView": "Asset View", diff --git a/src/locales/en/common.json b/src/locales/en/common.json index 2e83dc000..100731d19 100644 --- a/src/locales/en/common.json +++ b/src/locales/en/common.json @@ -56,6 +56,7 @@ "transactionFee": "Transaction Fee", "copied": "Copied!", "copyAddress": "Copy Address", + "copyError": "Copy Error", "clickToCopy": "Click to copy", "viewInExplorer": "View in Explorer", "noItems": "No items", diff --git a/src/locales/en/pages.json b/src/locales/en/pages.json index 02912bc98..4891e37b8 100644 --- a/src/locales/en/pages.json +++ b/src/locales/en/pages.json @@ -81,7 +81,9 @@ "experiments": { "experiments": "Experiments", "multiaccounts": "Multi-Accounts", - "multiaccountsDescription": "Allow account management and multiple accounts per network" + "multiaccountsDescription": "Allow account management and multiple accounts per network", + "errorReporting": "Error Reporting", + "errorReportingDescription": "Allow auto reporting of errors to support" }, "manageAssets": { "assetView": "Asset View", diff --git a/src/locales/es/common.json b/src/locales/es/common.json index 78d799528..9674afe2f 100644 --- a/src/locales/es/common.json +++ b/src/locales/es/common.json @@ -56,6 +56,7 @@ "transactionFee": "Comisión de Transacción", "copied": "¡Copiado!", "copyAddress": "Copiar Dirección", + "copyError": "Copy Error", "clickToCopy": "Click para copiar", "viewInExplorer": "Ver en el Explorador", "noItems": "Sin items", diff --git a/src/locales/es/pages.json b/src/locales/es/pages.json index e566a697a..5a67f9023 100644 --- a/src/locales/es/pages.json +++ b/src/locales/es/pages.json @@ -81,7 +81,9 @@ "experiments": { "experiments": "Experimentos", "multiaccounts": "Multi-Accounts", - "multiaccountsDescription": "Permite gestionar cuentas y tener múltiples cuentas por red" + "multiaccountsDescription": "Permite gestionar cuentas y tener múltiples cuentas por red", + "errorReporting": "Error Reporting", + "errorReportingDescription": "Allow auto reporting of errors to support" }, "manageAssets": { "assetView": "Vista de Activos", diff --git a/src/locales/ph/common.json b/src/locales/ph/common.json index b52268739..ce56191b7 100644 --- a/src/locales/ph/common.json +++ b/src/locales/ph/common.json @@ -56,6 +56,7 @@ "transactionFee": "Transaction Fee", "copied": "Kinopya!", "copyAddress": "Kopyahin ang Address", + "copyError": "Copy Error", "clickToCopy": "Click to copy", "viewInExplorer": "Tingnan sa Explorer", "noItems": "No items", diff --git a/src/locales/ph/pages.json b/src/locales/ph/pages.json index 6894ff0e8..1c855a4fd 100644 --- a/src/locales/ph/pages.json +++ b/src/locales/ph/pages.json @@ -81,7 +81,9 @@ "experiments": { "experiments": "Mga eksperimento", "multiaccounts": "Mga Multi-Account", - "multiaccountsDescription": "Payagan ang pamamahala ng account at maraming account sa bawat network" + "multiaccountsDescription": "Payagan ang pamamahala ng account at maraming account sa bawat network", + "errorReporting": "Error Reporting", + "errorReportingDescription": "Allow auto reporting of errors to support" }, "manageAssets": { "assetView": "Mga Assets", diff --git a/src/locales/pt/common.json b/src/locales/pt/common.json index 9d1dcaf3a..fe8defc33 100644 --- a/src/locales/pt/common.json +++ b/src/locales/pt/common.json @@ -56,6 +56,7 @@ "transactionFee": "Taxas da Transação", "copied": "Copiado!", "copyAddress": "Copiar Endereço", + "copyError": "Copy Error", "clickToCopy": "Clique para copiar", "viewInExplorer": "Veja no Explorador", "noItems": "Sem Itens", diff --git a/src/locales/pt/pages.json b/src/locales/pt/pages.json index 6ba69ce67..ab6a64725 100644 --- a/src/locales/pt/pages.json +++ b/src/locales/pt/pages.json @@ -81,7 +81,9 @@ "experiments": { "experiments": "Experimental", "multiaccounts": "Multi-Accounts", - "multiaccountsDescription": "Permite a gestão de contas e múltiplas contas em cada rede" + "multiaccountsDescription": "Permite a gestão de contas e múltiplas contas em cada rede", + "errorReporting": "Error Reporting", + "errorReportingDescription": "Allow auto reporting of errors to support" }, "manageAssets": { "assetView": "Visão de Ativos", diff --git a/src/locales/zh/common.json b/src/locales/zh/common.json index fdd12bd1c..8bccc64ba 100644 --- a/src/locales/zh/common.json +++ b/src/locales/zh/common.json @@ -56,6 +56,7 @@ "transactionFee": "交易费用", "copied": "已复制", "copyAddress": "复制地址", + "copyError": "Copy Error", "clickToCopy": "点击复制", "viewInExplorer": "在浏览器查看", "noItems": "No items", diff --git a/src/locales/zh/pages.json b/src/locales/zh/pages.json index 88d20a00c..d9a373747 100644 --- a/src/locales/zh/pages.json +++ b/src/locales/zh/pages.json @@ -81,7 +81,9 @@ "experiments": { "experiments": "实验功能", "multiaccounts": "Multi-Accounts", - "multiaccountsDescription": "开启账户管理和多账户模式" + "multiaccountsDescription": "开启账户管理和多账户模式", + "errorReporting": "Error Reporting", + "errorReportingDescription": "Allow auto reporting of errors to support" }, "manageAssets": { "assetView": "查看资产", diff --git a/src/swaps/views/Timeline.vue b/src/swaps/views/Timeline.vue index f44638c85..3c68a3394 100644 --- a/src/swaps/views/Timeline.vue +++ b/src/swaps/views/Timeline.vue @@ -293,7 +293,12 @@ Error - 
    {{ $tle(item.error) }}
    + 
    {{ translatedItemError }} 
+                
+
    @@ -338,13 +343,15 @@ import { getSwapProvider } from '@liquality/wallet-core/dist/src/factory' import { calculateQuoteRate } from '@liquality/wallet-core/dist/src/utils/quotes' import { shortenAddress } from '@liquality/wallet-core/dist/src/utils/address' import { isObject } from 'lodash-es' +import CopyError from '../../components/CopyError.vue' export default { components: { SpinnerIcon, CopyIcon, ChevronDownIcon, - ChevronRightIcon + ChevronRightIcon, + CopyError }, data() { return { @@ -366,6 +373,9 @@ export default { (item) => item.id === this.id ) }, + translatedItemError() { + return this.$tle(this.item.error) + }, reverseRate() { return BN(1).div(calculateQuoteRate(this.item)).dp(8) }, diff --git a/src/views/Experiments.vue b/src/views/Experiments.vue index b949dc931..d0eba63a8 100644 --- a/src/views/Experiments.vue +++ b/src/views/Experiments.vue @@ -28,6 +28,20 @@ @change="toggleExperiment({ name: 'manageAccounts' })" /> +
    + {{ $t('pages.experiments.errorReporting') }} + + {{ $t('pages.experiments.errorReportingDescription') }} + +
    +
    + +
    diff --git a/src/views/Send/Send.vue b/src/views/Send/Send.vue index b34cd0ef9..358c599cb 100644 --- a/src/views/Send/Send.vue +++ b/src/views/Send/Send.vue @@ -242,7 +242,7 @@ :open="sendErrorModalOpen" :account="account" @close="closeSendErrorModal" - :error="sendErrorMessage" + :liqualityErrorString="sendErrorMessage" /> @@ -609,7 +609,7 @@ export default { reportLiqualityError(error) this.loading = false this.signRequestModalOpen = false - this.sendErrorMessage = this.$tle(errorToLiqualityErrorString(error)) + this.sendErrorMessage = errorToLiqualityErrorString(error) this.sendErrorModalOpen = true } }, diff --git a/src/views/Send/SendNFT.vue b/src/views/Send/SendNFT.vue index 69b9c6e96..5c61dc562 100644 --- a/src/views/Send/SendNFT.vue +++ b/src/views/Send/SendNFT.vue @@ -282,7 +282,7 @@ :open="sendErrorModalOpen" :account="account" @close="closeSendErrorModal" - :error="sendErrorMessage" + :liqualityErrorString="sendErrorMessage" /> @@ -651,7 +651,7 @@ export default { this.$router.replace(`/wallet/nfts/activity/${this.account?.id}?tab=activity`) } catch (error) { this.loading = false - this.sendErrorMessage = this.$tle(errorToLiqualityErrorString(error)) + this.sendErrorMessage = errorToLiqualityErrorString(error) this.sendErrorModalOpen = true } }, diff --git a/src/views/Swap/Swap.vue b/src/views/Swap/Swap.vue index b84b23119..cfdcb56ee 100644 --- a/src/views/Swap/Swap.vue +++ b/src/views/Swap/Swap.vue @@ -211,7 +211,7 @@ class="btn btn-primary btn-lg" id="swap_review_button" @click="review" - :disabled="!canSwap || cannotCoverNetworkFee" + :disabled="false" > {{ !canSwap || cannotCoverNetworkFee @@ -486,7 +486,7 @@ :open="swapErrorModalOpen" :account="account" @close="closeSwapErrorModal" - :error="swapErrorMessage" + :liqualityErrorString="swapErrorMessage" /> @@ -1397,7 +1397,7 @@ export default { reportLiqualityError(error) this.loading = false this.signRequestModalOpen = false - this.swapErrorMessage = this.$tle(errorToLiqualityErrorString(error)) + this.swapErrorMessage = errorToLiqualityErrorString(error) this.swapErrorModalOpen = true } },