@@ -44,6 +44,8 @@ import {
4444 WALLET_CONSTS ,
4545 WALLET_TYPES ,
4646 AlertsApiService ,
47+ initWallet ,
48+ waitForCore ,
4749} from ' @soramitsu/soraneo-wallet-web'
4850import debounce from ' lodash/debounce'
4951import { Component , Mixins , Watch } from ' vue-property-decorator'
@@ -54,15 +56,15 @@ import AppHeader from '@/components/App/Header/AppHeader.vue';
5456import AppMenu from ' @/components/App/Menu/AppMenu.vue'
5557import NodeErrorMixin from ' @/components/mixins/NodeErrorMixin'
5658import SoraLogo from ' @/components/shared/Logo/Sora.vue'
57- import { PageNames , Components , Language , BreakpointClass , Breakpoint } from ' @/consts'
59+ import { PageNames , Components , Language , BreakpointClass , Breakpoint , WalletPermissions } from ' @/consts'
5860import { getLocale } from ' @/lang'
5961import router , { goTo , lazyComponent } from ' @/router'
6062import { action , getter , mutation , state } from ' @/store/decorators'
6163import { getMobileCssClasses , preloadFontFace , updateDocumentTitle } from ' @/utils'
64+ import type { NodesConnection } from ' @/utils/connection'
6265
6366import type { FeatureFlags } from ' ./store/settings/types'
6467import type { EthBridgeSettings , SubNetworkApps } from ' ./store/web3/types'
65- import type { ConnectToNodeOptions , Node } from ' ./types/nodes'
6668import type { History , HistoryItem } from ' @sora-substrate/util'
6769import type { WhitelistArrayItem } from ' @sora-substrate/util/build/assets/types'
6870import type { EvmNetwork } from ' @sora-substrate/util/build/bridgeProxy/evm/types'
@@ -95,13 +97,15 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
9597 showNotifsDarkPage = false ;
9698 responsiveClass = BreakpointClass .LargeDesktop ;
9799
100+ @state .settings .appConnection appConnection! : NodesConnection ;
98101 @state .settings .browserNotifPopupVisibility private browserNotifPopup! : boolean ;
99102 @state .settings .browserNotifPopupBlockedVisibility private browserNotifPopupBlocked! : boolean ;
100103 @state .wallet .account .assetsToNotifyQueue assetsToNotifyQueue! : Array <WhitelistArrayItem >;
101104 @state .referrals .storageReferrer storageReferrer! : string ;
102105 @state .settings .disclaimerVisibility disclaimerVisibility! : boolean ;
103106 @state .router .loading pageLoading! : boolean ;
104107
108+ @getter .settings .nodeIsConnected nodeIsConnected! : boolean ;
105109 @getter .settings .chartsEnabled private chartsEnabled! : boolean ;
106110 @getter .wallet .transactions .firstReadyTx firstReadyTransaction! : Nullable <HistoryItem >;
107111 @getter .wallet .account .isLoggedIn isSoraAccountConnected! : boolean ;
@@ -114,8 +118,6 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
114118 endpoint: string ;
115119 }) => void ;
116120
117- @mutation .settings .setDefaultNodes private setDefaultNodes! : (nodes : Array <Node >) => void ;
118- @mutation .settings .setNetworkChainGenesisHash private setNetworkChainGenesisHash! : (hash ? : string ) => void ;
119121 @mutation .settings .setFaucetUrl private setFaucetUrl! : (url : string ) => void ;
120122 @mutation .settings .setFeatureFlags private setFeatureFlags! : (data : FeatureFlags ) => void ;
121123 @mutation .settings .setBrowserNotifsPopupEnabled private setBrowserNotifsPopup! : (flag : boolean ) => void ;
@@ -125,15 +127,14 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
125127 @mutation .settings .setScreenBreakpointClass private setScreenBreakpointClass! : (cssClass : string ) => void ;
126128 @mutation .referrals .unsubscribeFromInvitedUsers private unsubscribeFromInvitedUsers! : FnWithoutArgs ;
127129 @mutation .web3 .setEvmNetworksApp private setEvmNetworksApp! : (data : EvmNetwork []) => void ;
130+ @mutation .web3 .setSubNetworkApps private setSubNetworkApps! : (data : SubNetworkApps ) => void ;
128131 @mutation .web3 .setEthBridgeSettings private setEthBridgeSettings! : (settings : EthBridgeSettings ) => Promise <void >;
129132 @mutation .referrals .resetStorageReferrer private resetStorageReferrer! : FnWithoutArgs ;
130133
131- @action .web3 .setSubNetworkApps private setSubNetworkApps! : (data : SubNetworkApps ) => void ;
132134 @action .wallet .settings .setApiKeys private setApiKeys! : (apiKeys : WALLET_TYPES .ApiKeysObject ) => Promise <void >;
133135 @action .wallet .subscriptions .resetNetworkSubscriptions private resetNetworkSubscriptions! : AsyncFnWithoutArgs ;
134136 @action .wallet .subscriptions .resetInternalSubscriptions private resetInternalSubscriptions! : AsyncFnWithoutArgs ;
135137 @action .wallet .subscriptions .activateNetwokSubscriptions private activateNetwokSubscriptions! : AsyncFnWithoutArgs ;
136- @action .settings .connectToNode private connectToNode! : (options : ConnectToNodeOptions ) => Promise <void >;
137138 @action .settings .setLanguage private setLanguage! : (lang : Language ) => Promise <void >;
138139 @action .settings .setBlockNumber private setBlockNumber! : AsyncFnWithoutArgs ;
139140 @action .settings .fetchAdsArray private fetchAdsArray! : AsyncFnWithoutArgs ;
@@ -239,7 +240,6 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
239240 await this .setEthBridgeSettings (data .ETH_BRIDGE );
240241 this .setFeatureFlags (data ?.FEATURE_FLAGS );
241242 this .setSoraNetwork (data .NETWORK_TYPE );
242- this .setDefaultNodes (data ?.DEFAULT_NETWORKS );
243243 this .setEvmNetworksApp (data .EVM_NETWORKS_IDS );
244244 this .setSubNetworkApps (data .SUB_NETWORKS );
245245
@@ -253,9 +253,9 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
253253 if (data .FAUCET_URL ) {
254254 this .setFaucetUrl (data .FAUCET_URL );
255255 }
256- if ( data . CHAIN_GENESIS_HASH ) {
257- this .setNetworkChainGenesisHash (data . CHAIN_GENESIS_HASH );
258- }
256+
257+ this .appConnection . setDefaultNodes (data ?. DEFAULT_NETWORKS );
258+ this . appConnection . setNetworkChainGenesisHash ( data ?. CHAIN_GENESIS_HASH );
259259
260260 // connection to node
261261 await this .runAppConnectionToNode ();
@@ -269,10 +269,6 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
269269 window .addEventListener (' resize' this .setResponsiveClassDebounced );
270270 }
271271
272- private get isSwapPageWithCharts(): boolean {
273- return this .$route .name === PageNames .Swap && this .chartsEnabled ;
274- }
275-
276272 private get mobileCssClasses(): string [] | undefined {
277273 return getMobileCssClasses ();
278274 }
@@ -281,10 +277,6 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
281277 return this .$route .name === PageNames .About ;
282278 }
283279
284- get isCurrentPageTooWide(): boolean {
285- return this .isAboutPage || this .isSwapPageWithCharts || this .$route .name === PageNames .Tokens ;
286- }
287-
288280 get dsProviderClasses(): string [] | BreakpointClass {
289281 return this .mobileCssClasses ?.length ? [... this .mobileCssClasses , this .responsiveClass ] : this .responsiveClass ;
290282 }
@@ -295,9 +287,6 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
295287 if (this .$route .name ) {
296288 cssClasses .push (` ${baseClass }--${this .$route .name .toLowerCase ()} ` );
297289 }
298- if (this .isSwapPageWithCharts ) {
299- cssClasses .push (` ${baseClass }--has-charts ` );
300- }
301290 return cssClasses ;
302291 }
303292
@@ -373,12 +362,28 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
373362 }
374363
375364 private async runAppConnectionToNode() {
365+ const = {
366+ permissions: WalletPermissions ,
367+ appName: WALLET_CONSTS .TranslationConsts .Polkaswap ,
368+ };
369+
376370 try {
377- await this .connectToNode ({
378- onError : (error ) => this .handleNodeError (error , true ), // prefer notification on connection success
379- onDisconnect: this .handleNodeDisconnect ,
380- onReconnect: this .handleNodeReconnect ,
381- });
371+ // Run in parallel
372+ // 1) Wallet core initialization (node connection independent)
373+ // 2) Connection to node
374+ await Promise .all ([
375+ waitForCore (walletOptions ),
376+ this .appConnection .connect ({
377+ onError: this .handleNodeError ,
378+ onDisconnect: this .handleNodeDisconnect ,
379+ onReconnect: this .handleNodeConnect ,
380+ }),
381+ ]);
382+
383+ // Wallet node connection dependent logic
384+ if (! this .isWalletLoaded ) {
385+ await initWallet (walletOptions );
386+ }
382387 } catch (error ) {
383388 // we handled error using callback, do nothing
384389 }
@@ -568,13 +573,12 @@ i.icon-divider {
568573}
569574
570575@include desktop {
571- .app-main {
572- & .app-main--swap.app-main--has-charts {
576+ .app-main--swap {
577+ & .app-main {
573578 .app-menu {
574579 & :not (.collapsed ) {
575580 position relative ;
576581 }
577-
578582 & .collapsed {
579583 & + .app-body {
580584 margin-left 74px ;
0 commit comments