TornadoCash/classic-ui-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into audit

Browse Source
This commit is contained in:
Danil Kovtonyuk 2022-06-15 16:37:28 +10:00
commit 1e3ea14f69
No known key found for this signature in database
GPG Key ID: E72A919BF08C3746
35 changed files with 305 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
components/Deposit.vue
View File

@ -1,14 +1,20 @@
<template>
<b-tab-item :label="$t('deposit')">
<b-tab-item :label="$t('deposit')" header-class="button_tab_deposit">
<fieldset>
<b-field :label="$t('token')">
<b-field :label="$t('token')" data-test="token_list_dropdown">
<b-dropdown v-model="selectedToken" expanded aria-role="list">
<div slot="trigger" class="control">
<div class="input">
<span>{{ selectedCurrency }}</span>
</div>
</div>
<b-dropdown-item v-for="(token, key) in tokens" :key="key" aria-role="listitem" :value="key">
<b-dropdown-item
v-for="(token, key) in tokens"
:key="key"
aria-role="listitem"
:value="key"
:data-test="token.dataTest"
>
{{ token.symbol }}
</b-dropdown-item>
</b-dropdown>
@ -18,7 +24,7 @@
{{ $t('amount') }}
<b-tooltip :label="$t('amountTooltip')" size="is-small" position="is-right" multilined>
<button class="button is-primary has-icon">
<span class="icon icon-info"></span>
<span class="icon icon-info" data-test="choose_amount_info"></span>
</button>
</b-tooltip>
</template>
@ -30,13 +36,24 @@
@input="changeAmount"
>
<template v-for="({ amount, address }, key) in amounts">
<b-step-item :key="key" :label="shortenAmount(amount)" :clickable="address !== ''"></b-step-item>
<b-step-item
:key="key"
:label="shortenAmount(amount)"
:clickable="address !== ''"
:header-class="`token-${selectedToken}-${amount}`"
></b-step-item>
</template>
</b-steps>
</b-field>
</fieldset>
<connect-button v-if="!isLoggedIn" type="is-primary is-fullwidth" />
<b-button v-else type="is-primary is-fullwidth" :loading="isDepositBtnClicked" @click="onDeposit">
<connect-button v-if="!isLoggedIn" type="is-primary is-fullwidth" data-test="button_connect" />
<b-button
v-else
type="is-primary is-fullwidth"
:loading="isDepositBtnClicked"
data-test="button_deposit"
@click="onDeposit"
>
{{ $t('depositButton') }}
</b-button>
</b-tab-item>
@ -79,7 +96,14 @@ export default {
}
},
tokens() {
return this.networkConfig.tokens
return Object.keys(this.networkConfig.tokens).reduce((acc, curr) => {
const item = this.networkConfig.tokens[curr]
acc[curr] = {
...item,
dataTest: `token_list_${item.symbol.toLowerCase()}`
}
return acc
}, {})
},
selectedToken: {
get() {

5
components/DepositModalBox.vue
View File

@ -46,7 +46,9 @@
</i18n>
</b-checkbox>
<template v-if="!isSetupAccount || !isEncrypted">
<b-checkbox v-model="isBackuped">{{ $t('iBackedUpTheNote') }}</b-checkbox>
<b-checkbox v-model="isBackuped" data-test="backup_note_checkbox">{{
$t('iBackedUpTheNote')
}}</b-checkbox>
<div v-if="isBackuped && isIPFS" class="notice is-warning">
<div class="notice__p">{{ $t('yourNoteWontBeSaved') }}</div>
</div>
@ -56,6 +58,7 @@
v-else
type="is-primary is-fullwidth"
:disabled="disableButton || (!isValidGasPrice && !eipSupported)"
data-test="send_deposit_button"
@click="_sendDeposit"
>
{{ $t('sendDeposit') }}

10
components/EncryptedTx.vue
View File

@ -31,6 +31,7 @@
<div class="details">
<p class="detail">
<a
data-test="txhash_text"
class="detail-description"
:href="txExplorerUrl(tx.txHash)"
target="_blank"
@ -47,6 +48,7 @@
<b-tooltip :active="activeCopyTooltip" :label="tooltipCopy" position="is-left" multilined>
<b-button
type="is-primary hide-icon-desktop"
data-test="decrypt_note_button"
size="is-small"
icon-left="decrypt"
:disabled="disableCopyButton"
@ -55,7 +57,13 @@
{{ $t('decrypt') }}
</b-button>
</b-tooltip>
<b-button type="is-dark" size="is-small" icon-right="remove" @click="onClose" />
<b-button
type="is-dark"
data-test="remove_note_button"
size="is-small"
icon-right="remove"
@click="onClose"
/>
</div>
</div>
</div>

1
components/Job.vue
View File

@ -15,6 +15,7 @@
<div v-else class="details">
<p class="detail">
<a
data-test="txhash_text"
class="detail-description"
:href="txExplorerUrl(job.txHash)"
target="_blank"

2
components/Loaders/Loader.vue
View File

@ -1,7 +1,7 @@
<template>
<b-loading v-model="enabled">
<div class="loading-container">
<div class="loading-tornado"></div>
<div class="loading-tornado" data-test="tornado_loader"></div>
<div class="loading-message">{{ message }}...</div>
<approve-loader v-if="isApprove" />
</div>

19
components/Navbar.vue
View File

@ -1,7 +1,7 @@
<template>
<b-navbar wrapper-class="container" class="header">
<template slot="brand">
<b-navbar-item tag="router-link" to="/" active-class="">
<b-navbar-item tag="router-link" to="/" data-test="tornado_main_page" active-class="">
<Logo />
</b-navbar-item>
</template>
@ -10,17 +10,19 @@
v-if="isEnabledGovernance"
tag="router-link"
to="/governance"
data-test="voting_link"
:active="$route.path.includes('governance')"
class="has-tag"
>
{{ $t('governance') }} <span v-if="hasActiveProposals" class="navbar-item--tag"></span>
</b-navbar-item>
<b-navbar-item tag="router-link" to="/compliance">
<b-navbar-item tag="router-link" to="/compliance" data-test="compliance_link">
{{ $t('compliance') }}
</b-navbar-item>
<b-navbar-item
href="https://docs.tornado.cash"
target="_blank"
data-test="docs_link"
rel="noopener noreferrer"
class="has-tag"
>
@ -32,9 +34,16 @@
<b-navbar-item tag="div">
<div class="buttons">
<network-navbar-icon />
<metamask-navbar-icon />
<indicator />
<b-button icon-left="settings" type="is-primary" outlined @mousedown.prevent @click="onAccount">
<metamask-navbar-icon data-test="metamask_connection_state" />
<indicator data-test="note_account_connection_state" />
<b-button
icon-left="settings"
type="is-primary"
outlined
data-test="button_settings"
@mousedown.prevent
@click="onAccount"
>
{{ $t('settings') }}
</b-button>
</div>

4
components/NetworkModal.vue
View File

@ -6,10 +6,11 @@
</header>
<div class="networks">
<div
v-for="{ name, chainId } in networks"
v-for="{ name, chainId, dataTest } in networks"
:key="chainId"
class="item"
:class="{ 'is-active': chainId === netId }"
:data-test="dataTest"
@click="setNetwork(chainId)"
>
<b-icon class="network-icon" :icon="`${name}`.replace(/\)?\s\(?/g, '-').toLowerCase()" />
@ -39,6 +40,7 @@ export default {
return Object.keys(this.networkConfig).map((key) => {
return {
name: this.networkConfig[key].networkName,
dataTest: `${this.networkConfig[key].networkName.split(' ').join('_')}__network`,
chainId: Number(key.replace('netId', ''))
}
})

4
components/NetworkNavbarIcon.vue
View File

@ -1,5 +1,7 @@
<template>
<b-button :icon-left="iconName" class="network-button" @click="onClick">{{ shortNetworkName }}</b-button>
<b-button :icon-left="iconName" class="network-button" data-test="button_network" @click="onClick">{{
shortNetworkName
}}</b-button>
</template>
<script>

8
components/Notices.vue
View File

@ -26,7 +26,13 @@
>
Tornado Cash Nova
</a>
<a v-if="notice.txHash" :href="txExplorerUrl(notice.txHash)" target="_blank" rel="noopener noreferrer">
<a
v-if="notice.txHash"
:href="txExplorerUrl(notice.txHash)"
target="_blank"
data-test="popup_message"
rel="noopener noreferrer"
>
{{ $t('viewOnEtherscan') }}
</a>
<n-link v-else-if="notice.routerLink" v-bind="notice.routerLink.params" @onClick="$forceUpdate()">

14
components/Settings.vue
View File

@ -5,7 +5,7 @@
<button type="button" class="delete" @click="$parent.cancel('escape')" />
</header>
<div class="field">
<b-field :label="$t('rpc')" class="has-custom-field">
<b-field :label="$t('rpc')" class="has-custom-field" data-test="rpc_endpoint_dropdown">
<b-dropdown v-model="selectedRpc" expanded aria-role="list">
<div slot="trigger" class="control" :class="{ 'is-loading': checkingRpc && !isCustomRpc }">
<div class="input">
@ -17,11 +17,17 @@
:key="name"
:value="name"
aria-role="listitem"
:data-test="`rpc_endpoint_${name}`"
@click="checkRpc({ name, url })"
>
{{ name }}
</b-dropdown-item>
<b-dropdown-item value="custom" aria-role="listitem" @click="checkRpc({ name: 'custom' })">
<b-dropdown-item
value="custom"
aria-role="listitem"
data-test="rpc_endpoint_custom"
@click="checkRpc({ name: 'custom' })"
>
{{ $t('customRpc') }}
</b-dropdown-item>
</b-dropdown>
@ -42,10 +48,10 @@
</p>
</div>
<div class="buttons buttons__halfwidth">
<b-button type="is-primary" outlined @mousedown.prevent @click="onReset">
<b-button type="is-primary" outlined data-test="button_reset_rpc" @mousedown.prevent @click="onReset">
{{ $t('reset') }}
</b-button>
<b-button type="is-primary" :disabled="isDisabledSave" @click="onSave">
<b-button type="is-primary" :disabled="isDisabledSave" data-test="save_rpc_button" @click="onSave">
{{ $t('save') }}
</b-button>
</div>

10
components/Tx.vue
View File

@ -24,6 +24,7 @@
<p class="detail">
<a
class="detail-description"
data-test="txhash_text"
:href="txExplorerUrl(tx.txHash)"
target="_blank"
rel="noopener noreferrer"
@ -44,11 +45,18 @@
size="is-small"
:disabled="!tx.note"
icon-left="copy"
data-test="copy_note_button"
>
{{ $t('note') }}
</b-button>
</b-tooltip>
<b-button type="is-dark" size="is-small" icon-right="remove" @click="onClose" />
<b-button
data-test="remove_note_button"
type="is-dark"
size="is-small"
icon-right="remove"
@click="onClose"
/>
</div>
</div>
</div>

1
components/governance/Metrics.vue
View File

@ -35,6 +35,7 @@
type="is-text"
:icon-left="isDataLoading ? '' : 'settings'"
:loading="isDataLoading"
data-test="button_manage_torn"
@click.native="onManage"
>
{{ $t('manage') }}

2
components/governance/manage/ManageBox.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="modal-card box box-modal has-delete">
<button type="button" class="delete" @click="$emit('close')" />
<b-tabs v-model="activeTab" :animated="false" class="is-modal">
<b-tabs v-model="activeTab" :data-test="`tab_${activeTab}`" :animated="false" class="is-modal">
<LockTab />
<UnlockTab />
<DelegateTab />

2
components/governance/manage/tabs/DelegateTab.vue
View File

@ -1,5 +1,5 @@
<template>
<b-tab-item :label="$t('delegate')">
<b-tab-item :label="$t('delegate')" header-class="delegate_tab">
<div class="p">
{{ $t('delegateTabDesc') }}
</div>

23
components/governance/manage/tabs/LockTab.vue
View File

@ -1,5 +1,5 @@
<template>
<b-tab-item :label="$t('lock')">
<b-tab-item :label="$t('lock')" header-class="lock_torn_tab">
<div class="p">
{{ $t('lockTabDesc') }}
</div>
@ -7,6 +7,7 @@
<b-field :class="hasErrorAmount ? 'is-warning' : ''">
<b-input
v-model="computedAmountToLock"
data-test="input_torn_amount_to_lock"
step="0.01"
:min="minAmount"
:max="maxAmountToLock"
@ -18,6 +19,7 @@
<div class="control has-button">
<button
class="button is-primary is-small is-outlined"
data-test="button_max_torn_amount_to_lock"
@mousedown.prevent
@click="setMaxAmountToLock"
>
@ -27,13 +29,26 @@
</b-field>
</b-field>
<div class="label-with-value">
{{ $t('availableBalance') }}: <span><number-format :value="maxAmountToLock" /> TORN</span>
{{ $t('availableBalance') }}:
<span><number-format data-test="info_available_balance" :value="maxAmountToLock" /> TORN</span>
</div>
<div class="buttons buttons__halfwidth">
<b-button type="is-primary is-fullwidth" outlined :disabled="disabledApprove" @click="onApprove">
<b-button
type="is-primary is-fullwidth"
outlined
data-test="button_approve_torn"
:disabled="disabledApprove"
@click="onApprove"
>
{{ $t('approve') }}
</b-button>
<b-button type="is-primary is-fullwidth" outlined :disabled="disabledLock" @click="onLock">
<b-button
type="is-primary is-fullwidth"
outlined
data-test="button_lock_torn"
:disabled="disabledLock"
@click="onLock"
>
{{ $t('lock') }}
</b-button>
</div>

15
components/governance/manage/tabs/UnlockTab.vue
View File

@ -1,5 +1,5 @@
<template>
<b-tab-item :label="$t('unlock')">
<b-tab-item :label="$t('unlock')" header-class="unlock_torn_tab">
<div class="p">
{{ $t('unlockTabDesc') }}
</div>
@ -7,6 +7,7 @@
<b-field :class="hasErrorAmount ? 'is-warning' : ''">
<b-input
v-model="computedAmountToUnlock"
data-test="input_torn_amount_to_unlock"
step="0.01"
:min="minAmount"
:max="maxAmountToUnlock"
@ -18,6 +19,7 @@
<div class="control has-button">
<button
class="button is-primary is-small is-outlined"
data-test="button_max_torn_amount_to_unlock"
@mousedown.prevent
@click="setMaxAmountToUnlock"
>
@ -27,7 +29,8 @@
</b-field>
</b-field>
<div class="label-with-value">
{{ $t('lockedBalance') }}: <span><number-format :value="maxAmountToUnlock" /> TORN</span>
{{ $t('lockedBalance') }}:
<span><number-format data-test="info_locked_balance" :value="maxAmountToUnlock" /> TORN</span>
</div>
<b-tooltip
class="is-block"
@ -36,7 +39,13 @@
:active="!hasLockedBalance || !canWithdraw"
multilined
>
<b-button :disabled="disableUnlock" type="is-primary is-fullwidth" outlined @click="onUnlock">
<b-button
:disabled="disableUnlock"
type="is-primary is-fullwidth"
outlined
data-test="button_unlock_torn"
@click="onUnlock"
>
{{ $t('unlock') }}
</b-button>
</b-tooltip>

14
components/settings/tabs/RelayerTab.vue
View File

@ -1,7 +1,7 @@
<template>
<b-tab-item :label="$t('relayer')" value="relayer">
<b-tab-item :label="$t('relayer')" value="relayer" header-class="withdrawal_settings_relayer_tab">
<div class="field">
<b-field :label="$t('relayer')">
<b-field :label="$t('relayer')" data-test="withdrawal_settings_relayer_dropdown">
<b-dropdown v-model="selectedRelayer" expanded aria-role="list" @change="onChangeRelayer">
<div slot="trigger" class="control" :class="{ 'is-loading': checkingRelayer || isLoadingRelayers }">
<div class="input">
@ -27,6 +27,7 @@
ref="customInput"
v-model="customRelayerUrl"
type="url"
data-test="enter_relayer_url_field"
:placeholder="$t('pasteYourRelayerUrlorEnsRecord')"
:custom-class="hasErrorRelayer.type"
:use-html5-validation="false"
@ -56,13 +57,20 @@
:service-fee="relayer.tornadoServiceFee"
/>
<div class="buttons buttons__halfwidth mt-5">
<b-button type="is-primary" outlined @mousedown.prevent @click="onReset">
<b-button
type="is-primary"
outlined
data-test="withdrawal_settings_reset_button"
@mousedown.prevent
@click="onReset"
>
{{ $t('reset') }}
</b-button>
<b-button
type="is-primary"
:disabled="isDisabledSave"
:loading="checkingRelayer || isLoadingRelayers"
data-test="withdrawal_settings_save_button"
@click="onSave"
>
{{ $t('save') }}

2
components/settings/tabs/WalletTab.vue
View File

@ -1,5 +1,5 @@
<template>
<b-tab-item :label="$t('wallet')" value="wallet">
<b-tab-item :label="$t('wallet')" value="wallet" header-class="withdrawal_settings_wallet_tab">
<fieldset :disabled="isNotLoggedIn">
<div class="notice is-warning">
<div class="notice__p">{{ $t('withdrawWalletWarning', { currency: networkCurrency }) }}</div>

9
components/web3Connect/Modal.vue
View File

@ -2,7 +2,7 @@
<div class="modal-card box box-modal is-wallet-modal">
<header class="box-modal-header is-spaced">
<div class="box-modal-title">{{ $t('yourWallet') }}</div>
<button type="button" class="delete" @click="$emit('close')" />
<button type="button" class="delete" data-test="close_popup_button" @click="$emit('close')" />
</header>
<div class="note">
{{ $t('pleaseSelectYourWeb3Wallet') }}
@ -22,11 +22,16 @@
<button
v-show="isMetamask"
class="button is-small is-background is-metamask"
data-test="choose_metamask_option"
@click="_web3Connect('metamask')"
>
Metamask
</button>
<button class="button is-small is-background is-walletConnect" @click="_web3Connect('walletConnect')">
<button
class="button is-small is-background is-walletConnect"
data-test="choose_wallet_option"
@click="_web3Connect('walletConnect')"
>
WalletConnect
</button>
</div>

23
components/withdraw/Withdraw.vue
View File

@ -1,10 +1,16 @@
<template>
<b-tab-item :label="$t('withdraw')">
<b-tab-item :label="$t('withdraw')" header-class="button_tab_withdraw">
<div class="field">
<div class="label-with-buttons">
<div class="label">
{{ $t('note') }}
<b-tooltip :label="$t('noteTooltip')" size="is-small" position="is-right" multilined>
<b-tooltip
:label="$t('noteTooltip')"
size="is-small"
position="is-right"
multilined
data-test="enter_note_info"
>
<button class="button is-primary has-icon">
<span class="icon icon-info"></span>
</button>
@ -26,7 +32,12 @@
<LinkIcon />
</b-tooltip>
</a>
<button v-show="shouldSettingsShow" class="button is-icon" @click="onSettings">
<button
v-show="shouldSettingsShow"
class="button is-icon"
data-test="withdrawal_settings_button"
@click="onSettings"
>
<b-tooltip :label="$t('withdrawalSettings')" size="is-small" position="is-right" multilined>
<SettingsIcon />
</b-tooltip>
@ -37,6 +48,7 @@
v-model="withdrawNote"
:placeholder="$t('pleaseEnterYourNote')"
:custom-class="hasErrorNote ? hasErrorNote.type : 'is-primary'"
data-test="enter_note_field"
></b-input>
<div v-if="hasErrorNote" class="help" :class="hasErrorNote.type">
<!-- eslint-disable vue/no-v-html -->
@ -46,7 +58,8 @@
<div v-if="!hasErrorNote && depositTxHash" class="field field-withdraw">
<div class="withdraw-data">
<div class="withdraw-data-item">
{{ $t('amount') }} <span>{{ selectedAmount }} {{ selectedStatisticCurrency }}</span>
{{ $t('amount') }}
<span data-test="note_tokens_amount">{{ selectedAmount }} {{ selectedStatisticCurrency }}</span>
</div>
<div class="withdraw-data-item">
{{ $t('timePassed') }}
@ -92,6 +105,7 @@
v-model="withdrawAddress"
:placeholder="$t('pleasePasteAddressHere')"
:size="!withdrawAddress ? '' : isValidAddress ? 'is-primary' : 'is-warning'"
data-test="recipient_address_field"
></b-input>
<p class="help">
<span class="has-text-warning">{{ error.type }}</span> {{ error.message }}
@ -120,6 +134,7 @@
:disabled="isWithdrawalButtonDisable"
:loading="isLoadingRelayers || isLoading"
@click="onWithdraw"
data-test="button_start_withdraw"
>
{{ $t('withdrawButton') }}
</b-button>

6
components/withdraw/WithdrawModalBox.vue
View File

@ -4,10 +4,10 @@
<div class="box-modal-title">{{ $t('withdrawalConfirmation') }}</div>
<button type="button" class="delete" @click="$emit('close')" />
</header>
<div class="note">
<div class="note" data-test="withdrawal_confirmation_text">
{{ message }}
</div>
<b-button type="is-primary is-fullwidth" @click="_sendWithdraw">
<b-button type="is-primary is-fullwidth" data-test="withdrawal_confirm_button" @click="_sendWithdraw">
{{ $t('confirm') }}
</b-button>
</div>
@ -57,7 +57,7 @@ export default {
deep: true
}
},
mounted() {
beforeCreate() {
this.$store.dispatch('loading/enable', { message: this.$t('generatingProof') })
},
methods: {

8
components/withdraw/WithdrawTotal.vue
View File

@ -17,15 +17,15 @@
</div>
<div v-if="withdrawType === 'relayer'" class="withdraw-data-item">
{{ $t('networkFee') }}
<span>{{ toDecimals(networkFee, null, 6) }} {{ networkCurrency }}</span>
<span data-test="label_network_fee">{{ toDecimals(networkFee, null, 6) }} {{ networkCurrency }}</span>
</div>
<div v-if="withdrawType === 'relayer'" class="withdraw-data-item">
{{ $t('relayerFee') }}
<span>{{ toDecimals(relayerFee, null, 6) }} {{ currency }}</span>
<span data-test="label_relayer_fee">{{ toDecimals(relayerFee, null, 6) }} {{ currency }}</span>
</div>
<div v-if="withdrawType === 'relayer'" class="withdraw-data-item">
{{ $t('totalFee') }}
<span>{{ toDecimals(totalRelayerFee, null, 6) }} {{ currency }}</span>
<span data-test="label_total_fee">{{ toDecimals(totalRelayerFee, null, 6) }} {{ currency }}</span>
</div>
<div v-if="isTokenSelected" class="withdraw-data-item">
{{ $t('ethPurchase', { currency: networkCurrency }) }}
@ -34,7 +34,7 @@
<hr v-if="withdrawType === 'relayer'" />
<div class="withdraw-data-item">
{{ $t('tokensToReceive') }}
<span>{{ total }} {{ currency }}</span>
<span data-test="label_tokens_to_receive">{{ total }} {{ currency }}</span>
</div>
<div v-if="isTokenSelected" class="withdraw-data-item">
<span class="is-alone">{{ ethToReceiveFromWei }} {{ networkCurrency }}</span>

21
modules/account/components/Control/Actions.vue
View File

@ -6,7 +6,13 @@
<div class="desc">
{{ $t(action.description) }}
</div>
<b-button type="is-primary" outlined @mousedown.prevent @click="action.onClick">
<b-button
type="is-primary"
outlined
:data-test="action.dataAttribute"
@mousedown.prevent
@click="action.onClick"
>
{{ $t(action.button) }}
</b-button>
</div>
@ -15,7 +21,9 @@
<div class="desc">
{{ $t('account.control.fileDesc') }}
</div>
<b-switch :value="isEnabledSaveFile" size="is-medium" @input="handleEnabledSaveFile" />
<div data-test="download_notes__config_switch">
<b-switch :value="isEnabledSaveFile" size="is-medium" @input="handleEnabledSaveFile" />
</div>
</div>
</div>
</template>
@ -36,19 +44,22 @@ export default {
icon: 'account-notes',
onClick: this.getEncryptedNotes,
button: 'account.control.loadAll',
description: 'account.control.loadAllDesc'
description: 'account.control.loadAllDesc',
dataAttribute: 'load_all_encrypted_notes_button'
},
{
icon: 'account-key',
onClick: this.openRecoverKeyModal,
button: 'account.control.showRecoveryKey',
description: 'account.control.showRecoveryKeyDesc'
description: 'account.control.showRecoveryKeyDesc',
dataAttribute: 'reveal_current_note_account'
},
{
icon: 'account-remove',
button: 'account.control.remove',
onClick: this.handleRemoveAccount,
description: 'account.control.removeDesc'
description: 'account.control.removeDesc',
dataAttribute: 'clear_account_info_button'
}
]
}

2
modules/account/components/Control/Header.vue
View File

@ -2,7 +2,7 @@
<div class="address">
<div class="address-item">
<div class="label">{{ $t('account.account') }}</div>
<div class="value">{{ accounts.encrypt }}</div>
<div class="value" data-test="note_account_address">{{ accounts.encrypt }}</div>
</div>
<div class="address-item">
<div class="label">{{ $t('account.backedUpWith') }}</div>

20
modules/account/components/Settings/Actions.vue
View File

@ -5,17 +5,31 @@
<div class="desc">
{{ isLoggedIn ? $t('account.wallet.disconnect') : $t('account.wallet.desc') }}
</div>
<b-button v-if="isLoggedIn" type="is-primary" outlined @mousedown.prevent @click="onLogOut">
<b-button
v-if="isLoggedIn"
type="is-primary"
outlined
data-test="button_disconnect_account"
@mousedown.prevent
@click="onLogOut"
>
{{ $t('account.wallet.logout') }}
</b-button>
<connect-button v-else outlined action-text="account.wallet.connectWeb3" />
<connect-button
v-else
outlined
action-text="account.wallet.connectWeb3"
data-test="button_connect_web3"
/>
</div>
<div class="action-item">
<b-icon icon="account-rpc" size="is-large" />
<div class="desc">
{{ $t('account.wallet.rpcDesc') }}
</div>
<b-button type="is-primary" outlined @click="onSettings">{{ $t('account.wallet.changeRpc') }}</b-button>
<b-button type="is-primary" data-test="button_change_rpc" outlined @click="onSettings">{{
$t('account.wallet.changeRpc')
}}</b-button>
</div>
</div>
</template>

30
modules/account/components/Setup/Actions.vue
View File

@ -6,9 +6,15 @@
{{ $t('account.setup.desc') }}
</div>
<b-tooltip :active="isAccountDisabled" :label="$t(setupAccountTooltip)" multilined size="is-large">
<b-button :disabled="isAccountDisabled" outlined type="is-primary" @click="showSetupModal">{{
$t('account.setup.account')
}}</b-button>
<b-button
:disabled="isAccountDisabled"
outlined
type="is-primary"
data-test="button_setup_account"
@click="showSetupModal"
>
{{ $t('account.setup.account') }}
</b-button>
</b-tooltip>
</div>
<div class="action-item">
@ -17,7 +23,13 @@
{{ $t('account.setup.recoverDesc') }}
</div>
<b-tooltip :active="isRecoverDisabled" :label="$t(recoverAccountTooltip)" multilined size="is-large">
<b-button type="is-primary" outlined :disabled="isRecoverDisabled" @click="handleRecoverAccount">
<b-button
type="is-primary"
outlined
:disabled="isRecoverDisabled"
data-test="button_recover_account"
@click="handleRecoverAccount"
>
{{ $t('account.setup.recover') }}
</b-button>
</b-tooltip>
@ -27,9 +39,13 @@
<div class="desc">
{{ $t('account.setup.enterRawDesc') }}
</div>
<b-button type="is-primary" outlined @click="showRecoverKeyModal">{{
$t('account.setup.enterRaw')
}}</b-button>
<b-button
type="is-primary"
outlined
data-test="button_enter_account_key"
@click="showRecoverKeyModal"
>{{ $t('account.setup.enterRaw') }}</b-button
>
</div>
</div>
</template>

2
modules/account/components/Setup/Header.vue
View File

@ -2,7 +2,7 @@
<div class="address">
<div class="address-item">
<div class="label">{{ $t('account.account') }}</div>
<div class="value">{{ accounts.backup }}</div>
<div class="value" data-test="note_account_address">{{ accounts.backup }}</div>
</div>
<div class="address-item">
<div class="label">{{ $t('account.backedUpWith') }}</div>

4
modules/account/modals/DecryptInfo.vue
View File

@ -22,10 +22,10 @@
</template>
</div>
<div class="buttons buttons__halfwidth mt-3">
<b-button type="is-primary" outlined @click="onClose">
<b-button type="is-primary" outlined data-test="button_close_your_note_popup" @click="onClose">
{{ $parent.$t('account.modals.decryptInfo.close') }}
</b-button>
<b-button type="is-primary" @click="handleRedirect">
<b-button type="is-primary" data-test="button_main_page_your_notes_popup" @click="handleRedirect">
{{ $parent.$t('account.modals.decryptInfo.redirect') }}
</b-button>
</div>

2
modules/account/modals/RecoverAccount.vue
View File

@ -14,6 +14,7 @@
class="is-disabled-resize"
rows="2"
:placeholder="$t('enterRecoveryKey')"
data-test="input_enter_recovery_key"
:class="{ 'is-warning': hasAndValidKey }"
@input="onInput"
></b-input>
@ -33,6 +34,7 @@
type="is-primary is-fullwidth"
:disabled="hasAndValidKey"
:loading="recoverAccountFromKeyRequest.isFetching"
data-test="button_connect_recovery_key"
@click="handleRecoverAccount"
>
{{ $t('account.modals.recoverAccount.connect') }}

1
modules/account/modals/SetupAccount.vue
View File

@ -44,6 +44,7 @@
<b-button
v-if="!isBackuped && isSaveOnChain"
type="is-primary is-fullwidth"
data-test="button_confirm_setup_account"
:loading="setupAccountRequest.isFetching"
@click="onSetupAccount"
>

4
networkConfig.js
View File

@ -361,8 +361,8 @@ export default {
echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
rpcUrls: {
publicRpc: {
name: 'xDAI Chain RPC',
url: 'https://rpc.xdaichain.com/tornado'
name: 'Gnosis Chain RPC',
url: 'https://rpc.gnosischain.com/tornado'
}
},
tokens: {

2
package.json
View File

@ -24,7 +24,7 @@
"@metamask/onboarding": "^1.0.0",
"@nuxtjs/moment": "^1.6.0",
"@ticket721/e712": "^0.4.1",
"@walletconnect/web3-provider": "1.7.7",
"@walletconnect/web3-provider": "1.7.8",
"ajv": "^6.10.2",
"arraybuffer-loader": "^1.0.8",
"base-path-converter": "^1.0.2",

3
pages/compliance.vue
View File

@ -13,6 +13,7 @@
<div class="label">{{ $t('note') }}</div>
<b-input
v-model="withdrawNote"
data-test="input_enter_note_for_compliance"
:placeholder="$t('pleaseEnterYourNote')"
:custom-class="error ? error.type : 'is-primary'"
></b-input>
@ -44,6 +45,7 @@
</h3>
<div
class="block-item block-item--status"
data-test="note_status_info"
:class="{
'is-success': txDepositInfo.txHash
}"
@ -120,6 +122,7 @@
</h3>
<div
class="block-item block-item--status"
data-test="info_withdrawal_status"
:class="{
'is-warning': !txDepositInfo.isSpent,
'is-success': txWithdrawalInfo.txHash

2
store/metamask.js
View File

@ -553,7 +553,7 @@ const actions = {
},
100: {
chainId: '0x64',
chainName: 'Gnosis Chain (formerly xDai)',
chainName: 'Gnosis',
rpcUrls: ['https://rpc.gnosischain.com'],
nativeCurrency: {
name: 'xDAI',

126
yarn.lock
View File

@ -2494,35 +2494,35 @@
dom-event-types "^1.0.0"
lodash "^4.17.4"
"@walletconnect/browser-utils@^1.7.7":
version "1.7.7"
resolved "https://registry.yarnpkg.com/@walletconnect/browser-utils/-/browser-utils-1.7.7.tgz#4ae0db1ddf49be179ea556af842db3b7afce973d"
integrity sha512-6Mt7DSPaG0FKnHhuVzkU1hgtsCpGvl2nfbfRytLpyDY05iWMzMg5uK1DzV+0k4hCt9pVli0JVNt6dh9a6Xm94w==
"@walletconnect/browser-utils@^1.7.8":
version "1.7.8"
resolved "https://registry.yarnpkg.com/@walletconnect/browser-utils/-/browser-utils-1.7.8.tgz#c9e27f69d838442d69ccf53cb38ffc3c554baee2"
integrity sha512-iCL0XCWOZaABIc0lqA79Vyaybr3z26nt8mxiwvfrG8oaKUf5Y21Of4dj+wIXQ4Hhblre6SgDlU0Ffb39+1THOw==
dependencies:
"@walletconnect/safe-json" "1.0.0"
"@walletconnect/types" "^1.7.7"
"@walletconnect/types" "^1.7.8"
"@walletconnect/window-getters" "1.0.0"
"@walletconnect/window-metadata" "1.0.0"
detect-browser "5.2.0"
"@walletconnect/client@^1.7.7":
version "1.7.7"
resolved "https://registry.yarnpkg.com/@walletconnect/client/-/client-1.7.7.tgz#4570475b0aeed05e53b0c7b01a352a895c0b455b"
integrity sha512-UuDkpXDc1Emx09aGXKz2Fg8omNp5J8ZRgNblnQTb8xnoQ8rgOJSyhbFR37PFIFwVpriZZDAgmy8HlqoGwLQ2ug==
"@walletconnect/client@^1.7.8":
version "1.7.8"
resolved "https://registry.yarnpkg.com/@walletconnect/client/-/client-1.7.8.tgz#62c2d7114e59495d90772ea8033831ceb29c6a78"
integrity sha512-pBroM6jZAaUM0SoXJZg5U7aPTiU3ljQAw3Xh/i2pxFDeN/oPKao7husZ5rdxS5xuGSV6YpqqRb0RxW1IeoR2Pg==
dependencies:
"@walletconnect/core" "^1.7.7"
"@walletconnect/iso-crypto" "^1.7.7"
"@walletconnect/types" "^1.7.7"
"@walletconnect/utils" "^1.7.7"
"@walletconnect/core" "^1.7.8"
"@walletconnect/iso-crypto" "^1.7.8"
"@walletconnect/types" "^1.7.8"
"@walletconnect/utils" "^1.7.8"
"@walletconnect/core@^1.7.7":
version "1.7.7"
resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-1.7.7.tgz#71d0c71beda8d10c636a4eae8e81e3b7ecefbe86"
integrity sha512-XsF2x4JcBS1V2Nk/Uh38dU7ZlLmW/R5oxHp4+tVgCwTID6nZlo3vUSHBOqM7jgDRblKOHixANollm0r94bM8Cg==
"@walletconnect/core@^1.7.8":
version "1.7.8"
resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-1.7.8.tgz#97c52ea7d00126863cd37bf19bd3e87d4f30de1e"
integrity sha512-9xcQ0YNf9JUFb0YOX1Mpy4Yojt+6w2yQz/0aIEyj2X/s9D71NW0fTYsMcdhkLOI7mn2cqVbx2t1lRvdgqsbrSQ==
dependencies:
"@walletconnect/socket-transport" "^1.7.7"
"@walletconnect/types" "^1.7.7"
"@walletconnect/utils" "^1.7.7"
"@walletconnect/socket-transport" "^1.7.8"
"@walletconnect/types" "^1.7.8"
"@walletconnect/utils" "^1.7.8"
"@walletconnect/crypto@^1.0.2":
version "1.0.2"
@ -2548,24 +2548,24 @@
resolved "https://registry.yarnpkg.com/@walletconnect/environment/-/environment-1.0.0.tgz#c4545869fa9c389ec88c364e1a5f8178e8ab5034"
integrity sha512-4BwqyWy6KpSvkocSaV7WR3BlZfrxLbJSLkg+j7Gl6pTDE+U55lLhJvQaMuDVazXYxcjBsG09k7UlH7cGiUI5vQ==
"@walletconnect/http-connection@^1.7.7":
version "1.7.7"
resolved "https://registry.yarnpkg.com/@walletconnect/http-connection/-/http-connection-1.7.7.tgz#77bcce7c4c067e1e745da1a1c6174ff0daa76018"
integrity sha512-MmhVJfBjvjYcZnrJYnDx4VBwpYM6yh7eX4/8szo6sGwzG4E+8V4YBKU2NF6fA6YXpdAyEYayElqXhB0YBEZFJA==
"@walletconnect/http-connection@^1.7.8":
version "1.7.8"
resolved "https://registry.yarnpkg.com/@walletconnect/http-connection/-/http-connection-1.7.8.tgz#98bcc726c29751ddc791ff151742aa712bf679a7"
integrity sha512-31gjBw46MRU9hFMTNXAqh+f8qpDNzVeV9BJehzVWKiNC3ciL1JCZkbvsY0djwajduE6TB2ujaML0XDXS9HgBRA==
dependencies:
"@walletconnect/types" "^1.7.7"
"@walletconnect/utils" "^1.7.7"
"@walletconnect/types" "^1.7.8"
"@walletconnect/utils" "^1.7.8"
eventemitter3 "4.0.7"
xhr2-cookies "1.1.0"
"@walletconnect/iso-crypto@^1.7.7":
version "1.7.7"
resolved "https://registry.yarnpkg.com/@walletconnect/iso-crypto/-/iso-crypto-1.7.7.tgz#a7f703f9c2a05aafe5b8cced8941c7732701e579"
integrity sha512-t8RKJZkFtFyWMFrl0jPz/3RAGhM5yext+MLFq3L/KTPxLgMZuT1yFHRUiV7cAN3+LcCmk6Sy/rV1yQPTiB158Q==
"@walletconnect/iso-crypto@^1.7.8":
version "1.7.8"
resolved "https://registry.yarnpkg.com/@walletconnect/iso-crypto/-/iso-crypto-1.7.8.tgz#41f09326d129faa09beae213e78614c19d90bbd6"
integrity sha512-Qo6qDcMG0Ac+9fpWE0h/oE55NHLk6eM2vlXpWlQDN/me7RZGrkvk+LXsAkQ3UiYPEiPfq4eswcyRWC9AcrAscg==
dependencies:
"@walletconnect/crypto" "^1.0.2"
"@walletconnect/types" "^1.7.7"
"@walletconnect/utils" "^1.7.7"
"@walletconnect/types" "^1.7.8"
"@walletconnect/utils" "^1.7.8"
"@walletconnect/jsonrpc-types@^1.0.0":
version "1.0.0"
@ -2587,14 +2587,14 @@
resolved "https://registry.yarnpkg.com/@walletconnect/mobile-registry/-/mobile-registry-1.4.0.tgz#502cf8ab87330841d794819081e748ebdef7aee5"
integrity sha512-ZtKRio4uCZ1JUF7LIdecmZt7FOLnX72RPSY7aUVu7mj7CSfxDwUn6gBuK6WGtH+NZCldBqDl5DenI5fFSvkKYw==
"@walletconnect/qrcode-modal@^1.7.7":
version "1.7.7"
resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.7.7.tgz#a7567370bf915a50fb8edc99f6ceb70ce9be2bfc"
integrity sha512-HRzw6g4P8/C4ClJYJShaGfdvjfrTfkXv+eb+IylWGWvC8IQhuiSXCq5+F3t0CXxuZs3ir26abgviEMRFQxGKdA==
"@walletconnect/qrcode-modal@^1.7.8":
version "1.7.8"
resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.7.8.tgz#52b3d15922f3e371ddc92fd0f49f93ff40241365"
integrity sha512-LqNJMLWO+ljvoRSdq8tcEslW0imKrrb+ugs3bw4w/jEI1FSJzVeinEsgVpyaMv8wsUcyTcSCXSkXpT1SXHtcpw==
dependencies:
"@walletconnect/browser-utils" "^1.7.7"
"@walletconnect/browser-utils" "^1.7.8"
"@walletconnect/mobile-registry" "^1.4.0"
"@walletconnect/types" "^1.7.7"
"@walletconnect/types" "^1.7.8"
copy-to-clipboard "^3.3.1"
preact "10.4.1"
qrcode "1.4.4"
@ -2613,43 +2613,43 @@
resolved "https://registry.yarnpkg.com/@walletconnect/safe-json/-/safe-json-1.0.0.tgz#12eeb11d43795199c045fafde97e3c91646683b2"
integrity sha512-QJzp/S/86sUAgWY6eh5MKYmSfZaRpIlmCJdi5uG4DJlKkZrHEF7ye7gA+VtbVzvTtpM/gRwO2plQuiooIeXjfg==
"@walletconnect/socket-transport@^1.7.7":
version "1.7.7"
resolved "https://registry.yarnpkg.com/@walletconnect/socket-transport/-/socket-transport-1.7.7.tgz#2cf68b95c4c10f257189370d2456d99c9c206a0f"
integrity sha512-RxeFkT+5BqdaZzPtPYIw6+KSVh6Q1NaYqTiAzWWh9RPuvuTajIEsi+fUXizfkpmyi9UTYBvdFXnKcB+eSImpDg==
"@walletconnect/socket-transport@^1.7.8":
version "1.7.8"
resolved "https://registry.yarnpkg.com/@walletconnect/socket-transport/-/socket-transport-1.7.8.tgz#a4ef50d8054293991dbfde7f9c66788030182ec3"
integrity sha512-bqEjLxfSzG79v2OT7XVOZoyUkg6g3yng0fURrdLusWs42fYHWnrSrIZDejFn8N5PiZk5R2edrggkQ7w0VUUAfw==
dependencies:
"@walletconnect/types" "^1.7.7"
"@walletconnect/utils" "^1.7.7"
"@walletconnect/types" "^1.7.8"
"@walletconnect/utils" "^1.7.8"
ws "7.5.3"
"@walletconnect/types@^1.7.7":
version "1.7.7"
resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.7.7.tgz#71c623b36a93e373370b1772e82fea2d801adf54"
integrity sha512-yXJrLxwLLCXtWgd/e8FjfY9v5DKds12Z7EEPzUrPSq6v7WtXpqate577KwlFQ6UYzioQzIEDE8+98j+0aiZbsw==
"@walletconnect/types@^1.7.8":
version "1.7.8"
resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.7.8.tgz#ec397e6fbdc8147bccc17029edfeb41c50a5ca09"
integrity sha512-0oSZhKIrtXRJVP1jQ0EDTRtotQY6kggGjDcmm/LLQBKnOZXdPeo0sPkV/7DjT5plT3O7Cjc6JvuXt9WOY0hlCA==
"@walletconnect/utils@^1.7.7":
version "1.7.7"
resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-1.7.7.tgz#684522fa20ccf9ec2944f0497ca70254cb6d4729"
integrity sha512-slNlnROS4DEusGFx53hshIBylYhzd5JtGF+AJpza+Tc616+u8ozjQ9aKKUaV85bucnv5Q42bTwLYrYrXiydmuw==
"@walletconnect/utils@^1.7.8":
version "1.7.8"
resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-1.7.8.tgz#f94572bca5eb6b5f81daf8a35268f249f9c6b1ec"
integrity sha512-DSpfH6Do0TQmdrgzu+SyjVhupVjN0WEMvNWGK9K4VlSmLFpCWfme7qxzrvuxBZ47gDqs1kGWvjyJmviWqvOnAg==
dependencies:
"@walletconnect/browser-utils" "^1.7.7"
"@walletconnect/browser-utils" "^1.7.8"
"@walletconnect/encoding" "^1.0.1"
"@walletconnect/jsonrpc-utils" "^1.0.0"
"@walletconnect/types" "^1.7.7"
"@walletconnect/types" "^1.7.8"
bn.js "4.11.8"
js-sha3 "0.8.0"
query-string "6.13.5"
"@walletconnect/web3-provider@1.7.7":
version "1.7.7"
resolved "https://registry.yarnpkg.com/@walletconnect/web3-provider/-/web3-provider-1.7.7.tgz#3d2f8d7a0fcdc118615283978c6a7c9f2a852b71"
integrity sha512-hUhDyaMu93e7e82OVCu3KnYOn6m6wQO9YObbhi3PexppCANe/Y9eDrw/37S+7jbjLIx5nS1et2JU+taKR7OSOw==
"@walletconnect/web3-provider@1.7.8":
version "1.7.8"
resolved "https://registry.yarnpkg.com/@walletconnect/web3-provider/-/web3-provider-1.7.8.tgz#fe9b66a4010ee831db664a3fe5014d67a758a1fc"
integrity sha512-2VxGo7KPfQTWRJ+rygt3ok/u04InkVE+H9LBIF/RMUwcwyGf2nsP3CcYZVcg3yYpacgN7bAZCersCEYwU8AeeA==
dependencies:
"@walletconnect/client" "^1.7.7"
"@walletconnect/http-connection" "^1.7.7"
"@walletconnect/qrcode-modal" "^1.7.7"
"@walletconnect/types" "^1.7.7"
"@walletconnect/utils" "^1.7.7"
"@walletconnect/client" "^1.7.8"
"@walletconnect/http-connection" "^1.7.8"
"@walletconnect/qrcode-modal" "^1.7.8"
"@walletconnect/types" "^1.7.8"
"@walletconnect/utils" "^1.7.8"
web3-provider-engine "16.0.1"
"@walletconnect/window-getters@1.0.0", "@walletconnect/window-getters@^1.0.0":