Merge branch 'development'

2 files changed, 4 insertions, 17 deletions

diff --git a/packages/react-shared/src/utils/colors.ts b/packages/react-shared/src/utils/colors.ts
index 7613414ae..7d047a50e 100644
--- a/packages/react-shared/src/utils/colors.ts
+++ b/packages/react-shared/src/utils/colors.ts
@@ -22,12 +22,12 @@ const baseColors = {
     heroGrey: '#404040',
     projectsGrey: '#343333',
     darkestGrey: '#272727',
-    dharmaDarkGrey: '#252525',
     lightBlue: '#60A4F4',
     lightBlueA700: '#0091EA',
     linkBlue: '#1D5CDE',
     mediumBlue: '#488AEA',
     darkBlue: '#4D5481',
+    lightTurquois: '#aefcdc',
     turquois: '#058789',
     lightPurple: '#A81CA6',
     purple: '#690596',
@@ -47,20 +47,7 @@ const baseColors = {
     darkYellow: '#caca03',
 };
 
-const appColors = {
-    // wallet specific colors
-    walletBoxShadow: 'rgba(56, 59, 137, 0.2)',
-    walletBorder: '#ededee',
-    walletDefaultItemBackground: '#fbfbfc',
-    walletFocusedItemBackground: '#f0f1f4',
-    allowanceToggleShadow: 'rgba(0, 0, 0, 0)',
-    allowanceToggleOffTrack: '#adadad',
-    allowanceToggleOnTrack: baseColors.mediumBlue,
-    wrapEtherConfirmationButton: baseColors.mediumBlue,
-};
-
 export const colors = {
     ...materialUiColors,
     ...baseColors,
-    ...appColors,
 };
diff --git a/packages/react-shared/src/utils/utils.ts b/packages/react-shared/src/utils/utils.ts
index 1538dd087..93c7e9f7b 100644
--- a/packages/react-shared/src/utils/utils.ts
+++ b/packages/react-shared/src/utils/utils.ts
@@ -7,7 +7,7 @@ import { EtherscanLinkSuffixes, Networks } from '../types';
 import { constants } from './constants';
 
 export const utils = {
-    setUrlHash(anchorId: string) {
+    setUrlHash(anchorId: string): void {
         window.location.hash = anchorId;
     },
     scrollToHash(hash: string, containerId: string): void {
@@ -26,11 +26,11 @@ export const utils = {
         const isUserOnMobile = isMobile();
         return isUserOnMobile;
     },
-    getIdFromName(name: string) {
+    getIdFromName(name: string): string {
         const id = name.replace(/ /g, '-');
         return id;
     },
-    convertDashesToSpaces(text: string) {
+    convertDashesToSpaces(text: string): string {
         return text.replace(/-/g, ' ');
     },
     getEtherScanLinkIfExists(