From 514011980077f383cafb14f65e34dbaa634f4d57 Mon Sep 17 00:00:00 2001 From: jiohjung98 Date: Sat, 27 Jan 2024 22:41:22 +0900 Subject: [PATCH 1/6] =?UTF-8?q?design:=20=EC=A0=95=EC=82=B0=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/settlemented-admin.svg | 4 ++++ .../SettlementsSetting/SettlementsHeader/index.tsx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 src/assets/icons/settlemented-admin.svg diff --git a/src/assets/icons/settlemented-admin.svg b/src/assets/icons/settlemented-admin.svg new file mode 100644 index 00000000..ffbce491 --- /dev/null +++ b/src/assets/icons/settlemented-admin.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/components/Settlements/SettlementsLeft/SettlementsSetting/SettlementsHeader/index.tsx b/src/components/Settlements/SettlementsLeft/SettlementsSetting/SettlementsHeader/index.tsx index 7da700a6..22026bdf 100644 --- a/src/components/Settlements/SettlementsLeft/SettlementsSetting/SettlementsHeader/index.tsx +++ b/src/components/Settlements/SettlementsLeft/SettlementsSetting/SettlementsHeader/index.tsx @@ -1,7 +1,7 @@ import styled from '@emotion/styled'; import { useState } from 'react'; -import settlementsAdminIcon from '@assets/icons/settlements-admin.svg'; +import settlementsAdminIcon from '@assets/icons/settlemented-admin.svg'; import informationIcon from '@assets/icons/information-circle-outline.svg'; import SettlementsPopup from './SettlementsPopup'; import theme from '@styles/theme'; From c6d2fabff331aa4ee9ed89029eafe4da67981e74 Mon Sep 17 00:00:00 2001 From: jiohjung98 Date: Sun, 28 Jan 2024 17:20:04 +0900 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=ED=8C=9D=EC=97=85=20=20=ED=81=B4?= =?UTF-8?q?=EB=A6=AD=20=EC=8B=9C=20=ED=8C=9D=EC=97=85=20=EB=8B=AB=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettlementsHeader/index.tsx | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/components/Settlements/SettlementsLeft/SettlementsSetting/SettlementsHeader/index.tsx b/src/components/Settlements/SettlementsLeft/SettlementsSetting/SettlementsHeader/index.tsx index 22026bdf..8152076c 100644 --- a/src/components/Settlements/SettlementsLeft/SettlementsSetting/SettlementsHeader/index.tsx +++ b/src/components/Settlements/SettlementsLeft/SettlementsSetting/SettlementsHeader/index.tsx @@ -1,5 +1,5 @@ import styled from '@emotion/styled'; -import { useState } from 'react'; +import { useState, useEffect, useRef } from 'react'; import settlementsAdminIcon from '@assets/icons/settlemented-admin.svg'; import informationIcon from '@assets/icons/information-circle-outline.svg'; @@ -7,12 +7,26 @@ import SettlementsPopup from './SettlementsPopup'; import theme from '@styles/theme'; const SettlementsHeader = () => { - const [isPopupOpen, setIsPopupOpen] = useState(false) + const [isPopupOpen, setIsPopupOpen] = useState(false); + const ref = useRef(null); const handlePopupToggle = () => { setIsPopupOpen(!isPopupOpen); }; + useEffect(() => { + const handleClickOutside = (event: MouseEvent) => { + if (isPopupOpen && ref.current && !ref.current.contains(event.target as Node)) { + setIsPopupOpen(false); + } + } + + document.addEventListener('click', handleClickOutside); + return () => { + document.removeEventListener('click', handleClickOutside); + }; + }, [isPopupOpen]); + return (
@@ -27,7 +41,7 @@ const SettlementsHeader = () => { 쿠폰 프로모션에 적용한 정산 내역을 확인할 수 있습니다. - + Date: Sun, 28 Jan 2024 17:37:58 +0900 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=EC=9D=B4=EC=A0=84=20=EC=A0=95?= =?UTF-8?q?=EC=82=B0=20=EB=82=B4=EC=97=AD=20=EA=B9=9C=EB=B9=A1=EC=9D=B4?= =?UTF-8?q?=EB=8A=94=20=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95=20=EB=B0=8F?= =?UTF-8?q?=20=EB=A1=9C=EB=94=A9&=EC=97=90=EB=9F=AC=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EC=BB=A8=ED=85=8C=EC=9D=B4=EB=84=88=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Settlemented/index.error.tsx | 5 +++-- .../Settlemented/index.loading.tsx | 19 ++++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.error.tsx b/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.error.tsx index 6cffc567..81a27074 100644 --- a/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.error.tsx +++ b/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.error.tsx @@ -31,9 +31,10 @@ const Container = styled.div` margin-left: 43px; margin-right: 43px; - margin-top: 110px; + margin-top: 100px; + margin-bottom: 85px; padding: 30px 15px; - border-radius: 20px; + border-radius: 10px; display: flex; flex-direction: column; diff --git a/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.loading.tsx b/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.loading.tsx index 3641bcd6..2179479f 100644 --- a/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.loading.tsx +++ b/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.loading.tsx @@ -1,9 +1,21 @@ +import { useState, useEffect } from 'react'; import styled from '@emotion/styled'; -import theme from '@styles/theme'; import Skeleton from 'react-loading-skeleton'; import 'react-loading-skeleton/dist/skeleton.css'; +import theme from '@styles/theme'; + const Loading = () => { + + const [show, setShow] = useState(true); + + useEffect(() => { + let timeout = setTimeout(() => setShow(false), 5000); + return () => clearTimeout(timeout); + }, []); + + if (!show) return null; + return ( @@ -22,9 +34,10 @@ const Container = styled.div` margin-left: 43px; margin-right: 43px; - margin-top: 110px; + margin-top: 100px; + margin-bottom: 85px; padding: 30px 15px; - border-radius: 20px; + border-radius: 10px; display: flex; flex-direction: column; From ba77acb9ea9d1d05b2c05f629f5eb91bafa7d5b5 Mon Sep 17 00:00:00 2001 From: jiohjung98 <ckaquz98@naver.com> Date: Sun, 28 Jan 2024 21:56:21 +0900 Subject: [PATCH 4/6] =?UTF-8?q?design:=20=EC=97=90=EB=9F=AC=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EB=B0=8F=20selector=20useTransition=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/settlement-admin.svg | 4 + .../Settlemented/index.error.tsx | 6 +- .../Settlemented/index.loading.tsx | 97 ++++++------------- .../SettlementsSetting/Settlemented/index.tsx | 27 ++++-- .../SettlementsSetting/index.tsx | 1 - 5 files changed, 56 insertions(+), 79 deletions(-) create mode 100644 src/assets/icons/settlement-admin.svg diff --git a/src/assets/icons/settlement-admin.svg b/src/assets/icons/settlement-admin.svg new file mode 100644 index 00000000..ce436290 --- /dev/null +++ b/src/assets/icons/settlement-admin.svg @@ -0,0 +1,4 @@ +<svg width="85" height="85" viewBox="0 0 85 85" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M33.3477 16.7455L33.3511 16.7478L36.5417 15.9375V17.7084H36.5443H73.0469C75.0429 17.7084 76.9572 18.5013 78.3686 19.9127C79.78 21.3241 80.5729 23.2384 80.5729 25.2344V27.4479H4.42708V19.9219C4.42708 17.9259 5.22 16.0116 6.63141 14.6002C8.04282 13.1888 9.95709 12.3959 11.9531 12.3959L24.552 12.3959L24.5555 12.3958C26.0424 12.3929 27.4965 12.8328 28.7324 13.6593L33.3477 16.7455Z" stroke="white" stroke-width="3.54167"/> +<path d="M6.63141 70.3998C5.22 68.9884 4.42708 67.0742 4.42708 65.0781V36.3021H80.5729V65.0781C80.5729 67.0742 79.78 68.9884 78.3686 70.3998C76.9572 71.8112 75.0429 72.6042 73.0469 72.6042H11.9531C9.95709 72.6042 8.04282 71.8112 6.63141 70.3998Z" stroke="white" stroke-width="3.54167"/> +</svg> diff --git a/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.error.tsx b/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.error.tsx index 81a27074..9e91a2be 100644 --- a/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.error.tsx +++ b/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.error.tsx @@ -27,12 +27,12 @@ const ErrorFallback = ({ resetErrorBoundary }: FallbackProps) => { export default ErrorFallback; const Container = styled.div` - height: 554px; + height: 558px; margin-left: 43px; margin-right: 43px; - margin-top: 100px; - margin-bottom: 85px; + margin-top: 90px; + margin-bottom: 90px; padding: 30px 15px; border-radius: 10px; diff --git a/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.loading.tsx b/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.loading.tsx index 2179479f..26343b7c 100644 --- a/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.loading.tsx +++ b/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.loading.tsx @@ -4,13 +4,14 @@ import Skeleton from 'react-loading-skeleton'; import 'react-loading-skeleton/dist/skeleton.css'; import theme from '@styles/theme'; +import settlementsFrame from '@assets/icons/settlements-data-frame.svg'; const Loading = () => { const [show, setShow] = useState(true); useEffect(() => { - let timeout = setTimeout(() => setShow(false), 5000); + let timeout = setTimeout(() => setShow(false), 30000); return () => clearTimeout(timeout); }, []); @@ -18,11 +19,9 @@ const Loading = () => { return ( <Container> - <Title /> - <ContentsWrapper> - <ContentsTop count={2} /> - <ContentsBottom count={2} /> - </ContentsWrapper> + <Header> + </Header> + <Frame></Frame> </Container> ); }; @@ -30,19 +29,22 @@ const Loading = () => { export default Loading; const Container = styled.div` - height: 554px; + height: 558px; margin-left: 43px; margin-right: 43px; - margin-top: 100px; - margin-bottom: 85px; - padding: 30px 15px; + margin-top: 95px; + margin-bottom: 90px; border-radius: 10px; display: flex; flex-direction: column; - background-color: white; + background: none; + + .react-loading-skeleton { + --base-color: rgba(17, 31, 63, 1); + } ${theme.response.tablet} { max-height: 250px; @@ -57,72 +59,29 @@ const Container = styled.div` } `; -const BaseSkeleton = styled(Skeleton)` - width: 100%; - - border-radius: 16px; - - background-color: #f2f4f5; -`; - -const Title = styled(BaseSkeleton)` - width: 60%; - - margin: 10px 0 20px 0; - padding: 5px 0; +const Header = styled(Skeleton)` + height: 54px; border-radius: 12px; - ${theme.response.tablet} { - width: 30%; - - margin-bottom: 15px; - border-radius: 7px; - padding-bottom: 5px; - } -`; - -const ContentsWrapper = styled.div` - width: 100%; - - border-radius: 16px; - - display: flex; - flex-direction: column; - gap: 10px; - - ${theme.response.tablet} { - border-radius: 10px; - - gap: 5px; - } + background-color: rgba(255, 255, 255, 0.05); + + box-shadow: inset 0px 0px 5px rgba(205, 207, 208, 0.5), 0px 0px 5px rgba(0, 0, 0, 0.5); `; -const ContentsTop = styled(BaseSkeleton)` - height: 100px; - - padding: 10px; - - display: flex; - flex-direction: column; - flex: 1; - ${theme.response.tablet} { - width: 100%; - height: 50px; - } -`; +const Frame = styled(Skeleton)` +width: 100%; +height: 500px; -const ContentsBottom = styled(BaseSkeleton)` - height: 100px; +margin-left: auto; +margin-right: auto; - padding: 10px; +position: relative; - display: flex; - flex-direction: column; - flex: 1; +background: url(${settlementsFrame}); - ${theme.response.tablet} { - display: none; + .react-loading-skeleton { + --base-color: #ebebeb; } -`; +`; \ No newline at end of file diff --git a/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.tsx b/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.tsx index dccd6046..beb0ce0a 100644 --- a/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.tsx +++ b/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.tsx @@ -1,7 +1,7 @@ import styled from '@emotion/styled'; import 'semantic-ui-css/semantic.min.css'; import { Dropdown, DropdownProps } from 'semantic-ui-react'; -import { useState, useEffect } from 'react'; +import { useState, useEffect, useTransition } from 'react'; import { useRecoilState, useRecoilValue } from 'recoil'; import XLSX from 'xlsx-js-style'; @@ -32,20 +32,30 @@ const Settlemented = () => { const defaultOption = SORT_OPTION.find(option => option.value === 'couponDateDesc'); + const [, startTransition] = useTransition(); + const handleSortChange = (_e: React.SyntheticEvent<HTMLElement>, data: DropdownProps) => { setSortOrder(data.value as string); switch (data.value) { case 'amountDesc': - setOrderBy('SUM_PRICE'); + startTransition(() => { + setOrderBy('SUM_PRICE'); + }); break; case 'dateDesc': - setOrderBy('COMPLETE_AT'); + startTransition(() => { + setOrderBy('COMPLETE_AT'); + }); break; case 'couponDateDesc': - setOrderBy('COUPON_USE_DATE'); + startTransition(() => { + setOrderBy('COUPON_USE_DATE'); + }); break; case 'usageCountDesc': - setOrderBy('COUPON_COUNT'); + startTransition(() => { + setOrderBy('COUPON_COUNT'); + }); break; default: break; @@ -80,14 +90,19 @@ const Settlemented = () => { ...data, NO: (currentPage - 1) * itemsPerPage + index + 1, })); + startTransition(() => { setCurrentData(newSettlementData); setTotalItems(settlements.total_settlement_count); setTotalPages(settlements.total_page_count); + }); + } }, [settlements]); const handlePageChange = (page: number) => { - setCurrentPage(page); + startTransition(() => { + setCurrentPage(page); + }); }; const [totalItems, setTotalItems] = useState<number>(0); diff --git a/src/components/Settlements/SettlementsLeft/SettlementsSetting/index.tsx b/src/components/Settlements/SettlementsLeft/SettlementsSetting/index.tsx index 0913b680..9e6c8da1 100644 --- a/src/components/Settlements/SettlementsLeft/SettlementsSetting/index.tsx +++ b/src/components/Settlements/SettlementsLeft/SettlementsSetting/index.tsx @@ -29,7 +29,6 @@ const SettlementsSetting = () => { const [startDate, setStartDate] = useState<Date | null>(new Date(getCurrentYearStartDate())); const [endDate, setEndDate] = useState<Date | null>(new Date(getCurrentYearEndDate())); - const [isModalOpen, setIsModalOpen] = useState(false); const handleModalClose = () => setIsModalOpen(false); const handleModalOpen = () => setIsModalOpen(true); From e2fa2e2e8374759f952919d37e0a302032517f74 Mon Sep 17 00:00:00 2001 From: jiohjung98 <ckaquz98@naver.com> Date: Sun, 28 Jan 2024 22:05:12 +0900 Subject: [PATCH 5/6] =?UTF-8?q?design:=20=EC=A0=95=EC=82=B0=EB=82=B4?= =?UTF-8?q?=EC=97=AD=20=EB=A1=9C=EB=94=A9=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=EB=B2=84=EC=A0=84=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Settlemented/index.loading.tsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.loading.tsx b/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.loading.tsx index 26343b7c..1b6af002 100644 --- a/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.loading.tsx +++ b/src/components/Settlements/SettlementsLeft/SettlementsSetting/Settlemented/index.loading.tsx @@ -47,15 +47,7 @@ const Container = styled.div` } ${theme.response.tablet} { - max-height: 250px; - - margin: 20px; - padding: 15px 15px; - border-radius: 10px; - - gap: 15px; - - background-color: #f2f4f5; + height: 100%; } `; @@ -67,6 +59,10 @@ const Header = styled(Skeleton)` background-color: rgba(255, 255, 255, 0.05); box-shadow: inset 0px 0px 5px rgba(205, 207, 208, 0.5), 0px 0px 5px rgba(0, 0, 0, 0.5); + + ${theme.response.tablet} { + display: none; + } `; @@ -84,4 +80,8 @@ background: url(${settlementsFrame}); .react-loading-skeleton { --base-color: #ebebeb; } + + ${theme.response.tablet} { + background: none; + } `; \ No newline at end of file From c7b303b3016e47a62442566b7fd3ae23cb1aa336 Mon Sep 17 00:00:00 2001 From: jiohjung98 <ckaquz98@naver.com> Date: Sun, 28 Jan 2024 22:10:21 +0900 Subject: [PATCH 6/6] =?UTF-8?q?design:=20=EC=A0=95=EC=82=B0=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/settlement-admin.svg | 4 ---- src/assets/icons/settlemented-admin.svg | 4 ---- src/assets/icons/settlements-admin.svg | 4 ---- .../SettlementsSetting/SettlementsHeader/index.tsx | 4 ++-- 4 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 src/assets/icons/settlement-admin.svg delete mode 100644 src/assets/icons/settlemented-admin.svg delete mode 100644 src/assets/icons/settlements-admin.svg diff --git a/src/assets/icons/settlement-admin.svg b/src/assets/icons/settlement-admin.svg deleted file mode 100644 index ce436290..00000000 --- a/src/assets/icons/settlement-admin.svg +++ /dev/null @@ -1,4 +0,0 @@ -<svg width="85" height="85" viewBox="0 0 85 85" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path d="M33.3477 16.7455L33.3511 16.7478L36.5417 15.9375V17.7084H36.5443H73.0469C75.0429 17.7084 76.9572 18.5013 78.3686 19.9127C79.78 21.3241 80.5729 23.2384 80.5729 25.2344V27.4479H4.42708V19.9219C4.42708 17.9259 5.22 16.0116 6.63141 14.6002C8.04282 13.1888 9.95709 12.3959 11.9531 12.3959L24.552 12.3959L24.5555 12.3958C26.0424 12.3929 27.4965 12.8328 28.7324 13.6593L33.3477 16.7455Z" stroke="white" stroke-width="3.54167"/> -<path d="M6.63141 70.3998C5.22 68.9884 4.42708 67.0742 4.42708 65.0781V36.3021H80.5729V65.0781C80.5729 67.0742 79.78 68.9884 78.3686 70.3998C76.9572 71.8112 75.0429 72.6042 73.0469 72.6042H11.9531C9.95709 72.6042 8.04282 71.8112 6.63141 70.3998Z" stroke="white" stroke-width="3.54167"/> -</svg> diff --git a/src/assets/icons/settlemented-admin.svg b/src/assets/icons/settlemented-admin.svg deleted file mode 100644 index ffbce491..00000000 --- a/src/assets/icons/settlemented-admin.svg +++ /dev/null @@ -1,4 +0,0 @@ -<svg width="85" height="85" viewBox="0 0 85 85" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path d="M33.3477 16.7455L33.3511 16.7478L36.5417 15.9375V17.7084H36.5443H73.0469C75.0429 17.7084 76.9572 18.5013 78.3686 19.9127C79.78 21.3241 80.5729 23.2384 80.5729 25.2344V27.4479H4.42708V19.9219C4.42708 17.9259 5.22 16.0116 6.63141 14.6002C8.04282 13.1888 9.95709 12.3959 11.9531 12.3959L24.552 12.3959L24.5555 12.3958C26.0424 12.3929 27.4965 12.8328 28.7324 13.6593L33.3477 16.7455Z" fill="white" stroke="#1A2849" stroke-width="3.54167"/> -<path d="M6.63141 70.3998C5.22 68.9884 4.42708 67.0742 4.42708 65.0781V36.3021H80.5729V65.0781C80.5729 67.0742 79.78 68.9884 78.3686 70.3998C76.9572 71.8112 75.0429 72.6042 73.0469 72.6042H11.9531C9.95709 72.6042 8.04281 71.8112 6.63141 70.3998Z" fill="white" stroke="#1A2849" stroke-width="3.54167"/> -</svg> diff --git a/src/assets/icons/settlements-admin.svg b/src/assets/icons/settlements-admin.svg deleted file mode 100644 index 170495c1..00000000 --- a/src/assets/icons/settlements-admin.svg +++ /dev/null @@ -1,4 +0,0 @@ -<svg width="44" height="35" viewBox="0 0 44 35" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path d="M2.1665 32.4058C1.2824 31.5217 0.785714 30.3226 0.785714 29.0723V14.733H43.2143V29.0723C43.2143 30.3226 42.7176 31.5217 41.8335 32.4058C40.9494 33.2899 39.7503 33.7866 38.5 33.7866H5.5C4.24969 33.7866 3.0506 33.2899 2.1665 32.4058ZM6.78955 18.969C6.08964 19.6689 5.69643 20.6182 5.69643 21.608V23.5723C5.69643 24.5621 6.08964 25.5114 6.78955 26.2113C7.48946 26.9112 8.43875 27.3044 9.42857 27.3044H14.1429C15.1327 27.3044 16.082 26.9112 16.7819 26.2113C17.4818 25.5114 17.875 24.5621 17.875 23.5723V21.608C17.875 20.6182 17.4818 19.6689 16.7819 18.969C16.082 18.269 15.1327 17.8758 14.1429 17.8758H9.42857C8.43875 17.8758 7.48946 18.269 6.78955 18.969Z" stroke="white" stroke-width="1.57143"/> -<path d="M5.5 0.785714H38.5C39.7503 0.785714 40.9494 1.2824 41.8335 2.1665C42.7176 3.0506 43.2143 4.24969 43.2143 5.5V7.26786H0.785714V5.5C0.785714 4.24969 1.2824 3.0506 2.1665 2.1665C3.0506 1.2824 4.24969 0.785714 5.5 0.785714Z" stroke="white" stroke-width="1.57143"/> -</svg> diff --git a/src/components/Settlements/SettlementsLeft/SettlementsSetting/SettlementsHeader/index.tsx b/src/components/Settlements/SettlementsLeft/SettlementsSetting/SettlementsHeader/index.tsx index 8152076c..2349acef 100644 --- a/src/components/Settlements/SettlementsLeft/SettlementsSetting/SettlementsHeader/index.tsx +++ b/src/components/Settlements/SettlementsLeft/SettlementsSetting/SettlementsHeader/index.tsx @@ -1,7 +1,7 @@ import styled from '@emotion/styled'; import { useState, useEffect, useRef } from 'react'; -import settlementsAdminIcon from '@assets/icons/settlemented-admin.svg'; +import settlementsAdminIcon from '/images/ic-sidebar-settlement.png'; import informationIcon from '@assets/icons/information-circle-outline.svg'; import SettlementsPopup from './SettlementsPopup'; import theme from '@styles/theme'; @@ -74,7 +74,7 @@ const Header = styled.nav` const SettlementsAdminIcon = styled.img` width: 44px; - height: 34.57px; + height: 44px; margin-right: 10px; `;