Merge pull request #1389 from emeraldpay/feature/new-look

emeraldpay · Feb 3, 2025 · eb7137e · eb7137e
2 parents 182942a + da1aeb7
commit eb7137e
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 54 deletions.
diff --git a/README.adoc b/README.adoc
@@ -161,7 +161,7 @@ Email to security@emerald.cash
 
 == License
 
-Copyright 2023 EmeraldPay, Inc
+Copyright 2025 EmeraldPay
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
 

diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -1 +1 @@
-export const TERMS_VERSION = '2020-06-06';
+export const TERMS_VERSION = '2025-02-01';
diff --git a/packages/core/typings/ethereumjs-wallet/index.d.ts b/packages/core/typings/ethereumjs-wallet/index.d.ts
@@ -1,4 +1,5 @@
 /*
+Copyright 2025 EmeraldPay
 Copyright 2020 EmeraldPay, Inc
 Copyright 2019 ETCDEV GmbH
 

diff --git a/packages/desktop/package.json b/packages/desktop/package.json
@@ -18,7 +18,7 @@
     "Shane Jonas <jonas.shane@gmail.com>"
   ],
   "author": {
-    "name": "EmeraldPay, Inc",
+    "name": "EmeraldPay",
     "email": "info@emerald.cash"
   },
   "homepage": "https://emerald.cash",

diff --git a/packages/desktop/resources/icon.ico b/packages/desktop/resources/icon.ico
diff --git a/packages/desktop/resources/icon.png b/packages/desktop/resources/icon.png
diff --git a/packages/react-app/src/app/AboutDialog/About/About.tsx b/packages/react-app/src/app/AboutDialog/About/About.tsx
@@ -83,7 +83,7 @@ class About extends React.Component<Props> {
               https://emerald.cash
             </a>
           </div>
-          <div className={classes.infoBlock}>Copyright &copy; {About.year} EmeraldPay, Inc</div>
+          <div className={classes.infoBlock}>Copyright &copy; {About.year} EmeraldPay</div>
           <div>
             Licensed under{' '}
             <a onClick={onLicenseClick} className={classes.infoLink} href="#">

diff --git a/packages/react-app/src/app/onboarding/InitialSetup/Terms/Terms.tsx b/packages/react-app/src/app/onboarding/InitialSetup/Terms/Terms.tsx
@@ -10,7 +10,7 @@ interface IProps {
 export const Terms = ({ onAgree }: IProps) => {
   const style: React.CSSProperties = {
     width: '100%',
-    height: '250px',
+    height: '400px',
     overflowY: 'scroll'
   };
 
@@ -20,11 +20,11 @@ export const Terms = ({ onAgree }: IProps) => {
         <div style={style}>
           <p>
             End-User License Agreement for Emerald Wallet<br/>
-            Last updated: 6 June 2020
+            Last updated: 1 February 2025
           </p>
           <p>
             This End-User License Agreement (&quot;EULA&quot; or &quot;AGREEMENT&quot;) is a legal agreement between
-            you (either an individual or a single entity) and EmeraldPay, Inc (&quot;COMPANY&quot;), including all
+            you (either an individual or a single entity) and EmeraldPay (&quot;COMPANY&quot;), including all
             contributors to source code of this Software identified above, which includes computer software and
             may include associated media, printed materials, and “online” or electronic documentation (“SOFTWARE”).
           </p>

diff --git a/packages/ui/src/components/common/Logo/Logo.tsx b/packages/ui/src/components/common/Logo/Logo.tsx
@@ -6,25 +6,9 @@ interface ILogoProps {
 }
 
 const Logo = (props: ILogoProps) => (
-  <svg xmlns="http://www.w3.org/2000/svg" width={props.width || '64'} height={props.height || '64'} viewBox="0 0 64 64">
-    <path
-      d="M36.3,48.53c-7.84,4.47-16.4,4.74-21.57.12l-.05,0A23.86,23.86,0,0,1,8.11,34.25a6.41,6.41,0,0,0,1.74,3.6c2.87,2.87,8.42,2.29,14.15-1A45,45,0,0,0,36.3,48.53Z"
-      fill="#0aa444"/>
-    <path
-      d="M48.53,36.3A45.1,45.1,0,0,0,36.88,24c3.26-5.73,3.84-11.29,1-14.16a6.41,6.41,0,0,0-3.6-1.74A23.86,23.86,0,0,1,48.6,14.68l0,.05C53.27,19.9,53,28.46,48.53,36.3Z"
-      fill="#03c94e"/>
-    <path d="M56,32V56l-1.87-7a45.19,45.19,0,0,0-5.6-12.7c4.47-7.84,4.74-16.4.12-21.57A23.91,23.91,0,0,1,56,32Z"
-          fill="#07b749"/>
-    <path d="M56,56H32a23.91,23.91,0,0,1-17.27-7.35C19.9,53.27,28.46,53,36.3,48.53A45.19,45.19,0,0,0,49,54.13Z"
-          fill="#0e923f"/>
-    <path
-      d="M48.53,36.3A33.82,33.82,0,0,1,36.3,48.53,45,45,0,0,1,24,36.88a34.31,34.31,0,0,0,7.27-5.61A34.85,34.85,0,0,0,36.88,24,45.1,45.1,0,0,1,48.53,36.3Z"
-      fill="#07b749"/>
-    <path d="M56,56l-7-1.87a45.19,45.19,0,0,1-12.7-5.6A33.82,33.82,0,0,0,48.53,36.3,45.19,45.19,0,0,1,54.13,49Z"
-          fill="#0aa444"/>
-    <path d="M14.68,48.6c-.15-.13-.3-.28-.44-.42" fill="#222"/>
-    <path d="M48.6,14.68c-.13-.15-.28-.3-.42-.44" fill="#222"/>
-    <ellipse cx="23.85" cy="23.85" rx="19.8" ry="10.49" transform="translate(-9.88 23.85) rotate(-45)" fill="#00dc53"/>
+  <svg xmlns="http://www.w3.org/2000/svg" width={props.width || '64'} height={props.height || '64'} viewBox="0 0 320 480" fill="none" >
+    <path d="M0 320L160 480L320 320L0 160V320Z" fill="#32D486"/>
+    <path d="M160 0L0 80L320 320V80L160 0Z" fill="#32D486"/>
   </svg>
 );
 

diff --git a/packages/ui/src/theme/colors.ts b/packages/ui/src/theme/colors.ts
@@ -1,4 +1,5 @@
 /*
+Copyright 2025 EmeraldPay
 Copyright 2020 EmeraldPay, Inc
 Copyright 2019 ETCDEV GmbH
 
@@ -14,32 +15,33 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-const white = {
-  main: '#FFFFFF'
-};
+const white = { main: '#FFFFFF' };
+const black = { main: '#1D1D1E' };
+const red = { main: '#FB285A' };
 
 const emerald = {
-  main: '#00C853',
+  main: '#32D486',
   contrastText: white.main
 };
 
-const ash = {
-  main: '#B1BFB7',
-  contrastText: white.main
-};
-
-const conch = {
-  main: '#EAEFEC'
-};
+const grey50 = { main: '#F4F4F4' }
+const grey100 = { main: '#E5E5E7' }
+const grey200 = { main: '#D2D2D2' }
+const grey500 = { main: '#8E8E8E' }
+const grey800 = { main: '#4A4A4B' }
+const grey900 = { main: '#343435' }
 
 const colors = {
   emerald,
-  ash,
   white,
-  conch,
-  snow: '#F7F9F8',
-  ruby: '#F41A2D',
-  coal: '#222222'
+  black,
+  red,
+  grey50,
+  grey100,
+  grey200,
+  grey500,
+  grey800,
+  grey900,
 };
 
 export default colors;
diff --git a/packages/ui/src/theme/index.spec.ts b/packages/ui/src/theme/index.spec.ts
@@ -1,4 +1,5 @@
 /*
+Copyright 2025 EmeraldPay
 Copyright 2020 EmeraldPay, Inc
 Copyright 2019 ETCDEV GmbH
 

diff --git a/packages/ui/src/theme/index.ts b/packages/ui/src/theme/index.ts
@@ -1,4 +1,5 @@
 /*
+Copyright 2025 EmeraldPay
 Copyright 2020 EmeraldPay, Inc
 Copyright 2019 ETCDEV GmbH
 
@@ -108,7 +109,7 @@ export default createTheme({
     },
     MuiList: {
       root: {
-        borderTop: `1px solid ${colors.conch.main}`,
+        borderTop: `1px solid ${colors.grey100.main}`,
       },
       padding: {
         paddingBottom: 0,
@@ -117,7 +118,7 @@ export default createTheme({
     },
     MuiListItem: {
       root: {
-        borderBottom: `1px solid ${colors.conch.main}`,
+        borderBottom: `1px solid ${colors.grey100.main}`,
         borderRight: 'none',
         borderLeft: 'none',
       },
@@ -138,7 +139,7 @@ export default createTheme({
     },
     MuiPaper: {
       root: {
-        border: `1px solid ${colors.conch.main}`,
+        border: `1px solid ${colors.grey100.main}`,
       },
       elevation3: {
         boxShadow: '0px 0px 10px rgba(0, 0, 0, 0.1)',
@@ -151,7 +152,7 @@ export default createTheme({
     },
     MuiTextField: {
       root: {
-        borderColor: colors.conch.main,
+        borderColor: colors.grey100.main,
         borderRadius: '1px',
         borderStyle: 'solid',
         borderWidth: '1px',
@@ -187,20 +188,20 @@ export default createTheme({
   palette: {
     action: {
       hover: 'none',
-      selected: colors.snow,
+      selected: colors.grey50.main,
     },
     background: {
-      default: colors.snow,
+      default: colors.grey50.main,
     },
-    divider: colors.conch.main,
+    divider: colors.grey100.main,
     error: {
-      main: colors.ruby,
+      main: colors.red.main,
     },
     primary: colors.emerald,
-    secondary: colors.ash,
+    secondary: colors.grey200,
     text: {
-      primary: colors.coal,
-      secondary: colors.ash.main,
+      primary: colors.grey900.main,
+      secondary: colors.grey200.main,
     },
   },
   props: {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const TERMS_VERSION = '2020-06-06';
		export const TERMS_VERSION = '2025-02-01';