@@ -31,12 +30,17 @@
+
+
@@ -53,7 +57,6 @@ import {
initWallet,
waitForCore,
} from '@soramitsu/soraneo-wallet-web';
-import { isTMA } from '@tma.js/sdk';
import debounce from 'lodash/debounce';
import { Component, Mixins, Watch } from 'vue-property-decorator';
@@ -63,13 +66,15 @@ import AppHeader from '@/components/App/Header/AppHeader.vue';
import AppMenu from '@/components/App/Menu/AppMenu.vue';
import NodeErrorMixin from '@/components/mixins/NodeErrorMixin';
import SoraLogo from '@/components/shared/Logo/Sora.vue';
-import { PageNames, Components, Language, BreakpointClass, WalletPermissions } from '@/consts';
+import { PageNames, Components, Language, WalletPermissions, LOCAL_STORAGE_LIMIT_PERCENTAGE } from '@/consts';
+import { BreakpointClass } from '@/consts/layout';
import { getLocale } from '@/lang';
import router, { goTo, lazyComponent } from '@/router';
import { action, getter, mutation, state } from '@/store/decorators';
import { getMobileCssClasses, preloadFontFace, updateDocumentTitle } from '@/utils';
import type { NodesConnection } from '@/utils/connection';
-import { TmaSdk } from '@/utils/telegram';
+import { calculateStorageUsagePercentage, clearLocalStorage } from '@/utils/storage';
+import { tmaSdkService } from '@/utils/telegram';
import type { FeatureFlags } from './store/settings/types';
import type { EthBridgeSettings, SubNetworkApps } from './store/web3/types';
@@ -91,6 +96,7 @@ import type Theme from '@soramitsu-ui/ui-vue2/lib/types/Theme';
AppDisclaimer: lazyComponent(Components.AppDisclaimer),
AppBrowserNotifsEnableDialog: lazyComponent(Components.AppBrowserNotifsEnableDialog),
AppBrowserNotifsBlockedDialog: lazyComponent(Components.AppBrowserNotifsBlockedDialog),
+ AppBrowserNotifsLocalStorageOverride: lazyComponent(Components.AppBrowserNotifsLocalStorageOverride),
ReferralsConfirmInviteUser: lazyComponent(Components.ReferralsConfirmInviteUser),
BridgeTransferNotification: lazyComponent(Components.BridgeTransferNotification),
SelectSoraAccountDialog: lazyComponent(Components.SelectSoraAccountDialog),
@@ -104,14 +110,15 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
menuVisibility = false;
showConfirmInviteUser = false;
showNotifsDarkPage = false;
+ showErrorLocalStorageExceed = false;
@state.settings.screenBreakpointClass private responsiveClass!: BreakpointClass;
@state.settings.appConnection private appConnection!: NodesConnection;
@state.settings.browserNotifPopupVisibility private browserNotifPopup!: boolean;
@state.settings.browserNotifPopupBlockedVisibility private browserNotifPopupBlocked!: boolean;
+ @state.wallet.account.assetsToNotifyQueue private assetsToNotifyQueue!: Array
;
+ @state.referrals.storageReferrer private storageReferrer!: string;
@state.referrals.referrer private referrer!: string;
- @state.referrals.storageReferrer storageReferrer!: string;
- @state.wallet.account.assetsToNotifyQueue assetsToNotifyQueue!: Array;
@state.settings.disclaimerVisibility disclaimerVisibility!: boolean;
@state.router.loading pageLoading!: boolean;
@@ -156,10 +163,6 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
@state.wallet.transactions.isSignTxDialogVisible public isSignTxDialogVisible!: boolean;
@mutation.wallet.transactions.setSignTxDialogVisibility public setSignTxDialogVisibility!: (flag: boolean) => void;
- // [DESKTOP] To Enable Desktop
- @mutation.wallet.account.setIsDesktop private setIsDesktop!: (v: boolean) => void;
- // [TMA] To Enable TMA
- @mutation.settings.enableTMA private enableTMA!: FnWithoutArgs;
@Watch('assetsToNotifyQueue')
private handleNotifyOnDeposit(whitelistAssetArray: WhitelistArrayItem[]): void {
@@ -219,8 +222,19 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
private setResponsiveClassDebounced = debounce(this.setResponsiveClass, 250);
+ public clearLocalStorage(): void {
+ clearLocalStorage();
+ }
+
+ private handleLocalStorageChange() {
+ const usagePercentage = calculateStorageUsagePercentage();
+ if (usagePercentage >= LOCAL_STORAGE_LIMIT_PERCENTAGE) {
+ this.showErrorLocalStorageExceed = true;
+ }
+ }
+
async created() {
- // element-icons is not common used, but should be visible after network connection lost
+ window.addEventListener('localStorageUpdated', this.handleLocalStorageChange);
preloadFontFace('element-icons');
this.setResponsiveClass();
updateBaseUrl(router);
@@ -236,11 +250,7 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
}
// To start running as Telegram Web App (desktop capabilities)
- if (await isTMA()) {
- this.enableTMA();
- this.setIsDesktop(true);
- await TmaSdk.init(data?.TG_BOT_URL, data.NETWORK_TYPE === WALLET_CONSTS.SoraNetwork.Dev);
- }
+ tmaSdkService.init(data?.TG_BOT_URL);
await this.setApiKeys(data?.API_KEYS);
await this.setEthBridgeSettings(data.ETH_BRIDGE);
@@ -281,10 +291,6 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
return getMobileCssClasses();
}
- get isAboutPage(): boolean {
- return this.$route.name === PageNames.About;
- }
-
get dsProviderClasses(): string[] | BreakpointClass {
return this.mobileCssClasses?.length ? [...this.mobileCssClasses, this.responsiveClass] : this.responsiveClass;
}
@@ -314,12 +320,17 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
this.setBrowserNotifsPopupBlocked(value);
}
- getApi() {
+ get chainApi() {
return api;
}
goTo(name: PageNames): void {
- goTo(name);
+ if (name === PageNames.Rewards) {
+ // Rewards is a menu route but we need to show PointSystem by default
+ goTo(PageNames.PointSystem);
+ } else {
+ goTo(name);
+ }
this.closeMenu();
}
@@ -365,7 +376,9 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
}
async beforeDestroy(): Promise {
+ window.removeEventListener('localStorageUpdated', this.handleLocalStorageChange);
window.removeEventListener('resize', this.setResponsiveClassDebounced);
+ tmaSdkService.destroy();
await this.resetInternalSubscriptions();
await this.resetNetworkSubscriptions();
this.resetBlockNumberSubscription();
@@ -421,7 +434,7 @@ ul ul {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-family: 'Sora', sans-serif;
- height: 100vh;
+ height: 100dvh;
color: var(--s-color-base-content-primary);
background-color: var(--s-color-utility-body);
transition: background-color 500ms linear;
@@ -614,7 +627,7 @@ i.icon-divider {
&-main {
display: flex;
align-items: stretch;
- height: calc(100vh - #{$header-height} - #{$footer-height});
+ height: calc(100dvh - #{$header-height} - #{$footer-height});
position: relative;
}
@@ -624,9 +637,6 @@ i.icon-divider {
flex: 1;
flex-flow: column nowrap;
max-width: 100%;
- &__about {
- overflow: hidden;
- }
}
&-content {
diff --git a/src/abi/ethereum/internal/MASTER.json b/src/abi/ethereum/internal/MASTER.json
index ed2b5af6c..3a79fc419 100644
--- a/src/abi/ethereum/internal/MASTER.json
+++ b/src/abi/ethereum/internal/MASTER.json
@@ -1,54 +1,52 @@
-{
- "abi": [
- {
- "constant": false,
- "inputs": [
- {
- "internalType": "address",
- "name": "tokenAddress",
- "type": "address"
- },
- {
- "internalType": "uint256",
- "name": "amount",
- "type": "uint256"
- },
- {
- "internalType": "address",
- "name": "beneficiary",
- "type": "address"
- },
- {
- "internalType": "bytes32",
- "name": "txHash",
- "type": "bytes32"
- },
- {
- "internalType": "uint8[]",
- "name": "v",
- "type": "uint8[]"
- },
- {
- "internalType": "bytes32[]",
- "name": "r",
- "type": "bytes32[]"
- },
- {
- "internalType": "bytes32[]",
- "name": "s",
- "type": "bytes32[]"
- },
- {
- "internalType": "address",
- "name": "from",
- "type": "address"
- }
- ],
- "name": "mintTokensByPeers",
- "outputs": [],
- "payable": false,
- "stateMutability": "nonpayable",
- "type": "function"
- }
- ]
-}
+[
+ {
+ "constant": false,
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "tokenAddress",
+ "type": "address"
+ },
+ {
+ "internalType": "uint256",
+ "name": "amount",
+ "type": "uint256"
+ },
+ {
+ "internalType": "address",
+ "name": "beneficiary",
+ "type": "address"
+ },
+ {
+ "internalType": "bytes32",
+ "name": "txHash",
+ "type": "bytes32"
+ },
+ {
+ "internalType": "uint8[]",
+ "name": "v",
+ "type": "uint8[]"
+ },
+ {
+ "internalType": "bytes32[]",
+ "name": "r",
+ "type": "bytes32[]"
+ },
+ {
+ "internalType": "bytes32[]",
+ "name": "s",
+ "type": "bytes32[]"
+ },
+ {
+ "internalType": "address",
+ "name": "from",
+ "type": "address"
+ }
+ ],
+ "name": "mintTokensByPeers",
+ "outputs": [],
+ "payable": false,
+ "stateMutability": "nonpayable",
+ "type": "function"
+ }
+]
diff --git a/src/abi/ethereum/other/BRIDGE.json b/src/abi/ethereum/other/BRIDGE.json
index 9b7d6a609..94de998c5 100644
--- a/src/abi/ethereum/other/BRIDGE.json
+++ b/src/abi/ethereum/other/BRIDGE.json
@@ -1,155 +1,153 @@
-{
- "abi": [
- {
- "inputs": [
- {
- "internalType": "bytes32",
- "name": "",
- "type": "bytes32"
- }
- ],
- "name": "_sidechainTokens",
- "outputs": [
- {
- "internalType": "address",
- "name": "",
- "type": "address"
- }
- ],
- "stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "address",
- "name": "tokenAddress",
- "type": "address"
- },
- {
- "internalType": "uint256",
- "name": "amount",
- "type": "uint256"
- },
- {
- "internalType": "address payable",
- "name": "to",
- "type": "address"
- },
- {
- "internalType": "address",
- "name": "from",
- "type": "address"
- },
- {
- "internalType": "bytes32",
- "name": "txHash",
- "type": "bytes32"
- },
- {
- "internalType": "uint8[]",
- "name": "v",
- "type": "uint8[]"
- },
- {
- "internalType": "bytes32[]",
- "name": "r",
- "type": "bytes32[]"
- },
- {
- "internalType": "bytes32[]",
- "name": "s",
- "type": "bytes32[]"
- }
- ],
- "name": "receiveByEthereumAssetAddress",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "bytes32",
- "name": "sidechainAssetId",
- "type": "bytes32"
- },
- {
- "internalType": "uint256",
- "name": "amount",
- "type": "uint256"
- },
- {
- "internalType": "address",
- "name": "to",
- "type": "address"
- },
- {
- "internalType": "address",
- "name": "from",
- "type": "address"
- },
- {
- "internalType": "bytes32",
- "name": "txHash",
- "type": "bytes32"
- },
- {
- "internalType": "uint8[]",
- "name": "v",
- "type": "uint8[]"
- },
- {
- "internalType": "bytes32[]",
- "name": "r",
- "type": "bytes32[]"
- },
- {
- "internalType": "bytes32[]",
- "name": "s",
- "type": "bytes32[]"
- }
- ],
- "name": "receiveBySidechainAssetId",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "bytes32",
- "name": "to",
- "type": "bytes32"
- },
- {
- "internalType": "uint256",
- "name": "amount",
- "type": "uint256"
- },
- {
- "internalType": "address",
- "name": "tokenAddress",
- "type": "address"
- }
- ],
- "name": "sendERC20ToSidechain",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "bytes32",
- "name": "to",
- "type": "bytes32"
- }
- ],
- "name": "sendEthToSidechain",
- "outputs": [],
- "stateMutability": "payable",
- "type": "function"
- }
- ]
-}
+[
+ {
+ "inputs": [
+ {
+ "internalType": "bytes32",
+ "name": "",
+ "type": "bytes32"
+ }
+ ],
+ "name": "_sidechainTokens",
+ "outputs": [
+ {
+ "internalType": "address",
+ "name": "",
+ "type": "address"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "tokenAddress",
+ "type": "address"
+ },
+ {
+ "internalType": "uint256",
+ "name": "amount",
+ "type": "uint256"
+ },
+ {
+ "internalType": "address payable",
+ "name": "to",
+ "type": "address"
+ },
+ {
+ "internalType": "address",
+ "name": "from",
+ "type": "address"
+ },
+ {
+ "internalType": "bytes32",
+ "name": "txHash",
+ "type": "bytes32"
+ },
+ {
+ "internalType": "uint8[]",
+ "name": "v",
+ "type": "uint8[]"
+ },
+ {
+ "internalType": "bytes32[]",
+ "name": "r",
+ "type": "bytes32[]"
+ },
+ {
+ "internalType": "bytes32[]",
+ "name": "s",
+ "type": "bytes32[]"
+ }
+ ],
+ "name": "receiveByEthereumAssetAddress",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "bytes32",
+ "name": "sidechainAssetId",
+ "type": "bytes32"
+ },
+ {
+ "internalType": "uint256",
+ "name": "amount",
+ "type": "uint256"
+ },
+ {
+ "internalType": "address",
+ "name": "to",
+ "type": "address"
+ },
+ {
+ "internalType": "address",
+ "name": "from",
+ "type": "address"
+ },
+ {
+ "internalType": "bytes32",
+ "name": "txHash",
+ "type": "bytes32"
+ },
+ {
+ "internalType": "uint8[]",
+ "name": "v",
+ "type": "uint8[]"
+ },
+ {
+ "internalType": "bytes32[]",
+ "name": "r",
+ "type": "bytes32[]"
+ },
+ {
+ "internalType": "bytes32[]",
+ "name": "s",
+ "type": "bytes32[]"
+ }
+ ],
+ "name": "receiveBySidechainAssetId",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "bytes32",
+ "name": "to",
+ "type": "bytes32"
+ },
+ {
+ "internalType": "uint256",
+ "name": "amount",
+ "type": "uint256"
+ },
+ {
+ "internalType": "address",
+ "name": "tokenAddress",
+ "type": "address"
+ }
+ ],
+ "name": "sendERC20ToSidechain",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "bytes32",
+ "name": "to",
+ "type": "bytes32"
+ }
+ ],
+ "name": "sendEthToSidechain",
+ "outputs": [],
+ "stateMutability": "payable",
+ "type": "function"
+ }
+]
\ No newline at end of file
diff --git a/src/abi/ethereum/other/ERC20.json b/src/abi/ethereum/other/ERC20.json
index 528b15672..0623a6669 100644
--- a/src/abi/ethereum/other/ERC20.json
+++ b/src/abi/ethereum/other/ERC20.json
@@ -1,130 +1,128 @@
-{
- "abi": [
- {
- "inputs": [
+[
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "owner",
+ "type": "address"
+ },
+ {
+ "internalType": "address",
+ "name": "spender",
+ "type": "address"
+ }
+ ],
+ "name": "allowance",
+ "outputs": [
+ {
+ "internalType": "uint256",
+ "name": "",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "spender",
+ "type": "address"
+ },
+ {
+ "internalType": "uint256",
+ "name": "value",
+ "type": "uint256"
+ }
+ ],
+ "name": "approve",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "owner",
+ "type": "address"
+ }
+ ],
+ "name": "balanceOf",
+ "outputs": [
+ {
+ "internalType": "uint256",
+ "name": "",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "spender",
+ "type": "address"
+ },
+ {
+ "internalType": "uint256",
+ "name": "addedValue",
+ "type": "uint256"
+ }
+ ],
+ "name": "increaseAllowance",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "decimals",
+ "outputs": [
{
- "internalType": "address",
- "name": "owner",
- "type": "address"
- },
- {
- "internalType": "address",
- "name": "spender",
- "type": "address"
- }
- ],
- "name": "allowance",
- "outputs": [
- {
- "internalType": "uint256",
"name": "",
- "type": "uint256"
+ "type": "uint8"
}
- ],
- "stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [
+ ],
+ "payable": false,
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
{
- "internalType": "address",
- "name": "spender",
+ "name": "to",
"type": "address"
},
{
- "internalType": "uint256",
"name": "value",
"type": "uint256"
}
- ],
- "name": "approve",
- "outputs": [
- {
- "internalType": "bool",
- "name": "",
- "type": "bool"
- }
- ],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "address",
- "name": "owner",
- "type": "address"
- }
- ],
- "name": "balanceOf",
- "outputs": [
- {
- "internalType": "uint256",
- "name": "",
- "type": "uint256"
- }
- ],
- "stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "address",
- "name": "spender",
- "type": "address"
- },
- {
- "internalType": "uint256",
- "name": "addedValue",
- "type": "uint256"
- }
- ],
- "name": "increaseAllowance",
- "outputs": [
+ ],
+ "name": "transfer",
+ "outputs": [
{
- "internalType": "bool",
"name": "",
"type": "bool"
}
- ],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [],
- "name": "decimals",
- "outputs": [
- {
- "name": "",
- "type": "uint8"
- }
- ],
- "payable": false,
- "stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [
- {
- "name": "to",
- "type": "address"
- },
- {
- "name": "value",
- "type": "uint256"
- }
- ],
- "name": "transfer",
- "outputs": [
- {
- "name": "",
- "type": "bool"
- }
- ],
- "payable": false,
- "stateMutability": "nonpayable",
- "type": "function"
- }
- ]
-}
+ ],
+ "payable": false,
+ "stateMutability": "nonpayable",
+ "type": "function"
+ }
+]
diff --git a/src/abi/ethereum/other/moonbeam/xTokens.json b/src/abi/ethereum/other/moonbeam/xTokens.json
new file mode 100644
index 000000000..34ee16fa2
--- /dev/null
+++ b/src/abi/ethereum/other/moonbeam/xTokens.json
@@ -0,0 +1,94 @@
+[
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "currency_address",
+ "type": "address"
+ },
+ {
+ "internalType": "uint256",
+ "name": "amount",
+ "type": "uint256"
+ },
+ {
+ "components": [
+ {
+ "internalType": "uint8",
+ "name": "parents",
+ "type": "uint8"
+ },
+ {
+ "internalType": "bytes[]",
+ "name": "interior",
+ "type": "bytes[]"
+ }
+ ],
+ "internalType": "structXtokens.Multilocation",
+ "name": "destination",
+ "type": "tuple"
+ },
+ {
+ "internalType": "uint64",
+ "name": "weight",
+ "type": "uint64"
+ }
+ ],
+ "name": "transfer",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "components": [
+ {
+ "internalType": "uint8",
+ "name": "parents",
+ "type": "uint8"
+ },
+ {
+ "internalType": "bytes[]",
+ "name": "interior",
+ "type": "bytes[]"
+ }
+ ],
+ "internalType": "structXtokens.Multilocation",
+ "name": "asset",
+ "type": "tuple"
+ },
+ {
+ "internalType": "uint256",
+ "name": "amount",
+ "type": "uint256"
+ },
+ {
+ "components": [
+ {
+ "internalType": "uint8",
+ "name": "parents",
+ "type": "uint8"
+ },
+ {
+ "internalType": "bytes[]",
+ "name": "interior",
+ "type": "bytes[]"
+ }
+ ],
+ "internalType": "structXtokens.Multilocation",
+ "name": "destination",
+ "type": "tuple"
+ },
+ {
+ "internalType": "uint64",
+ "name": "weight",
+ "type": "uint64"
+ }
+ ],
+ "name": "transfer_multiasset",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ }
+]
\ No newline at end of file
diff --git a/src/assets/img/networks/alphanet.svg b/src/assets/img/networks/alphanet.svg
new file mode 100644
index 000000000..1714c1059
--- /dev/null
+++ b/src/assets/img/networks/alphanet.svg
@@ -0,0 +1,136 @@
+
+
diff --git a/src/assets/img/networks/moonbeam.svg b/src/assets/img/networks/moonbeam.svg
new file mode 100644
index 000000000..bfc782321
--- /dev/null
+++ b/src/assets/img/networks/moonbeam.svg
@@ -0,0 +1,48 @@
+
+
diff --git a/src/assets/img/points/header.png b/src/assets/img/points/header.png
new file mode 100644
index 000000000..0de669738
Binary files /dev/null and b/src/assets/img/points/header.png differ
diff --git a/src/assets/img/points/soratopia.png b/src/assets/img/points/soratopia.png
new file mode 100644
index 000000000..f3bc2c708
Binary files /dev/null and b/src/assets/img/points/soratopia.png differ
diff --git a/src/components/App/Alerts/AlertList.vue b/src/components/App/Alerts/AlertList.vue
index 778109a67..635bad856 100644
--- a/src/components/App/Alerts/AlertList.vue
+++ b/src/components/App/Alerts/AlertList.vue
@@ -19,11 +19,11 @@
trigger="click"
:visible-arrow="false"
>
-
+
{{ t('alerts.edit') }}
-
+
{{ t('alerts.delete') }}
diff --git a/src/components/App/BrowserNotification/BrowserNotificationLocalStorageOverride.vue b/src/components/App/BrowserNotification/BrowserNotificationLocalStorageOverride.vue
new file mode 100644
index 000000000..9666a86c0
--- /dev/null
+++ b/src/components/App/BrowserNotification/BrowserNotificationLocalStorageOverride.vue
@@ -0,0 +1,50 @@
+
+
+
+
+ {{ t('browserNotificationLocalStorageOverride.info') }}
+
+
+ {{ t('browserNotificationLocalStorageOverride.agree') }}
+
+
+
+
+
+
diff --git a/src/components/App/Footer/FooterPopper.vue b/src/components/App/Footer/FooterPopper.vue
index 906727c12..a39b182a3 100644
--- a/src/components/App/Footer/FooterPopper.vue
+++ b/src/components/App/Footer/FooterPopper.vue
@@ -8,6 +8,7 @@
@show="handleShow"
>
@@ -154,6 +154,7 @@ $max-ad-width: 330px;
font-weight: 700;
letter-spacing: -0.36px;
text-transform: uppercase;
+ white-space: pre-line;
}
&-suffix {
color: var(--s-color-base-on-accent);
diff --git a/src/components/App/Menu/AppInfoPopper.vue b/src/components/App/Menu/AppInfoPopper.vue
index 8c71b4380..819c2a687 100644
--- a/src/components/App/Menu/AppInfoPopper.vue
+++ b/src/components/App/Menu/AppInfoPopper.vue
@@ -33,7 +33,7 @@
{{ product.title }}
-
+
{{ product.title }}
diff --git a/src/components/App/Menu/AppMenu.vue b/src/components/App/Menu/AppMenu.vue
index 8717cc12e..f0a1b5563 100644
--- a/src/components/App/Menu/AppMenu.vue
+++ b/src/components/App/Menu/AppMenu.vue
@@ -1,10 +1,5 @@
-
+
+
+
+
{}, type: Function }) readonly onSelect!: (item: any) => void;
@state.settings.faucetUrl faucetUrl!: string;
@@ -196,7 +202,7 @@ export default class AppMenu extends Mixins(TranslationMixin) {
}
get currentPath(): string {
- const currentName = this.$route.name as any;
+ const currentName = this.$route.name as PageNames;
if (PoolChildPages.includes(currentName)) {
return PageNames.Pool;
}
@@ -218,7 +224,7 @@ export default class AppMenu extends Mixins(TranslationMixin) {
if (isVaultPage(currentName)) {
return VaultPageNames.Vaults;
}
- return currentName as string;
+ return currentName;
}
openProductDialog(product: string): void {
@@ -405,6 +411,7 @@ export default class AppMenu extends Mixins(TranslationMixin) {
@include large-mobile(true) {
position: fixed;
right: 0;
+ z-index: $app-above-loader-layer;
&.visible {
visibility: visible;
diff --git a/src/components/App/Menu/SidebarItemContent.vue b/src/components/App/Menu/SidebarItemContent.vue
index f926a0e22..845994dd6 100644
--- a/src/components/App/Menu/SidebarItemContent.vue
+++ b/src/components/App/Menu/SidebarItemContent.vue
@@ -52,6 +52,7 @@ $icon-size: 42px;
.icon-container {
display: flex;
+ flex-shrink: 0;
padding-left: 1px; // because of inset shadow
width: $icon-size;
height: $icon-size;
diff --git a/src/components/mixins/ExplorePageMixin.ts b/src/components/mixins/ExplorePageMixin.ts
index f9a1a5f21..b0725f877 100644
--- a/src/components/mixins/ExplorePageMixin.ts
+++ b/src/components/mixins/ExplorePageMixin.ts
@@ -63,7 +63,9 @@ export default class ExplorePageMixin extends Mixins(ScrollableTableMixin, Trans
filterAsset(item.poolAsset) ||
filterAsset(item.rewardAsset) ||
filterAsset(item.baseAsset) ||
- filterAsset(item.targetAsset)
+ filterAsset(item.targetAsset) ||
+ filterAsset(item.lockedAsset) ||
+ filterAsset(item.debtAsset)
);
}
diff --git a/src/components/mixins/InternalConnectMixin.ts b/src/components/mixins/InternalConnectMixin.ts
index 15b61d701..cb5356ca3 100644
--- a/src/components/mixins/InternalConnectMixin.ts
+++ b/src/components/mixins/InternalConnectMixin.ts
@@ -3,11 +3,13 @@ import { Component, Mixins } from 'vue-property-decorator';
import TranslationMixin from '@/components/mixins/TranslationMixin';
import { PageNames } from '@/consts';
import { goTo } from '@/router';
-import { getter, mutation, state } from '@/store/decorators';
+import { action, getter, mutation, state } from '@/store/decorators';
import { formatAddress } from '@/utils';
@Component
export default class InternalConnectMixin extends Mixins(TranslationMixin) {
+ @action.wallet.account.logout public logout!: () => Promise;
+
@state.wallet.account.address public soraAddress!: string;
@getter.wallet.account.isLoggedIn public isLoggedIn!: boolean;
@@ -20,6 +22,10 @@ export default class InternalConnectMixin extends Mixins(TranslationMixin) {
this.setSoraAccountDialogVisibility(true);
}
+ public disconnectSoraWallet(): void {
+ this.logout();
+ }
+
public navigateToWallet(): void {
goTo(PageNames.Wallet);
}
diff --git a/src/components/mixins/NetworkFormatterMixin.ts b/src/components/mixins/NetworkFormatterMixin.ts
index 3d43475bd..60989601f 100644
--- a/src/components/mixins/NetworkFormatterMixin.ts
+++ b/src/components/mixins/NetworkFormatterMixin.ts
@@ -145,6 +145,8 @@ export default class NetworkFormatterMixin extends Mixins(TranslationMixin) {
return 'acala';
case SubNetworkId.PolkadotAstar:
return 'astar';
+ case SubNetworkId.PolkadotMoonbeam:
+ return 'moonbeam';
case SubNetworkId.Kusama:
return 'kusama';
case SubNetworkId.KusamaShiden:
@@ -157,6 +159,10 @@ export default class NetworkFormatterMixin extends Mixins(TranslationMixin) {
return 'sora-kusama';
case SubNetworkId.Liberland:
return 'liberland';
+ case SubNetworkId.Alphanet:
+ return 'alphanet';
+ case SubNetworkId.AlphanetSora:
+ return 'sora-alphanet';
case SubNetworkId.AlphanetMoonbase:
return 'moonbase';
default:
diff --git a/src/components/mixins/ScrollableTableMixin.ts b/src/components/mixins/ScrollableTableMixin.ts
index e9a9b9728..850e66c29 100644
--- a/src/components/mixins/ScrollableTableMixin.ts
+++ b/src/components/mixins/ScrollableTableMixin.ts
@@ -12,6 +12,8 @@ export default class ScrollableTableMixin extends Mixins(
readonly FontSizeRate = WALLET_CONSTS.FontSizeRate;
readonly FontWeightRate = WALLET_CONSTS.FontWeightRate;
+ private scrollbarWatcher: Nullable = null;
+
@Ref('table') readonly tableComponent!: any;
get loadingState(): boolean {
@@ -39,6 +41,10 @@ export default class ScrollableTableMixin extends Mixins(
});
}
+ beforeDestroy(): void {
+ this.resetScrollbarWatcher();
+ }
+
public handlePaginationClick(button: WALLET_CONSTS.PaginationButton): void {
let current = 1; // First by default (instead of case WALLET_CONSTS.PaginationButton.First)
@@ -76,7 +82,7 @@ export default class ScrollableTableMixin extends Mixins(
elTableBodyWrapper.appendChild(scrollbar.$el);
scrollbarView.appendChild(elTableNativeTable);
- this.$watch(
+ this.scrollbarWatcher = this.$watch(
() => (scrollbar.$children[0] as any).moveX,
() => {
const scrollLeft = scrollbarWrap.scrollLeft;
@@ -88,4 +94,9 @@ export default class ScrollableTableMixin extends Mixins(
}
);
}
+
+ private resetScrollbarWatcher(): void {
+ this.scrollbarWatcher?.();
+ this.scrollbarWatcher = null;
+ }
}
diff --git a/src/components/mixins/SubscriptionsMixin.ts b/src/components/mixins/SubscriptionsMixin.ts
index f5ad500f4..d332910a0 100644
--- a/src/components/mixins/SubscriptionsMixin.ts
+++ b/src/components/mixins/SubscriptionsMixin.ts
@@ -1,5 +1,5 @@
import { mixins } from '@soramitsu/soraneo-wallet-web';
-import { Component, Watch, Mixins } from 'vue-property-decorator';
+import { Component, Mixins } from 'vue-property-decorator';
import { getter } from '@/store/decorators';
@@ -13,14 +13,38 @@ export default class SubscriptionsMixin extends Mixins(mixins.LoadingMixin) {
startSubscriptionsList: Array = [];
resetSubscriptionsList: Array = [];
- @Watch('isLoggedIn')
- @Watch('nodeIsConnected')
- private async restartSubscriptions(value: boolean): Promise {
- if (value) {
- await this.updateSubscriptions();
- } else {
- await this.resetSubscriptions();
- }
+ trackLogin = true;
+ watcherLogin: FnWithoutArgs | null = null;
+
+ protected watchLogin(): void {
+ if (!this.trackLogin) return;
+
+ this.watcherLogin = this.$watch(
+ () => this.isLoggedIn,
+ (value: boolean) => this.restartSubscriptions(value)
+ );
+ }
+
+ protected unwatchLogin(): void {
+ this.watcherLogin?.();
+ this.watcherLogin = null;
+ }
+
+ trackConnection = true;
+ watcherConnection: FnWithoutArgs | null = null;
+
+ protected watchConnection(): void {
+ if (!this.trackConnection) return;
+
+ this.watcherConnection = this.$watch(
+ () => this.nodeIsConnected,
+ (value: boolean) => this.restartSubscriptions(value)
+ );
+ }
+
+ protected unwatchConnection(): void {
+ this.watcherConnection?.();
+ this.watcherConnection = null;
}
get subscriptionsDataLoading(): boolean {
@@ -28,9 +52,16 @@ export default class SubscriptionsMixin extends Mixins(mixins.LoadingMixin) {
}
beforeMount(): void {
+ this.watchLogin();
+ this.watchConnection();
this.updateSubscriptions();
}
+ beforeDestroy(): void {
+ this.unwatchLogin();
+ this.unwatchConnection();
+ }
+
// TODO: [TECH]
// We need subscription management
// when every subscription have own unsubscribe call, which is not stored in vuex
@@ -67,4 +98,12 @@ export default class SubscriptionsMixin extends Mixins(mixins.LoadingMixin) {
private async resetSubscriptions(): Promise {
await Promise.all(this.resetSubscriptionsList.map((fn) => fn?.()));
}
+
+ private async restartSubscriptions(value: boolean): Promise {
+ if (value) {
+ await this.updateSubscriptions();
+ } else {
+ await this.resetSubscriptions();
+ }
+ }
}
diff --git a/src/components/mixins/WalletConnectMixin.ts b/src/components/mixins/WalletConnectMixin.ts
index 83e87a60a..9d627a959 100644
--- a/src/components/mixins/WalletConnectMixin.ts
+++ b/src/components/mixins/WalletConnectMixin.ts
@@ -17,15 +17,18 @@ export default class WalletConnectMixin extends Mixins(InternalConnectMixin) {
@state.web3.networkType networkType!: BridgeNetworkType;
@getter.bridge.isSubBridge isSubBridge!: boolean;
+ @getter.bridge.isSubAccountType isSubAccountType!: boolean;
@mutation.web3.setSubAccountDialogVisibility setSubAccountDialogVisibility!: (flag: boolean) => void;
@mutation.web3.setSelectProviderDialogVisibility setSelectProviderDialogVisibility!: (flag: boolean) => void;
@action.web3.changeEvmNetworkProvided changeEvmNetworkProvided!: AsyncFnWithoutArgs;
@action.web3.selectEvmProvider selectEvmProvider!: (provider: Provider) => Promise;
- @action.web3.resetEvmProviderConnection resetEvmProviderConnection!: FnWithoutArgs;
@action.web3.disconnectExternalNetwork disconnectExternalNetwork!: AsyncFnWithoutArgs;
+ @action.web3.resetEvmProviderConnection disconnectEvmWallet!: FnWithoutArgs;
+ @action.web3.resetSubAccount disconnectSubWallet!: FnWithoutArgs;
+
connectSubWallet(): void {
this.setSubAccountDialogVisibility(true);
}
diff --git a/src/components/pages/Bridge/AccountPanel.vue b/src/components/pages/Bridge/AccountPanel.vue
index 937b192d2..7b73b3f87 100644
--- a/src/components/pages/Bridge/AccountPanel.vue
+++ b/src/components/pages/Bridge/AccountPanel.vue
@@ -1,13 +1,37 @@
-
-
-
-
-
- {{ name }}
-
-
+
+
+
+
+
+ ![provider icon]()
+
+
+
+ {{ name }}
+
+
+
+
+
+
+ {{ t('changeAccountText') }}
+
+
+ {{ t('disconnectWalletText') }}
+
+
+
+
+ {{ t('connectWalletText') }}
+
diff --git a/src/components/pages/Bridge/SelectSubAccount.vue b/src/components/pages/Bridge/SelectSubAccount.vue
index fb7b50c5d..068f892d4 100644
--- a/src/components/pages/Bridge/SelectSubAccount.vue
+++ b/src/components/pages/Bridge/SelectSubAccount.vue
@@ -1,12 +1,13 @@
-
+
@@ -47,10 +48,16 @@ export default class BridgeSelectSubAccount extends Mixins(TranslationMixin) {
this.setSubAccountDialogVisibility(flag);
}
- getApi() {
+ get chainApi() {
return this.subBridgeConnector.accountApi;
}
+ checkConnectedAccountSource(source: string) {
+ if (source && this.subAccount && this.subAccount.source === source) {
+ this.logout();
+ }
+ }
+
async login(account: WALLET_TYPES.PolkadotJsAccount): Promise {
await this.selectSubAccount(account);
this.closeView();
diff --git a/src/components/pages/Bridge/TransferNotification.vue b/src/components/pages/Bridge/TransferNotification.vue
index 8b93f1c66..eb9c16a24 100644
--- a/src/components/pages/Bridge/TransferNotification.vue
+++ b/src/components/pages/Bridge/TransferNotification.vue
@@ -26,10 +26,13 @@ import { Component, Mixins } from 'vue-property-decorator';
import BridgeTransactionMixin from '@/components/mixins/BridgeTransactionMixin';
import { getter, state, mutation } from '@/store/decorators';
import { isOutgoingTransaction } from '@/utils/bridge/common/utils';
+import { subBridgeApi } from '@/utils/bridge/sub/api';
+import type { SubNetworksConnector } from '@/utils/bridge/sub/classes/adapter';
import ethersUtil from '@/utils/ethers-util';
import type { IBridgeTransaction } from '@sora-substrate/util';
import type { Whitelist, RegisteredAccountAsset } from '@sora-substrate/util/build/assets/types';
+import type { SubNetwork } from '@sora-substrate/util/build/bridgeProxy/sub/types';
import type { BridgeNetworkId } from '@sora-substrate/util/build/bridgeProxy/types';
@Component({
@@ -42,6 +45,7 @@ import type { BridgeNetworkId } from '@sora-substrate/util/build/bridgeProxy/typ
})
export default class BridgeTransferNotification extends Mixins(BridgeTransactionMixin) {
@state.bridge.notificationData private notificationData!: Nullable;
+ @state.bridge.subBridgeConnector private subBridgeConnector!: SubNetworksConnector;
@getter.wallet.account.whitelist private whitelist!: Whitelist;
@getter.assets.assetDataByAddress private getAsset!: (addr?: string) => Nullable;
@@ -73,13 +77,22 @@ export default class BridgeTransferNotification extends Mixins(BridgeTransaction
return this.asset?.symbol ?? '';
}
- get addTokenBtnVisibility(): boolean {
+ get isSubEvm(): boolean {
+ return subBridgeApi.isEvmAccount(this.tx?.externalNetwork as SubNetwork);
+ }
+
+ get isEvmNetwork(): boolean {
if (!this.tx?.externalNetworkType) return false;
- if (this.tx.externalNetworkType === BridgeNetworkType.Sub) return false;
+ if (this.tx.externalNetworkType === BridgeNetworkType.Sub && !this.isSubEvm) return false;
+ return true;
+ }
+
+ get addTokenBtnVisibility(): boolean {
+ if (!this.isEvmNetwork) return false;
+
+ const address = this.asset?.externalAddress;
- return (
- !!this.asset && !ethersUtil.isNativeEvmTokenAddress(this.asset.externalAddress) && isOutgoingTransaction(this.tx)
- );
+ return !!address && !ethersUtil.isNativeEvmTokenAddress(address) && isOutgoingTransaction(this.tx);
}
get txLink() {
@@ -118,11 +131,30 @@ export default class BridgeTransferNotification extends Mixins(BridgeTransaction
async addToken(): Promise {
if (!this.asset) return;
- const { externalAddress, externalDecimals, symbol, address } = this.asset;
- const image = this.whitelist[address]?.icon;
- await ethersUtil.addToken(externalAddress, symbol, +externalDecimals, image);
-
- this.visibility = false;
+ try {
+ const { externalAddress, externalDecimals, symbol, address } = this.asset;
+ const image = this.whitelist[address]?.icon;
+
+ let tokenAddress = externalAddress;
+ let tokenSymbol = symbol;
+ let tokenDecimals = +externalDecimals;
+
+ if (this.isSubEvm) {
+ const adapter = this.subBridgeConnector.parachain;
+ if (!adapter) throw new Error('Adapter not found');
+ const assetMeta = adapter.getAssetMeta(this.asset);
+ if (!assetMeta) throw new Error('Asset metadata not found');
+ tokenAddress = adapter.assetIdToEvmContractAddress(externalAddress);
+ tokenSymbol = assetMeta.symbol;
+ tokenDecimals = assetMeta.decimals;
+ }
+
+ await ethersUtil.addToken(tokenAddress, tokenSymbol, tokenDecimals, image);
+ } catch (error) {
+ console.error(error);
+ } finally {
+ this.visibility = false;
+ }
}
}
diff --git a/src/components/pages/Burn/BurnDialog.vue b/src/components/pages/Burn/BurnDialog.vue
index 636bcf824..308faf96d 100644
--- a/src/components/pages/Burn/BurnDialog.vue
+++ b/src/components/pages/Burn/BurnDialog.vue
@@ -79,7 +79,6 @@ import type { AccountAsset, Asset } from '@sora-substrate/util/build/assets/type
DialogBase: components.DialogBase,
TokenLogo: components.TokenLogo,
InfoLine: components.InfoLine,
- SwapTransactionDetails: lazyComponent(Components.SwapTransactionDetails),
TokenInput: lazyComponent(Components.TokenInput),
},
})
diff --git a/src/components/pages/OrderBook/BuySell.vue b/src/components/pages/OrderBook/BuySell.vue
index f957bc427..1c580b88a 100644
--- a/src/components/pages/OrderBook/BuySell.vue
+++ b/src/components/pages/OrderBook/BuySell.vue
@@ -255,11 +255,11 @@ export default class BuySellWidget extends Mixins(
@state.orderBook.baseAssetAddress baseAssetAddress!: string;
@state.orderBook.amountSliderValue sliderValue!: number;
@state.orderBook.userLimitOrders userLimitOrders!: Array;
+ @state.orderBook.dexId dexId!: DexId;
@state.settings.slippageTolerance private slippageTolerance!: string;
@state.swap.fromValue private fromValue!: string;
@state.swap.toValue private toValue!: string;
- @state.swap.selectedDexId private selectedDexId!: number;
@getter.assets.xor xor!: AccountAsset;
@getter.orderBook.baseAsset baseAsset!: AccountAsset;
@@ -769,7 +769,7 @@ export default class BuySellWidget extends Mixins(
this.slippageTolerance,
this.isBuySide,
LiquiditySourceTypes.OrderBook,
- this.selectedDexId
+ this.dexId
);
}
@@ -870,12 +870,7 @@ export default class BuySellWidget extends Mixins(
const outputAsset = (this.tokenTo as AccountAsset).address;
const sources = [LiquiditySourceTypes.OrderBook];
- const observableQuote = api.swap.getSwapQuoteObservable(
- inputAsset,
- outputAsset,
- sources,
- DexId.XOR // subscription only for XOR dex in optimization purposes
- );
+ const observableQuote = api.swap.getSwapQuoteObservable(inputAsset, outputAsset, sources, this.dexId);
if (!observableQuote) return;
@@ -911,7 +906,7 @@ export default class BuySellWidget extends Mixins(
this.setToValue(toValue);
this.setQuoteValue(this.marketQuotePrice);
this.setLiquiditySource(LiquiditySourceTypes.OrderBook);
- this.selectDexId(DexId.XOR); // make it changeable if other dexes are allowed
+ this.selectDexId(this.dexId);
this.checkInputValidation();
}
diff --git a/src/components/pages/OrderBook/HistoryOrderWidget.vue b/src/components/pages/OrderBook/HistoryOrderWidget.vue
index 3739875dd..3b51d668b 100644
--- a/src/components/pages/OrderBook/HistoryOrderWidget.vue
+++ b/src/components/pages/OrderBook/HistoryOrderWidget.vue
@@ -3,18 +3,21 @@
{{ openOrdersText }}
{{ t('orderBook.history.orderHistory') }}
@@ -23,12 +26,14 @@
{{ cancelText }}
diff --git a/src/components/pages/SoraCard/Dashboard/Dashboard.vue b/src/components/pages/SoraCard/Dashboard/Dashboard.vue
index e62676090..baf8c63ce 100644
--- a/src/components/pages/SoraCard/Dashboard/Dashboard.vue
+++ b/src/components/pages/SoraCard/Dashboard/Dashboard.vue
@@ -39,13 +39,13 @@
{{ t('card.cardhub.accountInfo') }}
-
+
{{ t('card.cardHub.ibanLabel') }}
-
+
{{ t('card.cardHub.logout') }}
diff --git a/src/components/pages/SoraCard/SoraCardIntroPage.vue b/src/components/pages/SoraCard/SoraCardIntroPage.vue
index 62d2471c0..a4962850a 100644
--- a/src/components/pages/SoraCard/SoraCardIntroPage.vue
+++ b/src/components/pages/SoraCard/SoraCardIntroPage.vue
@@ -57,7 +57,7 @@
{{ t('card.unsupportedCountriesDisclaimer') }}
- {{
+ {{
t('card.unsupportedCountriesLink')
}}
diff --git a/src/components/pages/SoraCard/steps/SelectCountryDialog.vue b/src/components/pages/SoraCard/steps/SelectCountryDialog.vue
index f9f2feeb9..9a3125974 100644
--- a/src/components/pages/SoraCard/steps/SelectCountryDialog.vue
+++ b/src/components/pages/SoraCard/steps/SelectCountryDialog.vue
@@ -11,9 +11,10 @@
{{ item.flag }}
diff --git a/src/components/pages/SoraCard/steps/TermsAndConditions.vue b/src/components/pages/SoraCard/steps/TermsAndConditions.vue
index 38851b945..e8d582b46 100644
--- a/src/components/pages/SoraCard/steps/TermsAndConditions.vue
+++ b/src/components/pages/SoraCard/steps/TermsAndConditions.vue
@@ -13,17 +13,17 @@
-
+
{{ t(termsAndConditionsTitle) }}
-
+
{{ t(privacyPolicyTitle) }}
-
+
{{ t(unsupportedCountriesTitle) }}
diff --git a/src/components/pages/Swap/Confirm.vue b/src/components/pages/Swap/Confirm.vue
index 82654538c..22d72ada7 100644
--- a/src/components/pages/Swap/Confirm.vue
+++ b/src/components/pages/Swap/Confirm.vue
@@ -1,5 +1,10 @@
-
+
{{ formattedFromValue }}
diff --git a/src/components/pages/Swap/LossWarningDialog.vue b/src/components/pages/Swap/LossWarningDialog.vue
index 61f2bc344..a2b02942e 100644
--- a/src/components/pages/Swap/LossWarningDialog.vue
+++ b/src/components/pages/Swap/LossWarningDialog.vue
@@ -1,5 +1,5 @@
-
+
-
+
diff --git a/src/components/pages/Swap/Widget/Chart.vue b/src/components/pages/Swap/Widget/Chart.vue
deleted file mode 100644
index 60b655c52..000000000
--- a/src/components/pages/Swap/Widget/Chart.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/src/components/pages/Swap/Widget/Distribution.vue b/src/components/pages/Swap/Widget/Distribution.vue
index 7f1abdb7d..fa224d7ef 100644
--- a/src/components/pages/Swap/Widget/Distribution.vue
+++ b/src/components/pages/Swap/Widget/Distribution.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/components/pages/Swap/Widget/Form.vue b/src/components/pages/Swap/Widget/Form.vue
index 3f0d6ca56..05580cdcd 100644
--- a/src/components/pages/Swap/Widget/Form.vue
+++ b/src/components/pages/Swap/Widget/Form.vue
@@ -1,5 +1,5 @@
-
+
{{ t('marketText') }}:
@@ -107,11 +107,7 @@
-
+
-
+
-
+
{{ t('removeLiquidity.input') }}
@@ -31,7 +31,7 @@
/>
-
+
{{ t('removeLiquidity.output') }}
@@ -43,7 +43,7 @@
/>
-
+
{{ t('transfers.from') }}
@@ -58,7 +58,7 @@
-
+
{{ t('transfers.to') }}
@@ -96,7 +96,7 @@
:current-page="currentPage"
:page-amount="pageAmount"
:total="total"
- :loading="loadingState"
+ :loading="loading"
:last-page="lastPage"
@pagination-click="onPaginationClick"
/>
@@ -157,7 +157,7 @@ export default class SwapTransactionsWidget extends Mixins(ScrollableTableMixin,
this.checkTriggerUpdate(curr, prev);
}
- pageAmount = 8; // override PaginationSearchMixin
+ pageAmount = 5; // override PaginationSearchMixin
private readonly operations = [Operation.Swap];
private readonly fromTimestamp = dayjs().subtract(1, 'month').startOf('day').unix(); // month ago, start of the day
diff --git a/src/components/shared/Button/SortButton.vue b/src/components/shared/Button/SortButton.vue
index 2d8d6816f..3000b700f 100644
--- a/src/components/shared/Button/SortButton.vue
+++ b/src/components/shared/Button/SortButton.vue
@@ -1,5 +1,5 @@
-
-
-
-
-
- {{ t('transactionDetailsText') }}
-
-
-
-
-
+
+
+
+ {{ t('transactionDetailsText') }}
+
+
+
+
+
- .el-collapse-item__wrap {
- margin-top: $inner-spacing-medium;
- }
+
diff --git a/src/components/shared/Widget/Base.vue b/src/components/shared/Widget/Base.vue
index a2ca0ba6a..6dc58939c 100644
--- a/src/components/shared/Widget/Base.vue
+++ b/src/components/shared/Widget/Base.vue
@@ -1,7 +1,14 @@
-
+
-