Merge branch 'develop' into feat-multisig-address

nervosnetwork · Jun 26, 2023 · 3e1f02f · 3e1f02f
2 parents 039f68b + aef5fa3
commit 3e1f02f
Show file tree

Hide file tree

Showing 16 changed files with 124 additions and 90 deletions.
diff --git a/packages/neuron-ui/src/components/DataSetting/dataSetting.module.scss b/packages/neuron-ui/src/components/DataSetting/dataSetting.module.scss
@@ -13,6 +13,8 @@
       align-items: center;
       svg {
         margin: 4px 0 0 4px;
+        cursor: pointer;
+
         g,
         path {
           fill: var(--main-text-color);

diff --git a/packages/neuron-ui/src/components/GeneralSetting/generalSetting.module.scss b/packages/neuron-ui/src/components/GeneralSetting/generalSetting.module.scss
@@ -29,11 +29,7 @@ $action-button-width: 11.25rem;
       display: flex;
       align-items: center;
       svg {
-        margin-left: 4px;
-        g,
-        path {
-          stroke: var(--secondary-text-color);
-        }
+        margin-right: 4px;
       }
     }
   }
@@ -106,26 +102,26 @@ $action-button-width: 11.25rem;
     font-size: 16px;
     line-height: 22px;
     margin: 0 0 32px;
-    color: var(--main-text-color)
+    color: var(--main-text-color);
   }
   .note {
     font-size: 14px;
     line-height: 22px;
     margin: 22px 0 0;
-    color: var(--main-text-color)
+    color: var(--main-text-color);
   }
   progress {
     width: 100%;
     height: 8px;
     background: var(--process-background-color);
     border-radius: 8px;
   }
-  progress::-webkit-progress-bar{     
+  progress::-webkit-progress-bar {
     background-color: var(--process-background-color);
     border-radius: 8px;
   }
   progress::-webkit-progress-value {
     background: var(--primary-color);
-    border-radius: 8px; 
+    border-radius: 8px;
   }
 }
diff --git a/packages/neuron-ui/src/components/GeneralSetting/index.tsx b/packages/neuron-ui/src/components/GeneralSetting/index.tsx
@@ -4,8 +4,8 @@ import { useSearchParams } from 'react-router-dom'
 import Dialog from 'widgets/Dialog'
 import LanguageDialog from 'components/LanguageDialog'
 import { ReactComponent as VersionLogo } from 'widgets/Icons/VersionLogo.svg'
-import { ReactComponent as ArrowNext } from 'widgets/Icons/ArrowNext.svg'
 import { checkForUpdates, downloadUpdate, installUpdate, getVersion } from 'services/remote'
+import { LanguageSelect, CheckUpdateIcon } from 'widgets/Icons/icon'
 import styles from './generalSetting.module.scss'
 
 interface UpdateDowloadStatusProps {
@@ -136,7 +136,8 @@ const GeneralSetting = ({ updater }: GeneralSettingProps) => {
           {t('settings.general.version')} {version}
         </p>
         <button type="button" onClick={checkUpdates}>
-          {t(`updates.check-updates`)} <ArrowNext />
+          <CheckUpdateIcon />
+          {t(`updates.check-updates`)}
         </button>
       </div>
 
@@ -150,7 +151,8 @@ const GeneralSetting = ({ updater }: GeneralSettingProps) => {
             setShowLangDialog(true)
           }}
         >
-          {t(`settings.locale.${i18n.language}`)} <ArrowNext />
+          <LanguageSelect />
+          {t(`settings.locale.${i18n.language}`)}
         </button>
       </div>
 

diff --git a/packages/neuron-ui/src/components/History/history.module.scss b/packages/neuron-ui/src/components/History/history.module.scss
@@ -92,6 +92,7 @@ body {
         align-items: center;
         color: $history-button-color;
         gap: 5px;
+        cursor: pointer;
 
         &:hover {
           color: var(--primary-color);
@@ -121,6 +122,7 @@ body {
   }
 }
 .arrow {
+  cursor: pointer;
   transition: transform 0.1s ease-in-out;
 
   &:hover {

diff --git a/packages/neuron-ui/src/components/Overview/index.tsx b/packages/neuron-ui/src/components/Overview/index.tsx
@@ -288,6 +288,7 @@ const Overview = () => {
             title: t('overview.date'),
             dataIndex: 'date',
             align: 'left',
+            minWidth: '150px',
             render: (_, __, item) => {
               const time = uniformTimeFormatter(item.timestamp || item.createdAt)
               return time.split(' ')[0]
@@ -297,6 +298,7 @@ const Overview = () => {
             title: t('overview.type'),
             dataIndex: 'type',
             align: 'left',
+            minWidth: '250px',
             render(_, __, item) {
               return (
                 <TracsactionType
@@ -312,6 +314,7 @@ const Overview = () => {
             dataIndex: 'amount',
             align: 'left',
             isBalance: true,
+            minWidth: '300px',
             render(_, __, item, show) {
               return <Amount item={item} show={show} />
             },
@@ -320,6 +323,7 @@ const Overview = () => {
             title: t('overview.status'),
             dataIndex: 'status',
             align: 'left',
+            minWidth: '150px',
             render(_, __, item) {
               return (
                 <TransactionStatus

diff --git a/packages/neuron-ui/src/components/Overview/overview.module.scss b/packages/neuron-ui/src/components/Overview/overview.module.scss
@@ -12,7 +12,7 @@
   .balance {
     grid-area: balance;
     border-radius: 16px;
-    background-color: #26C786;
+    background-color: #26c786;
     position: relative;
     padding: 24px 16px;
     color: var(--primary-text-color);
@@ -46,6 +46,7 @@
 
       & > svg {
         margin-left: 8px;
+        cursor: pointer;
 
         path {
           fill: var(--svg-fill-color);
@@ -76,9 +77,9 @@
           fill: var(--primary-color);
         }
         :not(:first-child) {
-          fill: #14221C;
+          fill: #14221c;
         }
-     }
+      }
     }
   }
 }
@@ -98,8 +99,8 @@
     margin-right: 4px;
   }
 
-  &[data-status="failed"] {
-    color: #FF1E1E;
+  &[data-status='failed'] {
+    color: #ff1e1e;
   }
 }
 
@@ -135,7 +136,7 @@
 
   .linkToHistory {
     font-size: 14px;
-    color: #8DA394;
+    color: #8da394;
     cursor: pointer;
 
     &:hover {

diff --git a/packages/neuron-ui/src/containers/Navbar/navbar.module.scss b/packages/neuron-ui/src/containers/Navbar/navbar.module.scss
@@ -48,6 +48,7 @@ $hover-bg-color: #3cc68a4d;
       right: -14px;
       top: 50%;
       display: none;
+      cursor: pointer;
 
       &[data-expanded='false'] {
         transform: rotate(-180deg);
@@ -73,6 +74,7 @@ $hover-bg-color: #3cc68a4d;
   border: none;
   background: transparent;
   font-weight: 700;
+  cursor: pointer;
 
   span {
     color: var(--primary-color);
@@ -82,6 +84,7 @@ $hover-bg-color: #3cc68a4d;
     width: 0;
     flex: 1;
     text-align: left;
+    max-width: 90px;
   }
 }
 
@@ -120,12 +123,22 @@ $hover-bg-color: #3cc68a4d;
     border-radius: 4px;
     cursor: pointer;
 
+    &.buttonInTip {
+      color: var(--main-text-color);
+    }
+
     &:hover {
       @include activity;
+      &.buttonInTip {
+        color: var(--primary-color);
+      }
     }
 
     &.active {
       @include activity;
+      &.buttonInTip {
+        color: var(--primary-color);
+      }
       & .arrow {
         transform: rotate(90deg);
       }
@@ -168,7 +181,8 @@ $hover-bg-color: #3cc68a4d;
   }
 
   .buttonInTip {
-    padding: 10px 24px 10px 12px;
     height: 40px;
+    padding: unset;
+    margin: unset;
   }
 }
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
@@ -113,7 +113,7 @@
       }
     },
     "overview": {
-      "date": "日期",
+      "date": "時間",
       "type": "類型",
       "balance": "餘額",
       "recent-activities": "最近收支",

diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
@@ -113,7 +113,7 @@
       }
     },
     "overview": {
-      "date": "日期",
+      "date": "时间",
       "type": "类型",
       "balance": "余额",
       "recent-activities": "最近收支",

diff --git a/packages/neuron-ui/src/styles/mixin.scss b/packages/neuron-ui/src/styles/mixin.scss
@@ -154,10 +154,7 @@
   border-radius: 16px;
 }
 
-@mixin icon-hover-button(
-  $normalColor: var(--secondary-text-color),
-  $hoverColor: var(--primary-color)
-) {
+@mixin icon-hover-button($normalColor: var(--secondary-text-color), $hoverColor: var(--primary-color)) {
   border: none;
   background: transparent;
   color: $normalColor !important;
@@ -206,8 +203,7 @@
     background: url('../widgets/Icons/CheckboxDisabled.svg') no-repeat left top;
 
     @media (prefers-color-scheme: dark) {
-      background: url('../widgets/Icons/CheckboxDisabledDark.svg') no-repeat
-        left top;
+      background: url('../widgets/Icons/CheckboxDisabledDark.svg') no-repeat left top;
     }
   }
 }
diff --git a/packages/neuron-ui/src/widgets/Icons/BalanceRight.svg b/packages/neuron-ui/src/widgets/Icons/BalanceRight.svg
diff --git a/packages/neuron-ui/src/widgets/Icons/CheckUpdateIcon.svg b/packages/neuron-ui/src/widgets/Icons/CheckUpdateIcon.svg