fix conflict after merge

chainx-org · Feb 22, 2021 · 07c32ed · 07c32ed
2 parents 6c0896c + 4ec6109
commit 07c32ed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -79,8 +79,6 @@
     "@types/store": "^2.0.2",
     "@types/styled-components": "^5.1.4",
     "@types/styled-theming": "^2.2.5",
-    "ali-oss": "^6.13.2",
-    "aliosscdn-webpack-plugin": "^0.0.3",
     "concurrently": "^5.3.0",
     "devtron": "^1.4.0",
     "dnslink-cloudflare": "^3.0.0",

diff --git a/packages/apps-config/src/settings/endpoints.ts b/packages/apps-config/src/settings/endpoints.ts
@@ -67,9 +67,9 @@ function createLiveNetworks(t: TFunction): LinkOption[] {
     {
       dnslink: 'ChainX',
       info: 'ChainX',
-      text: t('Overseas Node'),
-      textBy: t('rpc.hosted.by', 'hosted by ChainX', { ns: 'apps-config', replace: { host: 'ChainX' } }),
-      value: 'wss://mainnet.chainx.org/ws'
+      text: t('Patract Node'),
+      textBy: t('rpc.hosted.by', 'hosted by Patract Elara', { ns: 'apps-config', replace: { host: 'ChainX' } }),
+      value: 'wss://chainx.elara.patract.io'
     }
   ];
 }

diff --git a/packages/apps/webpack.config.js b/packages/apps/webpack.config.js
@@ -27,6 +27,7 @@ module.exports = merge(
         inject: true,
         template: path.join(context, `${hasPublic ? 'public/' : ''}index.html`)
       }),
+      // }),
       // new AliosscdnWebpackPlugin({
       //   https: true,
       //   directoryInOss: 'v2.0.10',