feat: Enhanced Dedaub support, automated workflows, fixed Ethereum ch…

…ain restriction, and resolved website list issue
blocksecteam · Sep 8, 2023 · 103497f · 103497f
1 parent 7e3e5a5
commit 103497f
Show file tree

Hide file tree

Showing 56 changed files with 756 additions and 357 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### v3.6.0
+
+- [feat] Improve MetaDock's Dedaub Support
+- [build] Configure GitHub Actions for automated workflows
+- [fix] Fix evm.storage to only support Ethereum chain
+- [fix] Fix the issue of the supported website list becoming invalid in the settings
+
 ### v3.5.0
 
 - [feat] Change logo

diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ yarn
 
 ### Chrome and Firefox
 
-- Build the project to the `/dist` folder with `yarn build:prod` or `yarn build-firefox:prod`.
+- Build the project to the `/dist/*` folder with `yarn build:prod` or `yarn build-firefox:prod`.
 
 ```shell
 # chrome
@@ -40,7 +40,7 @@ yarn build:prod
 yarn build-firefox:prod
 # safari
 yarn build-safari:prod
-xcrun safari-web-extension-converter --macos-only /path/to/metadock/dist
+xcrun safari-web-extension-converter --macos-only /path/to/metadock/dist/safari-extension
 ```
 
 - Optionally, you may run `yarn dev` to run dev mode.
@@ -57,7 +57,7 @@ To build the extension for distribution, or to run it locally for testing purpos
 # step 1
 yarn build-safari:prod
 # step 2
-xcrun safari-web-extension-converter --macos-only /path/to/metadock/dist
+xcrun safari-web-extension-converter --macos-only /path/to/metadock/dist/safari-extension
 ```
 
 For more information on building and debugging Safari extensions, see the [official documentation](https://developer.apple.com/documentation/safariservices/safari_web_extensions/).

diff --git a/build/firefox.js b/build/firefox.js
@@ -66,15 +66,17 @@ function main() {
   // Copy background.html to dist/
   fs.cp(
     path.join(__dirname, './', 'background.html'),
-    path.join(__dirname, '../dist', 'background.html'),
+    path.join(__dirname, '../dist/firefox-extension', 'background.html'),
     err => {
       if (err) throw err
     }
   )
 
   // Smooth out the differences in the configuration file: chrome v3 => firefox v2
   // TODO: Upgrade to firefox v3
-  defineFirefoxManifestV2(path.join(__dirname, '../dist', 'manifest.json'))
+  defineFirefoxManifestV2(
+    path.join(__dirname, '../dist/firefox-extension', 'manifest.json')
+  )
 }
 
 main()
diff --git a/build/safari.js b/build/safari.js
@@ -36,15 +36,17 @@ function main() {
   // Copy background.html to dist/
   fs.cp(
     path.join(__dirname, './', 'background.html'),
-    path.join(__dirname, '../dist', 'background.html'),
+    path.join(__dirname, '../dist/safari-extension', 'background.html'),
     err => {
       if (err) throw err
     }
   )
 
   // Smooth out the differences in the configuration file: chrome v3 => firefox v2
   // TODO: Upgrade to firefox v3
-  defineSafariManifestV2(path.join(__dirname, '../dist', 'manifest.json'))
+  defineSafariManifestV2(
+    path.join(__dirname, '../dist/safari-extension', 'manifest.json')
+  )
 }
 
 main()
diff --git a/manifest.config.ts b/manifest.config.ts
@@ -4,7 +4,7 @@ import { ConfigEnv } from 'vite'
 import { version } from './package.json'
 
 export default defineManifest((env: ConfigEnv) => ({
-  name: 'MetaDock',
+  name: "MetaDock - Builders' Swiss Army Knife",
   description:
     'Improve the usability of blockchain explorers, including BTC.com, Etherscan, BscScan, and *scans of most EVM-compatible chains.',
   version: version,

diff --git a/package.json b/package.json
@@ -1,19 +1,20 @@
 {
   "name": "metadock",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/blocksecteam/metadock.git"
   },
   "type": "module",
   "scripts": {
     "dev": "vite --mode development",
-    "build:prod": "vite build --mode production",
-    "build:test": "vite build --mode test",
-    "build-firefox:prod": "yarn build:prod && node build/firefox.js",
-    "build-firefox:test": "yarn build:test && node build/firefox.js",
-    "build-safari:prod": "yarn build:prod && node build/safari.js",
-    "build-safari:test": "yarn build:test && node build/safari.js",
+    "build:prod": "vite build --mode production --outDir dist/chrome-extension",
+    "build:test": "vite build --mode test --outDir dist/chrome-extension",
+    "build-firefox:prod": "vite build --mode production --outDir dist/firefox-extension && node build/firefox.js",
+    "build-firefox:test": "vite build --mode test --outDir dist/firefox-extension && node build/firefox.js",
+    "build-safari:prod": "vite build --mode production --outDir dist/safari-extension && node build/safari.js",
+    "build-safari:test": "vite build --mode test --outDir dist/safari-extension && node build/safari.js",
+    "build:all": "yarn build:prod & yarn build-firefox:prod & yarn build-safari:prod",
     "stylelint": "stylelint \"**/*.{css,scss,less}\"",
     "stylelint:fix": "stylelint \"**/*.{css,scss,less}\" --fix",
     "prepare": "husky install && husky set .husky/pre-commit \"npx lint-staged\" && husky set .husky/commit-msg 'npx --no -- commitlint --edit \"$1\"'",

diff --git a/src/assets/images/logo-circle.png b/src/assets/images/logo-circle.png
diff --git a/src/assets/images/logo-pure.png b/src/assets/images/logo-pure.png
diff --git a/src/common/components/Cell/cell.tsx b/src/common/components/Cell/cell.tsx
@@ -17,31 +17,41 @@ export interface CellProps extends BaseComponent {
 }
 
 const Cell: FC<CellProps> = props => {
-  const { title, desc, action, icon, border = true, pointer, onClick } = props
+  const {
+    className,
+    style,
+    title,
+    desc,
+    action,
+    icon,
+    border = true,
+    pointer,
+    onClick
+  } = props
 
   return (
-    <div className={styles.container} onClick={onClick}>
-      <div
-        className={cls(styles.content, {
-          [styles.border]: border,
-          [styles.pointer]: pointer ? pointer : !action
-        })}
-      >
-        <div className="align-center">
-          {icon && <img className={styles.icon} src={icon} alt="" />}
-          <div className={styles.title}>
-            <span style={{ fontSize: desc ? '14px' : '12px' }}>{title}</span>
-            {desc && <span>{desc}</span>}
-          </div>
+    <div
+      className={cls(styles.container, className, {
+        [styles.border]: border,
+        [styles.pointer]: pointer ? pointer : action === undefined
+      })}
+      style={style}
+      onClick={onClick}
+    >
+      <div className="align-center flex1">
+        {icon && <img className={styles.icon} src={icon} alt="" />}
+        <div className={cls(styles.title, 'flex1')}>
+          <span style={{ fontSize: desc ? '14px' : '12px' }}>{title}</span>
+          {desc && <span>{desc}</span>}
         </div>
-        {action ? (
-          <div className={styles.action}>{action}</div>
-        ) : (
-          <div className={styles.iconContainer}>
-            <Iconfont type="icon-arrow-right" />
-          </div>
-        )}
       </div>
+      {action !== undefined ? (
+        <div className={styles.action}>{action}</div>
+      ) : (
+        <div className={styles.iconContainer}>
+          <Iconfont type="icon-arrow-right" />
+        </div>
+      )}
     </div>
   )
 }

diff --git a/src/common/components/Cell/index.module.less b/src/common/components/Cell/index.module.less
@@ -1,44 +1,42 @@
 @import '@common/styles/common.less';
 
 .container {
-  .content {
-    padding: 12px 20px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 12px;
-    line-height: 15px;
-    &.border {
-      border-bottom: 1px solid #f0f0f2;
-    }
-    &.pointer {
-      cursor: pointer;
-    }
-    .icon {
-      width: 40px;
-      height: 40px;
-      margin-right: 14px;
-    }
-    .title {
-      .flex-column;
-      span {
-        font-size: 14px;
-        &:nth-of-type(1) {
-          font-weight: 400;
-          color: #000000;
-          line-height: 17px;
-        }
-        &:nth-of-type(2) {
-          color: #747478;
-          line-height: 17px;
-          margin-top: 3px;
-        }
+  padding: 12px 20px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 12px;
+  line-height: 15px;
+  &.border {
+    border-bottom: 1px solid #f0f0f2;
+  }
+  &.pointer {
+    cursor: pointer;
+  }
+  .icon {
+    width: 40px;
+    height: 40px;
+    margin-right: 14px;
+  }
+  .title {
+    .flex-column;
+    span {
+      font-size: 14px;
+      &:nth-of-type(1) {
+        font-weight: 400;
+        color: #000000;
+        line-height: 17px;
+      }
+      &:nth-of-type(2) {
+        color: #747478;
+        line-height: 17px;
+        margin-top: 3px;
       }
     }
-    .iconContainer {
-      width: 22px;
-      height: 22px;
-      .center;
-    }
+  }
+  .iconContainer {
+    width: 22px;
+    height: 22px;
+    .center;
   }
 }
diff --git a/src/common/components/RarityLabel/index.module.less b/src/common/components/RarityLabel/index.module.less
@@ -15,7 +15,7 @@
       div {
         transform: translateY(-14px);
       }
-      img {
+      .icon {
         transform: translateY(0);
       }
     }
@@ -27,6 +27,7 @@
     overflow: hidden;
     position: relative;
     margin-right: 3px;
+    .align-center;
 
     div {
       opacity: 1;
@@ -37,7 +38,7 @@
       transition: transform 0.2s ease-out 0s, opacity 0.2s ease-out 0s;
       .center;
     }
-    img {
+    .icon {
       height: 14px;
       width: 14px;
       position: absolute;

diff --git a/src/common/components/RarityLabel/index.tsx b/src/common/components/RarityLabel/index.tsx
@@ -1,9 +1,9 @@
 import React, { type FC } from 'react'
 import { Tooltip, ConfigProvider } from 'antd'
 
-import { getImageUrl, numFormatter } from '@common/utils'
+import { numFormatter } from '@common/utils'
 import type { NFTRarityRankResItem } from '@common/api/types'
-import { IconArrow } from '@common/components'
+import { IconArrow, IconMetaDock } from '@common/components'
 
 import styles from './index.module.less'
 
@@ -46,7 +46,7 @@ const RarityLabel: FC<Props> = ({ data: { rank, total } }) => {
         <div className={styles.container}>
           <div className={styles.symbol}>
             <div>#</div>
-            <img src={getImageUrl('logo-pure')} alt="" />
+            <IconMetaDock className={styles.icon} />
           </div>
           <span>{numFormatter(rank.toString())}</span>
         </div>

diff --git a/src/common/components/TokenSymbol/index.tsx b/src/common/components/TokenSymbol/index.tsx
@@ -1,16 +1,18 @@
 import { type FC } from 'react'
 
-import { getImageUrl } from '@common/utils'
 import type { BaseComponent } from '@common/types'
+import { IconMetaDock } from '@common/components'
 
 interface Props extends BaseComponent {
   logo?: string
   size?: number
   mr?: number
   ml?: number
+  color?: string
 }
 
 const TokenSymbol: FC<Props> = ({
+  color,
   logo,
   style = {},
   size = 14,
@@ -29,13 +31,10 @@ const TokenSymbol: FC<Props> = ({
     style
   )
 
-  return (
-    <img
-      style={stylesheet}
-      className={className}
-      src={logo || getImageUrl('logo-circle')}
-      alt=""
-    />
+  return logo ? (
+    <img style={stylesheet} className={className} src={logo} alt="" />
+  ) : (
+    <IconMetaDock style={stylesheet} className={className} color={color} />
   )
 }