Merge pull request #849 from Conflux-Chain/dev

feat: update outside link
Conflux-Chain · Oct 26, 2022 · b903908 · b903908
2 parents 6a482c2 + 8947598
commit b903908
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 15 deletions.
diff --git a/src/app/containers/Footer/index.tsx b/src/app/containers/Footer/index.tsx
@@ -112,16 +112,20 @@ export function Footer() {
       {t(translations.footer.fluentwallet)}
     </Link>
   );
-  const bountyLink = (
+  const hubLink = (
     <Link
       className="footer-link"
-      href="https://bounty.confluxnetwork.org"
+      href={
+        NETWORK_TYPE === NETWORK_TYPES.testnet
+          ? 'https://test.confluxhub.io/'
+          : 'https://confluxhub.io/'
+      }
       ga={{
         category: ScanEvent.menu.category,
-        action: ScanEvent.menu.action.confluxBounty,
+        action: ScanEvent.menu.action.hub,
       }}
     >
-      {t(translations.footer.confluxbounty)}
+      {t(translations.footer.hub)}
     </Link>
   );
   const privacyPolicy = (
@@ -382,9 +386,7 @@ export function Footer() {
           <FooterContentRow>
             <FooterContentLink>{websiteLink}</FooterContentLink>
             <FooterContentLink>{portalLink}</FooterContentLink>
-            {IS_FOREIGN_HOST && (
-              <FooterContentLink>{bountyLink}</FooterContentLink>
-            )}
+            <FooterContentLink>{hubLink}</FooterContentLink>
           </FooterContentRow>
         </FooterContent>
       </FooterContentWrapper>

diff --git a/src/app/containers/Header/index.tsx b/src/app/containers/Header/index.tsx
@@ -230,11 +230,11 @@ export const Header = memo(() => {
       afterClick: menuClick,
       href: iszh
         ? NETWORK_TYPE === NETWORK_TYPES.testnet
-          ? 'https://test.confluxhub.io/governance/dashboard'
-          : 'https://governance.confluxnetwork.org/zh/'
+          ? 'https://test.confluxhub.io/governance/'
+          : 'https://confluxhub.io/governance/'
         : NETWORK_TYPE === NETWORK_TYPES.testnet
-        ? 'https://test.confluxhub.io/governance/dashboard'
-        : 'https://governance.confluxnetwork.org/en/',
+        ? 'https://test.confluxhub.io/governance/'
+        : 'https://confluxhub.io/governance/',
     });
 
     contractItems.splice(2, 0, {

diff --git a/src/app/containers/NFTAsset/index.tsx b/src/app/containers/NFTAsset/index.tsx
@@ -302,7 +302,7 @@ export function NFTAsset({
               current={page}
               defaultPageSize={pageSize}
               total={paginationTotal}
-              pageSizeOptions={['12', '24', '60', '120']}
+              pageSizeOptions={['12', '24', '60']}
               onChange={handlePaginationChange}
             />
           </NFTWrapper>

diff --git a/src/index.tsx b/src/index.tsx
@@ -61,7 +61,7 @@ Promise.all([completeDetect()]).then(() => {
   render(App);
 });
 
-const currentVersion = 'v2.16.0';
+const currentVersion = 'v2.16.2';
 
 const brand = `
 ┌─┐┌─┐┌┐┌┌─┐┬  ┬ ┬─┐ ┬  ┌─┐┌─┐┌─┐┌┐┌ ${currentVersion}

diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
@@ -460,7 +460,7 @@
     "stakingAndGovernance": "Staking & Governance",
     "developerAPI": "API Documentation",
     "fcCfx": "FC-CFX Non-reversible Exchange",
-    "crossSpace": "Conflux Hub",
+    "crossSpace": "ConfluxHub",
     "more": "More",
     "tools": "Tools",
     "balanceChecker": "Balance Checker",
@@ -524,6 +524,7 @@
     "confluxnetwork": "Conflux Network",
     "fluentwallet": "Fluent Wallet",
     "confluxbounty": "ConfluxBounty",
+    "hub": "ConfluxHub",
     "copryRight": "© 2022 Conflux. All Rights Reserved.",
     "tool": "Tool",
     "addressFormatConversion": "Address Format Conversion",

diff --git a/src/locales/zh_cn/translation.json b/src/locales/zh_cn/translation.json
@@ -459,7 +459,7 @@
     "stakingAndGovernance": "质押 & 治理",
     "developerAPI": "API 文档",
     "fcCfx": "FC-CFX 不可逆兑换",
-    "crossSpace": "Conflux Hub",
+    "crossSpace": "ConfluxHub",
     "more": "更多",
     "tools": "工具",
     "balanceChecker": "余额检索器",
@@ -523,6 +523,7 @@
     "confluxnetwork": "Conflux Network",
     "fluentwallet": "Fluent Wallet",
     "confluxbounty": "ConfluxBounty",
+    "hub": "ConfluxHub",
     "copryRight": "© 2022 Conflux. All Rights Reserved.",
     "tool": "工具",
     "addressFormatConversion": "地址格式转换",

diff --git a/src/utils/gaConstants.ts b/src/utils/gaConstants.ts
@@ -24,6 +24,7 @@ export const ScanEvent = {
       confluxNetwork: 'official_website',
       fluentWallet: 'portal',
       confluxBounty: 'bounty',
+      hub: 'confluxhub',
       addressConverter: 'address_converter',
       faucet: 'faucet',
       tools: 'tools',