soramitsu
diff --git a/‎package.json
Lines changed: 1 addition & 1 deletion b/‎package.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎public/env.json
Lines changed: 1 addition & 1 deletion b/‎public/env.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/App.vue
Lines changed: 0 additions & 1 deletion b/‎src/App.vue
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/components/App/Footer/Indexer/utils.ts
Lines changed: 0 additions & 5 deletions b/‎src/components/App/Footer/Indexer/utils.ts
Lines changed: 0 additions & 5 deletions
diff --git a/‎src/components/App/Footer/StatisticsDialog.vue
Lines changed: 2 additions & 2 deletions b/‎src/components/App/Footer/StatisticsDialog.vue
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/components/App/Menu/AppMenu.vue
Lines changed: 6 additions & 1 deletion b/‎src/components/App/Menu/AppMenu.vue
Lines changed: 6 additions & 1 deletion
diff --git a/‎src/components/mixins/BridgeTransactionMixin.ts
Lines changed: 21 additions & 14 deletions b/‎src/components/mixins/BridgeTransactionMixin.ts
Lines changed: 21 additions & 14 deletions
diff --git a/‎src/components/mixins/ChartSpecMixin.ts
Lines changed: 2 additions & 1 deletion b/‎src/components/mixins/ChartSpecMixin.ts
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/components/mixins/NetworkFormatterMixin.ts
Lines changed: 24 additions & 50 deletions b/‎src/components/mixins/NetworkFormatterMixin.ts
Lines changed: 24 additions & 50 deletions
diff --git a/‎src/components/pages/Bridge/TransferNotification.vue
Lines changed: 1 addition & 1 deletion b/‎src/components/pages/Bridge/TransferNotification.vue
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/components/pages/Swap/StatusActionBadge.vue
Lines changed: 1 addition & 1 deletion b/‎src/components/pages/Swap/StatusActionBadge.vue
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/components/pages/Swap/Widget/Form.vue
Lines changed: 0 additions & 17 deletions b/‎src/components/pages/Swap/Widget/Form.vue
Lines changed: 0 additions & 17 deletions
diff --git a/‎src/components/shared/Settings/SlippageTolerance.vue
Lines changed: 1 addition & 0 deletions b/‎src/components/shared/Settings/SlippageTolerance.vue
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/components/shared/TokensRow.vue
Lines changed: 5 additions & 1 deletion b/‎src/components/shared/TokensRow.vue
Lines changed: 5 additions & 1 deletion
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@metamask/detect-provider": "^2.0.0",
-    "@soramitsu/soraneo-wallet-web": "1.32.6",
+    "@soramitsu/soraneo-wallet-web": "1.32.7",
     "@walletconnect/ethereum-provider": "^2.11.2",
     "@walletconnect/modal": "^2.6.2",
     "core-js": "^3.36.0",
 
@@ -64,7 +64,7 @@
       {
         "chain": "Liberland Dev Testnet",
         "name": "Soramitsu",
-        "address": "wss://rpc.liberland-1.lib1.dev.sora2.soramitsu.co.jp"
+        "address": "wss://ws.liberland-node-1.lib1.dev.sora2.soramitsu.co.jp"
       }
     ]
   },
 
@@ -106,7 +106,6 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
   @state.router.loading pageLoading!: boolean;
 
   @getter.settings.nodeIsConnected nodeIsConnected!: boolean;
-  @getter.settings.chartsEnabled private chartsEnabled!: boolean;
   @getter.wallet.transactions.firstReadyTx firstReadyTransaction!: Nullable<HistoryItem>;
   @getter.wallet.account.isLoggedIn isSoraAccountConnected!: boolean;
   @getter.libraryTheme libraryTheme!: Theme;
 
@@ -13,12 +13,12 @@
 import { components, mixins, WALLET_CONSTS, WALLET_TYPES } from '@soramitsu/soraneo-wallet-web';
 import { Component, Mixins } from 'vue-property-decorator';
 
-import { getIndexerName } from '@/components/App/Footer/Indexer/utils';
 import TranslationMixin from '@/components/mixins/TranslationMixin';
 import { Components } from '@/consts';
 import { lazyComponent } from '@/router';
 import { action, state, mutation } from '@/store/decorators';
 import { Indexer } from '@/types/indexers';
+import { capitalize } from '@/utils';
 
 const IndexerListView = 'IndexerListView';
 const IndexerInfoView = 'IndexerInfoView';
@@ -47,7 +47,7 @@ export default class SelectIndexerDialog extends Mixins(TranslationMixin, mixins
     return Object.keys(WALLET_CONSTS.IndexerType).map((key) => {
       const type = WALLET_CONSTS.IndexerType[key];
       return {
-        name: getIndexerName(type),
+        name: capitalize(type),
         type,
         endpoint: this.indexersData[type].endpoint,
         online: this.indexersData[type].status === WALLET_TYPES.ConnectionStatus.Available,
 
@@ -201,9 +201,13 @@ export default class AppMenu extends Mixins(TranslationMixin) {
   @include scrollbar(0, 100%, true);
 }
 
+.app-menu {
+  background: var(--s-color-utility-body);
+}
+
 .app-menu.collapsed {
   @include tablet {
-    background: var(--s-color-utility-body);
+    background: transparent;
 
     .sidebar-item-content {
       & > .icon-container + span {
@@ -217,6 +221,7 @@ export default class AppMenu extends Mixins(TranslationMixin) {
 
     &:hover,
     &:focus {
+      background: var(--s-color-utility-body);
       box-shadow: 20px 20px 60px 0px #0000001a;
 
       .sidebar-item-content {
 
@@ -25,7 +25,7 @@ export default class BridgeTransactionMixin extends Mixins(NetworkFormatterMixin
     );
   }
 
-  get txSoraAccount(): string {
+  get txInternalAccount(): string {
     return this.tx?.from ?? '';
   }
 
@@ -37,21 +37,19 @@ export default class BridgeTransactionMixin extends Mixins(NetworkFormatterMixin
     return this.tx?.txId ?? '';
   }
 
-  get txSoraBlockId(): string {
-    return this.tx?.blockId ?? '';
-  }
-
   get txSoraHash(): string {
     return this.tx?.hash ?? '';
   }
 
-  get txInternalHash(): string {
-    if (!this.isOutgoing) return this.txSoraHash;
+  get txInternalBlockNumber(): number | undefined {
+    return this.tx?.blockHeight;
+  }
 
-    return this.txSoraHash || this.txSoraBlockId || this.txSoraId;
+  get txInternalBlockId(): string {
+    return this.tx?.blockId ?? '';
   }
 
-  get txExternalEventIndex(): number | undefined {
+  get txEventIndex(): number | undefined {
     return this.tx?.payload?.eventIndex;
   }
 
@@ -63,6 +61,10 @@ export default class BridgeTransactionMixin extends Mixins(NetworkFormatterMixin
     return this.tx?.externalBlockHeight;
   }
 
+  get txExternalBlockId(): string {
+    return this.tx?.externalBlockId ?? '';
+  }
+
   get externalNetworkType(): Nullable<BridgeNetworkType> {
     return this.tx?.externalNetworkType;
   }
@@ -71,8 +73,13 @@ export default class BridgeTransactionMixin extends Mixins(NetworkFormatterMixin
     return this.tx?.externalNetwork;
   }
 
-  get soraExplorerLinks(): Array<WALLET_CONSTS.ExplorerLink> {
-    return soraExplorerLinks(this.soraNetwork, this.txSoraId, this.txSoraBlockId);
+  get internalExplorerLinks(): Array<WALLET_CONSTS.ExplorerLink> {
+    return soraExplorerLinks(
+      this.soraNetwork,
+      this.txSoraId,
+      this.txInternalBlockNumber ?? this.txInternalBlockId,
+      this.txEventIndex
+    );
   }
 
   get externalExplorerLinks(): Array<WALLET_CONSTS.ExplorerLink> {
@@ -82,13 +89,13 @@ export default class BridgeTransactionMixin extends Mixins(NetworkFormatterMixin
       this.externalNetworkType,
       this.externalNetworkId,
       this.txExternalHash,
-      this.txExternalBlockNumber,
-      this.txExternalEventIndex
+      this.txExternalBlockNumber ?? this.txExternalBlockId,
+      this.txEventIndex
     );
   }
 
   get internalAccountLinks(): Array<WALLET_CONSTS.ExplorerLink> {
-    return soraExplorerLinks(this.soraNetwork, this.txSoraAccount, this.txSoraBlockId, true);
+    return soraExplorerLinks(this.soraNetwork, this.txInternalAccount, undefined, undefined, true);
   }
 
   get externalAccountLinks(): Array<WALLET_CONSTS.ExplorerLink> {
 
@@ -4,6 +4,7 @@ import { Component, Mixins } from 'vue-property-decorator';
 
 import ThemePaletteMixin from '@/components/mixins/ThemePaletteMixin';
 import TranslationMixin from '@/components/mixins/TranslationMixin';
+import { capitalize } from '@/utils';
 
 const LABEL_PADDING = 4;
 const AXIS_OFFSET = 8;
@@ -42,7 +43,7 @@ export default class ChartSpecMixin extends Mixins(ThemePaletteMixin, Translatio
           const formatted = this.formatDate(+value, timeFormat);
 
           if (isNewMonth) {
-            return `{monthStyle|${formatted.charAt(0).toUpperCase() + formatted.slice(1)}}`;
+            return `{monthStyle|${capitalize(formatted)}}`;
           }
           if (isNewDay) {
             return `{dateStyle|${formatted}}`;
 
@@ -9,6 +9,7 @@ import { SUB_NETWORKS } from '@/consts/sub';
 import { state, getter } from '@/store/decorators';
 import type { AvailableNetwork } from '@/store/web3/types';
 import type { NetworkData } from '@/types/bridge';
+import { getSubstrateExplorerLinks } from '@/utils';
 import { isOutgoingTransaction } from '@/utils/bridge/common/utils';
 import { isUnsignedToPart } from '@/utils/bridge/eth/utils';
 
@@ -23,58 +24,31 @@ const getSubNetworkLinks = (
   networkData: NetworkData,
   type: EvmLinkType,
   value?: string, // tx hash or account address
-  blockNumber?: number,
+  blockId?: number | string,
   eventIndex?: number
 ): WALLET_CONSTS.ExplorerLink[] => {
-  const links: Array<WALLET_CONSTS.ExplorerLink> = [];
-  const explorerUrl = networkData.blockExplorerUrls[0];
-
-  switch (type) {
-    case EvmLinkType.Account: {
-      if (explorerUrl && value) {
-        links.push({
-          type: WALLET_CONSTS.ExplorerType.Subscan,
-          value: `${explorerUrl}/account/${value}`,
-        });
-      }
-      break;
-    }
-    case EvmLinkType.Transaction: {
-      if (explorerUrl) {
-        if (value) {
-          links.push({
-            type: WALLET_CONSTS.ExplorerType.Subscan,
-            value: `${explorerUrl}/extrinsic/${value}`,
-          });
-        } else if (Number.isFinite(blockNumber)) {
-          let link = `${explorerUrl}/block/${blockNumber}`;
-
-          if (Number.isFinite(eventIndex)) {
-            link += `?tab=event&event=${blockNumber}-${eventIndex}`;
-          }
-
-          links.push({
-            type: WALLET_CONSTS.ExplorerType.Subscan,
-            value: link,
-          });
-        }
-      }
-
-      if (Number.isFinite(blockNumber)) {
-        const networkUrl = networkData.nodes?.[0].address;
-        const polkadotBaseLink = `https://polkadot.js.org/apps/?rpc=${networkUrl}#/explorer/query`;
-        const polkadotLink = {
-          type: WALLET_CONSTS.ExplorerType.Polkadot,
-          value: `${polkadotBaseLink}/${blockNumber}`,
-        };
-
-        links.push(polkadotLink);
-      }
-      break;
-    }
+  const baseLinks: WALLET_CONSTS.ExplorerLink[] = [];
+
+  const subscanLink = networkData.blockExplorerUrls[0];
+  const polkadotUrl = networkData.nodes?.[0].address;
+  const polkadotLink = polkadotUrl
+    ? `https://polkadot.js.org/apps/?rpc=${networkData.nodes?.[0].address}#/explorer/query`
+    : '';
+
+  if (subscanLink) {
+    baseLinks.push({
+      type: WALLET_CONSTS.ExplorerType.Subscan,
+      value: subscanLink,
+    });
+  }
+  if (polkadotLink) {
+    baseLinks.push({
+      type: WALLET_CONSTS.ExplorerType.Polkadot,
+      value: polkadotLink,
+    });
   }
 
-  return links;
+  return getSubstrateExplorerLinks(baseLinks, type === EvmLinkType.Account, value, blockId, eventIndex);
 };
 
 const getEvmNetworkLinks = (
@@ -186,7 +160,7 @@ export default class NetworkFormatterMixin extends Mixins(TranslationMixin) {
     networkType: BridgeNetworkType,
     networkId: BridgeNetworkId,
     value?: string,
-    blockNumber?: number,
+    blockId?: number | string,
     eventIndex?: number,
     type = EvmLinkType.Transaction
   ): Array<WALLET_CONSTS.ExplorerLink> {
@@ -198,7 +172,7 @@ export default class NetworkFormatterMixin extends Mixins(TranslationMixin) {
     }
 
     return networkType === BridgeNetworkType.Sub
-      ? getSubNetworkLinks(networkData, type, value, blockNumber, eventIndex)
+      ? getSubNetworkLinks(networkData, type, value, blockId, eventIndex)
       : getEvmNetworkLinks(networkData, type, value);
   }
 
 
@@ -83,7 +83,7 @@ export default class BridgeTransferNotification extends Mixins(BridgeTransaction
   }
 
   get txLink() {
-    const link = this.isOutgoing ? this.externalExplorerLinks[0] : this.soraExplorerLinks[0];
+    const link = this.isOutgoing ? this.externalExplorerLinks[0] : this.internalExplorerLinks[0];
     const network = this.isOutgoing ? this.externalNetworkId : undefined;
 
     return this.prepareLink(link, network);
 
@@ -15,7 +15,7 @@ export default class SwapStatusActionBadge extends Vue {}
 
 <style lang="scss">
 .status-action-badge.s-card.neumorphic.s-size-small {
-  padding: $inner-spacing-tiny $inner-spacing-big * 2 $inner-spacing-tiny $inner-spacing-small;
+  padding: $inner-spacing-tiny * 1.75 $inner-spacing-big * 2 $inner-spacing-tiny * 1.75 $inner-spacing-small;
 }
 </style>
 
 
@@ -8,15 +8,6 @@
           <s-button class="el-button--settings" type="action" icon="basic-settings-24" @click="openSettingsDialog" />
         </template>
       </swap-status-action-badge>
-
-      <svg-icon-button
-        v-if="chartsFlagEnabled"
-        icon="line-icon"
-        size="medium"
-        :tooltip="t('dexSettings.сhartsDescription')"
-        :active="chartsEnabled"
-        @click="toggleChart"
-      />
     </template>
 
     <div class="swap-form">
@@ -184,7 +175,6 @@ import type { Subscription } from 'rxjs';
     SelectToken: lazyComponent(Components.SelectToken),
     TokenInput: lazyComponent(Components.TokenInput),
     ValueStatusWrapper: lazyComponent(Components.ValueStatusWrapper),
-    SvgIconButton: lazyComponent(Components.SvgIconButton),
     FormattedAmount: components.FormattedAmount,
   },
 })
@@ -204,15 +194,12 @@ export default class SwapFormWidget extends Mixins(
 
   @getter.assets.xor private xor!: AccountAsset;
   @getter.swap.swapLiquiditySource liquiditySource!: Nullable<LiquiditySourceTypes>;
-  @getter.settings.chartsFlagEnabled chartsFlagEnabled!: boolean;
   @getter.settings.nodeIsConnected nodeIsConnected!: boolean;
-  @getter.settings.chartsEnabled chartsEnabled!: boolean;
   @getter.wallet.account.isLoggedIn isLoggedIn!: boolean;
   @getter.swap.tokenFrom tokenFrom!: Nullable<AccountAsset>;
   @getter.swap.tokenTo tokenTo!: Nullable<AccountAsset>;
   @getter.swap.swapMarketAlgorithm swapMarketAlgorithm!: MarketAlgorithms;
 
-  @mutation.settings.setChartsEnabled private setChartsEnabled!: (value: boolean) => void;
   @mutation.swap.setFromValue private setFromValue!: (value: string) => void;
   @mutation.swap.setToValue private setToValue!: (value: string) => void;
   @mutation.swap.setAmountWithoutImpact private setAmountWithoutImpact!: (amount?: CodecString) => void;
@@ -561,10 +548,6 @@ export default class SwapFormWidget extends Mixins(
     this.showSettings = true;
   }
 
-  toggleChart(): void {
-    this.setChartsEnabled(!this.chartsEnabled);
-  }
-
   private enableSwapSubscriptions(): void {
     this.updateBalanceSubscriptions();
     this.subscribeOnQuote();
 
@@ -221,6 +221,7 @@ export default class SlippageTolerance extends Mixins(mixins.NumberFormatterMixi
 
   .el-collapse-item__content {
     padding: 0 !important;
+    line-height: inherit;
   }
 
   .el-collapse--item .is-active .el-collapse {
 
@@ -46,13 +46,17 @@ export default class TokensRow extends Vue {
 
   &__item {
     display: block;
-    border-width: 2px;
     border-style: solid;
     border-color: transparent;
     border-radius: 50%;
+    border-width: 0px;
 
     &.border {
       border-color: var(--s-color-utility-surface);
+
+      & + & {
+        border-left-width: 2px;
+      }
     }
 
     & + & {
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@`
`64`	`64`	`{`
`65`	`65`	`"chain": "Liberland Dev Testnet",`
`66`	`66`	`"name": "Soramitsu",`
`67`		`- "address": "wss://rpc.liberland-1.lib1.dev.sora2.soramitsu.co.jp"`
	`67`	`+ "address": "wss://ws.liberland-node-1.lib1.dev.sora2.soramitsu.co.jp"`
`68`	`68`	`}`
`69`	`69`	`]`
`70`	`70`	`},`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ export default class BridgeTransferNotification extends Mixins(BridgeTransaction`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`get txLink() {`
`86`		`- const link = this.isOutgoing ? this.externalExplorerLinks[0] : this.soraExplorerLinks[0];`
	`86`	`+ const link = this.isOutgoing ? this.externalExplorerLinks[0] : this.internalExplorerLinks[0];`
`87`	`87`	`const network = this.isOutgoing ? this.externalNetworkId : undefined;`
`88`	`88`
`89`	`89`	`return this.prepareLink(link, network);`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ export default class SwapStatusActionBadge extends Vue {}`
`15`	`15`
`16`	`16`	`<style lang="scss">`
`17`	`17`	`.status-action-badge.s-card.neumorphic.s-size-small {`
`18`		`- padding: $inner-spacing-tiny $inner-spacing-big * 2 $inner-spacing-tiny $inner-spacing-small;`
	`18`	`+ padding: $inner-spacing-tiny * 1.75 $inner-spacing-big * 2 $inner-spacing-tiny * 1.75 $inner-spacing-small;`
`19`	`19`	`}`
`20`	`20`	`</style>`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,7 @@ export default class SlippageTolerance extends Mixins(mixins.NumberFormatterMixi`
`221`	`221`
`222`	`222`	`.el-collapse-item__content {`
`223`	`223`	`padding: 0 !important;`
	`224`	`+ line-height: inherit;`
`224`	`225`	`}`
`225`	`226`
`226`	`227`	`.el-collapse--item .is-active .el-collapse {`