From 1cbb5d076f1bfa9419eb122866bbe068d0122bb4 Mon Sep 17 00:00:00 2001
From: vidvidvid <weetopol@gmail.com>
Date: Sun, 6 Feb 2022 14:48:43 +0100
Subject: [PATCH] style: replace cancel icon, fix mobile view of edit buttons

---
 packages/web/pages/dashboard.tsx         |  8 ++---
 packages/web/pages/player/[username].tsx | 37 ++++++++++++------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/packages/web/pages/dashboard.tsx b/packages/web/pages/dashboard.tsx
index 71d32852..1cf5e65f 100644
--- a/packages/web/pages/dashboard.tsx
+++ b/packages/web/pages/dashboard.tsx
@@ -4,9 +4,9 @@ import 'react-resizable/css/styles.css';
 import {
   Box,
   ButtonGroup,
-  DeleteIcon,
   EditIcon,
   MetaButton,
+  RepeatClockIcon,
 } from '@metafam/ds';
 import { PageContainer } from 'components/Container';
 import { Calendar } from 'components/Dashboard/Calendar';
@@ -110,7 +110,7 @@ export const Grid = (): ReactElement => {
       >
         {(changed || ownLayout) && editable && (
           <MetaButton
-            aria-label="Edit layout"
+            aria-label="Reset to default"
             colorScheme="purple"
             textTransform="uppercase"
             px={12}
@@ -120,9 +120,9 @@ export const Grid = (): ReactElement => {
             bg="transparent"
             color="purple.400"
             onClick={handleReset}
-            leftIcon={<DeleteIcon />}
+            leftIcon={<RepeatClockIcon />}
           >
-            Reset
+            Reset to default
           </MetaButton>
         )}
         <MetaButton
diff --git a/packages/web/pages/player/[username].tsx b/packages/web/pages/player/[username].tsx
index dae4dedd..e52c7cca 100644
--- a/packages/web/pages/player/[username].tsx
+++ b/packages/web/pages/player/[username].tsx
@@ -4,7 +4,7 @@ import 'react-resizable/css/styles.css';
 import {
   Box,
   ButtonGroup,
-  DeleteIcon,
+  CloseIcon,
   EditIcon,
   Flex,
   LoadingState,
@@ -221,7 +221,7 @@ export const Grid: React.FC<Props> = ({
     setCanEdit(false);
   }, [savedLayoutData]);
 
-  const handleDefault = useCallback(() => {
+  const handleReset = useCallback(() => {
     setCurrentLayoutData(enableAddBoxInLayoutData(DEFAULT_PLAYER_LAYOUT_DATA));
   }, []);
 
@@ -341,6 +341,22 @@ export const Grid: React.FC<Props> = ({
           h="3rem"
           mb="1rem"
         >
+          {changed && canEdit && !isDefaultLayout && (
+            <MetaButton
+              aria-label="Reset to default"
+              _hover={{ background: 'purple.600' }}
+              textTransform="uppercase"
+              px={12}
+              letterSpacing="0.1em"
+              size="lg"
+              fontSize="sm"
+              onClick={handleReset}
+              leftIcon={<RepeatClockIcon />}
+              whiteSpace="pre-wrap"
+            >
+              Reset to default
+            </MetaButton>
+          )}
           {changed && canEdit && (
             <MetaButton
               aria-label="Cancel edit layout"
@@ -351,26 +367,11 @@ export const Grid: React.FC<Props> = ({
               size="lg"
               fontSize="sm"
               onClick={handleCancel}
-              leftIcon={<DeleteIcon />}
+              leftIcon={<CloseIcon />}
             >
               Cancel
             </MetaButton>
           )}
-          {changed && canEdit && !isDefaultLayout && (
-            <MetaButton
-              aria-label="Reset to default"
-              _hover={{ background: 'purple.600' }}
-              textTransform="uppercase"
-              px={12}
-              letterSpacing="0.1em"
-              size="lg"
-              fontSize="sm"
-              onClick={handleDefault}
-              leftIcon={<RepeatClockIcon />}
-            >
-              Reset to default
-            </MetaButton>
-          )}
           <MetaButton
             aria-label="Edit layout"
             borderColor="transparent"