From 9e6e6e39cad430a0505526a168d587d98ba20438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Chy=C5=82a?= <chyla1988@gmail.com>
Date: Wed, 15 Mar 2023 09:12:07 +0100
Subject: [PATCH] Fix spacing in discounts (#3350)

* Fix spacing in discounts

* Remove not needed spaces in vouchers and sales
---
 .../components/SaleCreatePage/SaleCreatePage.tsx          | 6 ++----
 .../components/SaleDetailsPage/SaleDetailsPage.tsx        | 3 ---
 .../components/VoucherCreatePage/VoucherCreatePage.tsx    | 6 ------
 .../components/VoucherDetailsPage/VoucherDetailsPage.tsx  | 8 --------
 4 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/discounts/components/SaleCreatePage/SaleCreatePage.tsx b/src/discounts/components/SaleCreatePage/SaleCreatePage.tsx
index 679926c48..8413672bb 100644
--- a/src/discounts/components/SaleCreatePage/SaleCreatePage.tsx
+++ b/src/discounts/components/SaleCreatePage/SaleCreatePage.tsx
@@ -1,12 +1,12 @@
 import { validateSalePrice } from "@dashboard/channels/utils";
 import { TopNav } from "@dashboard/components/AppLayout/TopNav";
-import CardSpacer from "@dashboard/components/CardSpacer";
 import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard";
 import Form from "@dashboard/components/Form";
 import { DetailPageLayout } from "@dashboard/components/Layouts";
 import Metadata, { MetadataFormData } from "@dashboard/components/Metadata";
 import Savebar from "@dashboard/components/Savebar";
 import { createSaleChannelsChangeHandler } from "@dashboard/discounts/handlers";
+import { saleListUrl } from "@dashboard/discounts/urls";
 import { SALE_CREATE_FORM_ID } from "@dashboard/discounts/views/SaleCreate/consts";
 import {
   DiscountErrorFragment,
@@ -102,6 +102,7 @@ const SaleCreatePage: React.FC<SaleCreatePageProps> = ({
         return (
           <DetailPageLayout>
             <TopNav
+              href={saleListUrl()}
               title={intl.formatMessage({
                 id: "FWbv/u",
                 defaultMessage: "Create Discount",
@@ -115,16 +116,13 @@ const SaleCreatePage: React.FC<SaleCreatePageProps> = ({
                 errors={errors}
                 onChange={change}
               />
-              <CardSpacer />
               <SaleType data={data} disabled={disabled} onChange={change} />
-              <CardSpacer />
               <SaleValue
                 data={data}
                 disabled={disabled}
                 errors={errors}
                 onChange={handleChannelChange}
               />
-              <CardSpacer />
               <DiscountDates
                 data={data}
                 disabled={disabled}
diff --git a/src/discounts/components/SaleDetailsPage/SaleDetailsPage.tsx b/src/discounts/components/SaleDetailsPage/SaleDetailsPage.tsx
index 2a6cdd744..731fac9c4 100644
--- a/src/discounts/components/SaleDetailsPage/SaleDetailsPage.tsx
+++ b/src/discounts/components/SaleDetailsPage/SaleDetailsPage.tsx
@@ -191,9 +191,7 @@ const SaleDetailsPage: React.FC<SaleDetailsPageProps> = ({
                 errors={errors}
                 onChange={change}
               />
-              <CardSpacer />
               <SaleType data={data} disabled={disabled} onChange={change} />
-              <CardSpacer />
               <SaleValue
                 data={data}
                 disabled={disabled}
@@ -300,7 +298,6 @@ const SaleDetailsPage: React.FC<SaleDetailsPageProps> = ({
             </DetailPageLayout.Content>
             <DetailPageLayout.RightSidebar>
               <SaleSummary selectedChannelId={selectedChannelId} sale={sale} />
-              <CardSpacer />
               <ChannelsAvailabilityCard
                 managePermissions={[PermissionEnum.MANAGE_DISCOUNTS]}
                 allChannelsCount={allChannelsCount}
diff --git a/src/discounts/components/VoucherCreatePage/VoucherCreatePage.tsx b/src/discounts/components/VoucherCreatePage/VoucherCreatePage.tsx
index affa73ea7..74bca65ed 100644
--- a/src/discounts/components/VoucherCreatePage/VoucherCreatePage.tsx
+++ b/src/discounts/components/VoucherCreatePage/VoucherCreatePage.tsx
@@ -1,6 +1,5 @@
 import { ChannelVoucherData } from "@dashboard/channels/utils";
 import { TopNav } from "@dashboard/components/AppLayout/TopNav";
-import CardSpacer from "@dashboard/components/CardSpacer";
 import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard";
 import Form from "@dashboard/components/Form";
 import { DetailPageLayout } from "@dashboard/components/Layouts";
@@ -134,7 +133,6 @@ const VoucherCreatePage: React.FC<VoucherCreatePageProps> = ({
                 onChange={event => handleDiscountTypeChange(data, event)}
                 variant="create"
               />
-              <CardSpacer />
               <VoucherTypes
                 data={data}
                 disabled={disabled}
@@ -143,7 +141,6 @@ const VoucherCreatePage: React.FC<VoucherCreatePageProps> = ({
               />
               {data.discountType.toString() !== "SHIPPING" ? (
                 <>
-                  <CardSpacer />
                   <VoucherValue
                     data={data}
                     disabled={disabled}
@@ -154,7 +151,6 @@ const VoucherCreatePage: React.FC<VoucherCreatePageProps> = ({
                   />
                 </>
               ) : null}
-              <CardSpacer />
               <VoucherRequirements
                 data={data}
                 disabled={disabled}
@@ -162,7 +158,6 @@ const VoucherCreatePage: React.FC<VoucherCreatePageProps> = ({
                 onChannelChange={handleChannelChange}
                 onChange={change}
               />
-              <CardSpacer />
               <VoucherLimits
                 data={data}
                 initialUsageLimit={initialForm.usageLimit}
@@ -172,7 +167,6 @@ const VoucherCreatePage: React.FC<VoucherCreatePageProps> = ({
                 setData={set}
                 isNewVoucher
               />
-              <CardSpacer />
               <VoucherDates
                 data={data}
                 disabled={disabled}
diff --git a/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.tsx b/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.tsx
index cfde98290..7ec5d3e96 100644
--- a/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.tsx
+++ b/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.tsx
@@ -218,14 +218,12 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
                 onChange={change}
                 variant="update"
               />
-              <CardSpacer />
               <VoucherTypes
                 data={data}
                 disabled={disabled}
                 errors={errors}
                 onChange={event => handleDiscountTypeChange(data, event)}
               />
-              <CardSpacer />
               {data.discountType.toString() !== "SHIPPING" ? (
                 <VoucherValue
                   data={data}
@@ -236,7 +234,6 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
                   variant="update"
                 />
               ) : null}
-              <CardSpacer />
               {data.type === VoucherTypeEnum.SPECIFIC_PRODUCT &&
               data.discountType.toString() !== "SHIPPING" ? (
                 <>
@@ -306,7 +303,6 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
                   )}
                 </>
               ) : null}
-              <CardSpacer />
               {data.discountType.toString() === "SHIPPING" ? (
                 <CountryList
                   countries={voucher?.countries}
@@ -334,7 +330,6 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
                   onCountryUnassign={onCountryUnassign}
                 />
               ) : null}
-              <CardSpacer />
               <VoucherRequirements
                 data={data}
                 disabled={disabled}
@@ -342,7 +337,6 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
                 onChange={change}
                 onChannelChange={handleChannelChange}
               />
-              <CardSpacer />
               <VoucherLimits
                 data={data}
                 initialUsageLimit={initialForm.usageLimit}
@@ -352,7 +346,6 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
                 setData={set}
                 isNewVoucher={false}
               />
-              <CardSpacer />
               <DiscountDates
                 data={data}
                 disabled={disabled}
@@ -366,7 +359,6 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
                 voucher={voucher}
                 selectedChannelId={selectedChannelId}
               />
-              <CardSpacer />
               <ChannelsAvailabilityCard
                 managePermissions={[PermissionEnum.MANAGE_DISCOUNTS]}
                 allChannelsCount={allChannelsCount}