fix(dao): add version label, fix styles (#1098)

Co-authored-by: Overzunov <[email protected]>
near-daos · May 20, 2022 · 9ddddfc · 9ddddfc
1 parent 1758822
commit 9ddddfc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/astro_2.0/components/CreationProgress/CreationProgress.tsx b/astro_2.0/components/CreationProgress/CreationProgress.tsx
@@ -55,6 +55,7 @@ export const CreationProgress: VFC<CreationProgressProps> = ({
 
         return (
           <CreationProgressStep
+            key={value}
             label={label}
             value={value}
             isCurrent={isCurrent}

diff --git a/astro_2.0/features/DaoDashboardHeader/DaoDashboardHeader.tsx b/astro_2.0/features/DaoDashboardHeader/DaoDashboardHeader.tsx
@@ -9,6 +9,7 @@ import { JoinDaoButton } from 'astro_2.0/features/DaoDashboardHeader/components/
 import { FollowButton } from 'astro_2.0/features/DaoDashboardHeader/components/FollowButton';
 import { DaoLogo } from 'astro_2.0/features/DaoDashboardHeader/components/DaoLogo';
 import { ShowMoreLinks } from 'astro_2.0/features/DaoDashboardHeader/components/DaoLinks/components/ShowMoreLinks';
+import { CopyButton } from 'astro_2.0/components/CopyButton';
 
 import { useWalletContext } from 'context/WalletContext';
 import { UserPermissions } from 'types/context';
@@ -45,6 +46,7 @@ export const DaoDashboardHeader: FC<DaoDashboardHeaderProps> = ({
     members,
     description,
     links,
+    daoVersion,
   } = dao;
   const { accountId } = useWalletContext();
   const { t } = useTranslation();
@@ -70,6 +72,17 @@ export const DaoDashboardHeader: FC<DaoDashboardHeaderProps> = ({
         }}
       >
         <DaoLogo src={flagLogo} className={styles.logo} />
+        {daoVersion && (
+          <div className={styles.currentDaoVersion}>
+            DAO Version:&nbsp;<b>{daoVersion?.version.join('.')}</b>
+            <CopyButton
+              defaultTooltip="Copy hash"
+              text={daoVersion.hash}
+              className={styles.copyHash}
+              iconClassName={styles.copyIcon}
+            />
+          </div>
+        )}
       </section>
 
       <section className={styles.usersSection}>

diff --git a/astro_2.0/features/DaoDashboardHeader/tests/mocks.ts b/astro_2.0/features/DaoDashboardHeader/tests/mocks.ts
@@ -12,6 +12,7 @@ export const dao = ({
   description: daoDescription,
   links: ['DL1', 'DL2'],
   daoVersion: {
+    version: [2, 0],
     hash: 'qwerty',
   },
 } as unknown) as DAO;
diff --git a/astro_2.0/features/ViewProposal/components/SaveFcTemplate/SaveFcTemplate.module.scss b/astro_2.0/features/ViewProposal/components/SaveFcTemplate/SaveFcTemplate.module.scss
@@ -2,7 +2,7 @@
 
 .root {
   align-items: center;
-  background-color: var(--color-primary-50);
+  background-color: var(--color-brand-black);
   border-radius: 4px 4px 0 0;
   color: var(--color-white);
   display: flex;