Skip to content

Commit

Permalink
Merge branch 'develop' into feature/swap-layout
Browse files Browse the repository at this point in the history
  • Loading branch information
Nikita-Polyakov authored Apr 18, 2024
2 parents d8e877a + 11c1dd2 commit 819428f
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"@metamask/detect-provider": "^2.0.0",
"@soramitsu/soraneo-wallet-web": "1.32.7",
"@soramitsu/soraneo-wallet-web": "1.33.0",
"@walletconnect/ethereum-provider": "^2.11.2",
"@walletconnect/modal": "^2.6.2",
"core-js": "^3.36.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/App/Menu/AppMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export default class AppMenu extends Mixins(TranslationMixin) {
return StakingPageNames.Staking;
}
if (ExploreChildPages.includes(currentName)) {
return PageNames.ExploreFarming;
return PageNames.ExploreTokens;
}
return currentName as string;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/Referrals/ConfirmInviteUser.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default class ReferralsConfirmInviteUser extends Mixins(mixins.Transactio
}
get iconName(): string {
return this.hasReferrer ? 'notifications-alert-triangle-24' : 'file-file-text-24';
return this.hasReferrer ? 'notifications-alert-triangle-24' : 'finance-PSWAP-24';
}
get iconSize(): number {
Expand Down
8 changes: 4 additions & 4 deletions src/consts/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ const OtherPagesMenu: Array<SidebarMenuItemLink> = [
icon: 'various-items-24',
title: PageNames.ExploreContainer,
href: '/#/explore',
index: PageNames.ExploreFarming,
index: PageNames.ExploreTokens,
},
{
icon: 'various-planet-24',
Expand All @@ -382,7 +382,7 @@ const OtherPagesMenu: Array<SidebarMenuItemLink> = [
href: '/#/card',
},
{
icon: 'file-file-text-24',
icon: 'finance-PSWAP-24',
title: PageNames.About,
href: '/#/about',
},
Expand Down Expand Up @@ -464,10 +464,10 @@ export const StakingChildPages = [
SoraStakingPageNames.SelectValidators,
];
export const ExploreChildPages = [
PageNames.ExploreFarming, // By default
PageNames.ExploreTokens, // By default
PageNames.ExploreStaking,
PageNames.ExplorePools,
PageNames.ExploreTokens,
PageNames.ExploreFarming,
PageNames.ExploreBooks,
];

Expand Down
12 changes: 6 additions & 6 deletions src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,13 @@ const routes: Array<RouteConfig> = [
path: '/explore',
name: PageNames.ExploreContainer,
component: lazyView(PageNames.ExploreContainer),
redirect: { name: PageNames.ExploreFarming },
redirect: { name: PageNames.ExploreTokens },
children: [
{
path: 'tokens',
name: PageNames.ExploreTokens,
component: lazyView(PageNames.ExploreTokens),
},
{
path: 'demeter',
component: demeterStakingLazyView(DemeterStakingPageNames.DataContainer),
Expand Down Expand Up @@ -194,11 +199,6 @@ const routes: Array<RouteConfig> = [
},
],
},
{
path: 'tokens',
name: PageNames.ExploreTokens,
component: lazyView(PageNames.ExploreTokens),
},
{
path: 'books',
name: PageNames.ExploreBooks,
Expand Down
8 changes: 4 additions & 4 deletions src/views/Explore/Container.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ export default class ExploreContainer extends Mixins(mixins.LoadingMixin, Transl
get tabs(): Array<{ name: string; label: string; icon: string }> {
return [
{
name: PageNames.ExploreTokens,
icon: 'finance-PSWAP-24',
},
{
name: PageNames.ExploreFarming,
icon: 'various-toy-horse-24',
Expand All @@ -98,10 +102,6 @@ export default class ExploreContainer extends Mixins(mixins.LoadingMixin, Transl
name: PageNames.ExploreStaking,
icon: 'basic-layers-24',
},
{
name: PageNames.ExploreTokens,
icon: 'file-file-text-24',
},
{
name: PageNames.ExploreBooks,
icon: 'music-CD-24',
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2595,10 +2595,10 @@
vue-property-decorator "^9.1.2"
vuex "^3.6.2"

"@soramitsu/soraneo-wallet-web@1.32.7":
version "1.32.7"
resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.32.7.tgz#5557a1900d82e2e001ff93985f8cbd593b713d5b"
integrity sha512-4maKp1nKpi10itmg748WHgUqVV4UVz/ZQukvcKCGUt8sNuP+0tNqe/BU7nD3One1cSPR4Y38WFiKH59cO810xQ==
"@soramitsu/soraneo-wallet-web@1.33.0":
version "1.33.0"
resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.33.0.tgz#d66f137e68c86006b5f0a3b99552dd5d6c68741c"
integrity sha512-PZTRoVrZ6BCH4erFZxP5OZWl8m84KJkr+/giemPv2TgOsdtY8gA8BXwmyGexbJUel+1sAgsPbmvEV+mTl2hHgg==
dependencies:
"@polkadot/vue-identicon" "2.12.1"
"@sora-substrate/util" "1.33.2"
Expand Down

0 comments on commit 819428f

Please sign in to comment.