soramitsu
diff --git a/‎env.json
Lines changed: 1 addition & 1 deletion b/‎env.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎package.json
Lines changed: 3 additions & 3 deletions b/‎package.json
Lines changed: 3 additions & 3 deletions
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: 12 additions & 34 deletions b/‎src/App.vue
Lines changed: 12 additions & 34 deletions
diff --git a/‎src/components/App/Header/AppHeaderMenu.vue
Lines changed: 3 additions & 3 deletions b/‎src/components/App/Header/AppHeaderMenu.vue
Lines changed: 3 additions & 3 deletions
@@ -14,7 +14,7 @@
     "charts": true,
     "soraCard": true
   },
-  "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-prod-sub4",
+  "SUBQUERY_ENDPOINT": "https://subquery.q1.prd.sora2.soramitsu.co.jp",
   "SUBSQUID_ENDPOINT": "",
   "DEFAULT_NETWORKS": [
     {
 
@@ -1,6 +1,6 @@
 {
   "name": "polkaswap-exchange-web",
-  "version": "1.26.1",
+  "version": "1.27.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/sora-xor/polkaswap-exchange-web.git"
@@ -24,8 +24,8 @@
   },
   "dependencies": {
     "@metamask/detect-provider": "^2.0.0",
-    "@soramitsu/soraneo-wallet-web": "1.26.5",
-    "@walletconnect/ethereum-provider": "^2.10.4",
+    "@soramitsu/soraneo-wallet-web": "1.27.3",
+    "@walletconnect/ethereum-provider": "^2.11.0",
     "@walletconnect/modal": "^2.6.2",
     "core-js": "^3.33.2",
     "country-code-emoji": "^2.3.0",
 
@@ -34,7 +34,7 @@
       "address": "wss://ws.framenode-3.r0.dev.sora2.soramitsu.co.jp"
     }
   ],
-  "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-dev",
+  "SUBQUERY_ENDPOINT": "https://subquery.sq1.dev.sora2.soramitsu.co.jp",
   "SUBSQUID_ENDPOINT": "https://squid.subsquid.io/sora-dev/v/v1/graphql",
   "NETWORK_TYPE": "Dev",
   "CHAIN_GENESIS_HASH": "",
 
@@ -411,6 +411,8 @@ ul ul {
 .app {
   .el-loading-mask {
     background-color: var(--s-color-utility-body);
+    z-index: $app-loader-layer;
+
     .el-loading-spinner {
       background-image: url('~@/assets/img/pswap-loader.svg');
       height: var(--s-size-medium);
@@ -508,34 +510,11 @@ ul ul {
     animation: none;
   }
 }
+
 .el-form--actions {
   display: flex;
   flex-direction: column;
   align-items: center;
-
-  $swap-input-class: '.el-input';
-  .s-input--token-value,
-  .s-input-amount {
-    #{$swap-input-class} {
-      #{$swap-input-class}__inner {
-        padding-top: 0;
-      }
-    }
-    #{$swap-input-class}__inner {
-      @include text-ellipsis;
-      height: var(--s-size-small);
-      padding-right: 0;
-      padding-left: 0;
-      border-radius: 0 !important;
-      color: var(--s-color-base-content-primary);
-      font-size: var(--s-font-size-large);
-      line-height: var(--s-line-height-small);
-      font-weight: 800;
-    }
-    .s-placeholder {
-      display: none;
-    }
-  }
 }
 
 .el-message-box {
@@ -575,14 +554,15 @@ i.icon-divider {
   .app-main {
     &.app-main--swap.app-main--has-charts {
       .app-menu {
-        position: relative;
-      }
-    }
+        &:not(.collapsed) {
+          position: relative;
+        }
 
-    &.app-main--has-charts {
-      .app-content {
-        width: 100%;
-        padding-left: $basic-spacing * 2;
+        &.collapsed {
+          & + .app-body {
+            margin-left: 74px;
+          }
+        }
       }
     }
   }
@@ -594,7 +574,6 @@ i.icon-divider {
   &-main {
     display: flex;
     align-items: stretch;
-    overflow: hidden;
     height: calc(100vh - #{$header-height} - #{$footer-height});
     position: relative;
   }
@@ -612,8 +591,7 @@ i.icon-divider {
 
   &-content {
     flex: 1;
-    margin: $inner-spacing-big auto;
-    width: 100%;
+    padding: $inner-spacing-medium;
   }
 
   &-footer {
 
@@ -143,7 +143,7 @@ export default class AppHeaderMenu extends Mixins(TranslationMixin) {
         value: HeaderMenuType.Disclaimer,
         icon: 'info-16',
         text: this.disclaimerText,
-        disabled: this.discalimerDisabled,
+        disabled: this.disclaimerDisabled,
       },
     ];
   }
@@ -156,7 +156,7 @@ export default class AppHeaderMenu extends Mixins(TranslationMixin) {
     return this.getHeaderMenuItems(true);
   }
 
-  get discalimerDisabled(): boolean {
+  get disclaimerDisabled(): boolean {
     return this.disclaimerVisibility && !this.userDisclaimerApprove;
   }
 
@@ -181,7 +181,7 @@ export default class AppHeaderMenu extends Mixins(TranslationMixin) {
         this.setLanguageDialogVisibility(true);
         break;
       case HeaderMenuType.Disclaimer:
-        if (this.discalimerDisabled) return;
+        if (this.disclaimerDisabled) return;
         this.toggleDisclaimerDialogVisibility();
         break;
     }
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`"charts": true,`
`15`	`15`	`"soraCard": true`
`16`	`16`	`},`
`17`		`- "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-prod-sub4",`
	`17`	`+ "SUBQUERY_ENDPOINT": "https://subquery.q1.prd.sora2.soramitsu.co.jp",`
`18`	`18`	`"SUBSQUID_ENDPOINT": "",`
`19`	`19`	`"DEFAULT_NETWORKS": [`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`"address": "wss://ws.framenode-3.r0.dev.sora2.soramitsu.co.jp"`
`35`	`35`	`}`
`36`	`36`	`],`
`37`		`- "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-dev",`
	`37`	`+ "SUBQUERY_ENDPOINT": "https://subquery.sq1.dev.sora2.soramitsu.co.jp",`
`38`	`38`	`"SUBSQUID_ENDPOINT": "https://squid.subsquid.io/sora-dev/v/v1/graphql",`
`39`	`39`	`"NETWORK_TYPE": "Dev",`
`40`	`40`	`"CHAIN_GENESIS_HASH": "",`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ export default class AppHeaderMenu extends Mixins(TranslationMixin) {`
`143`	`143`	`value: HeaderMenuType.Disclaimer,`
`144`	`144`	`icon: 'info-16',`
`145`	`145`	`text: this.disclaimerText,`
`146`		`- disabled: this.discalimerDisabled,`
	`146`	`+ disabled: this.disclaimerDisabled,`
`147`	`147`	`},`
`148`	`148`	`];`
`149`	`149`	`}`
`@@ -156,7 +156,7 @@ export default class AppHeaderMenu extends Mixins(TranslationMixin) {`
`156`	`156`	`return this.getHeaderMenuItems(true);`
`157`	`157`	`}`
`158`	`158`
`159`		`- get discalimerDisabled(): boolean {`
	`159`	`+ get disclaimerDisabled(): boolean {`
`160`	`160`	`return this.disclaimerVisibility && !this.userDisclaimerApprove;`
`161`	`161`	`}`
`162`	`162`
`@@ -181,7 +181,7 @@ export default class AppHeaderMenu extends Mixins(TranslationMixin) {`
`181`	`181`	`this.setLanguageDialogVisibility(true);`
`182`	`182`	`break;`
`183`	`183`	`case HeaderMenuType.Disclaimer:`
`184`		`- if (this.discalimerDisabled) return;`
	`184`	`+ if (this.disclaimerDisabled) return;`
`185`	`185`	`this.toggleDisclaimerDialogVisibility();`
`186`	`186`	`break;`
`187`	`187`	`}`