Merge pull request #892 from WestpacGEL/develop

Develop
WestpacGEL · Sep 24, 2024 · d2e8f57 · d2e8f57
2 parents 4a90762 + ff62c6d
commit d2e8f57
Show file tree

Hide file tree

Showing 23 changed files with 121 additions and 131 deletions.
diff --git a/.changeset/flat-doors-impress.md b/.changeset/flat-doors-impress.md
diff --git a/.changeset/strong-eyes-sparkle.md b/.changeset/strong-eyes-sparkle.md
diff --git a/apps/protoform/CHANGELOG.md b/apps/protoform/CHANGELOG.md
@@ -1,5 +1,13 @@
 # protoform
 
+## 0.2.3
+
+### Patch Changes
+
+- Updated dependencies [0ee48a0]
+- Updated dependencies [e158bc8]
+  - @westpac/ui@0.27.0
+
 ## 0.2.2
 
 ### Patch Changes

diff --git a/apps/protoform/package.json b/apps/protoform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "protoform",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "private": true,
   "scripts": {
     "dev": "next dev",

diff --git a/apps/site/CHANGELOG.md b/apps/site/CHANGELOG.md
@@ -1,5 +1,13 @@
 # site
 
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies [0ee48a0]
+- Updated dependencies [e158bc8]
+  - @westpac/ui@0.27.0
+
 ## 0.3.2
 
 ### Patch Changes

diff --git a/apps/site/package.json b/apps/site/package.json
@@ -1,6 +1,6 @@
 {
   "name": "site",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "private": true,
   "scripts": {
     "build": "next build",

diff --git a/apps/site/public/assets/GEL_Icons.zip b/apps/site/public/assets/GEL_Icons.zip
diff --git a/apps/site/public/assets/GEL_Logos_Symbols.zip b/apps/site/public/assets/GEL_Logos_Symbols.zip
diff --git a/apps/site/src/components/component-blocks/logos/logos.component.tsx b/apps/site/src/components/component-blocks/logos/logos.component.tsx
@@ -43,7 +43,7 @@ export const Logos = () => {
           <GridItem span={{ initial: 12, sm: 6 }}>
             <input type="hidden" name="asset" value="logo" />
             {/* TODO: It has to change to GEL_Logos afterwards */}
-            <Button tag="a" look="primary" iconBefore={DownloadIcon} soft href="/assets/GEL_Pictograms.zip" download>
+            <Button tag="a" look="primary" iconBefore={DownloadIcon} soft href="/assets/GEL_Logos_Symbols.zip" download>
               Download all SVGs
             </Button>
           </GridItem>

diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @westpac/ui
 
+## 0.27.0
+
+### Minor Changes
+
+- 0ee48a0: updated button styling; fix filter scroll button visual bug
+- e158bc8: updated progress-indicators to use IconProps
+
 ## 0.26.0
 
 ### Minor Changes

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@westpac/ui",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "license": "MIT",
   "sideEffects": false,
   "type": "module",
@@ -209,7 +209,7 @@
     "build:css:all": "pnpm build:css && pnpm build:css:min",
     "build:types": "tsc --project tsconfig.build.json",
     "build:esm": "swc ./src -d dist --no-swcrc --config-file .swcrc",
-    "build:icons": "ts-node --esm ./utils/build-icons/index.ts",
+    "build:icons": "node --loader ts-node/esm ./utils/build-icons/index.ts",
     "build:exports": "ts-node --esm ./utils/build-exports/index.ts && prettier --write package.json",
     "build:watch": "pnpm clean && pnpm build:types && pnpm build:esm -w && pnpm build:css:all",
     "build:type-table": "node generate-component-types.cjs",

diff --git a/packages/ui/src/components/icon/components/cancel-card-icon.tsx b/packages/ui/src/components/icon/components/cancel-card-icon.tsx
@@ -6,34 +6,30 @@ import { type IconProps } from '../icon.types.js';
 export function CancelCardIcon({
   look = 'filled',
   'aria-label': ariaLabel = 'Cancel Card',
-  copyrightYear = '2024',
+  copyrightYear = '2023',
   ...props
 }: IconProps) {
   return (
     <Icon aria-label={ariaLabel} copyrightYear={copyrightYear} {...props}>
       {look === 'filled' ? (
         <Fragment>
-          <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none">
-            <path
-              fill-rule="evenodd"
-              d="M1.416.002 0 1.416l.908.907A1.998 1.998 0 0 0 0 4v16a2 2 0 0 0 2 2h18.585l1.998 1.998 1.415-1.414-.908-.907L1.416.002ZM4.585 6H1v4h7.585l-4-4Z"
-              clip-rule="evenodd"
-              fill="currentColor"
-            />
-            <path d="M23 10h-8.758L24 19.757V4a2 2 0 0 0-2-2H6.242l4 4H23v4Z" fill="currentColor" />
-          </svg>
+          <path
+            fillRule="evenodd"
+            d="M1.416.002 0 1.416l.908.907A1.998 1.998 0 0 0 0 4v16a2 2 0 0 0 2 2h18.585l1.998 1.998 1.415-1.414-.908-.907L1.416.002ZM4.585 6H1v4h7.585l-4-4Z"
+            clipRule="evenodd"
+            fill="currentColor"
+          />
+          <path d="M23 10h-8.758L24 19.757V4a2 2 0 0 0-2-2H6.242l4 4H23v4Z" fill="currentColor" />
         </Fragment>
       ) : (
         <Fragment>
-          <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none">
-            <path
-              fill-rule="evenodd"
-              d="M1.416.002 0 1.416l.908.907A1.998 1.998 0 0 0 0 4v16a2 2 0 0 0 2 2h18.585l1.998 1.998 1.415-1.414-.908-.907L1.416.002ZM2.585 4H2v4h4.585l-4-4Zm8 8H2v8h16.585l-8-8Z"
-              clip-rule="evenodd"
-              fill="currentColor"
-            />
-            <path d="M22 8h-9.758l4 4H22v5.757l2 2V4a2 2 0 0 0-2-2H6.242l2 2H22v4Z" fill="currentColor" />
-          </svg>
+          <path
+            fillRule="evenodd"
+            d="M1.416.002 0 1.416l.908.907A1.998 1.998 0 0 0 0 4v16a2 2 0 0 0 2 2h18.585l1.998 1.998 1.415-1.414-.908-.907L1.416.002ZM2.585 4H2v4h4.585l-4-4Zm8 8H2v8h16.585l-8-8Z"
+            clipRule="evenodd"
+            fill="currentColor"
+          />
+          <path d="M22 8h-9.758l4 4H22v5.757l2 2V4a2 2 0 0 0-2-2H6.242l2 2H22v4Z" fill="currentColor" />
         </Fragment>
       )}
     </Icon>

diff --git a/packages/ui/src/components/icon/components/child-care-icon.tsx b/packages/ui/src/components/icon/components/child-care-icon.tsx
@@ -15,24 +15,24 @@ export function ChildCareIcon({
         <Fragment>
           <path d="M12 8a4 4 0 1 0 0-8 4 4 0 0 0 0 8Z" fill="currentColor" />
           <path
-            fill-rule="evenodd"
-            clip-rule="evenodd"
+            fillRule="evenodd"
+            clipRule="evenodd"
             d="M12 9c3.338 0 10 1.519 10 4.533v5.934c0 1.321-1.28 2.355-3 3.1-.32.139-.655.267-1 .386v-3.286C18 17.893 14.002 17 12 17s-6 .893-6 2.667v.061c.225.104.483.21.773.316 1.547.562 3.416.88 4.747.944V21a1.5 1.5 0 1 1-.285 2.977c-1.537-.09-3.508-.431-5.235-1.024-2.199-.756-4-1.919-4-3.486v-5.934C2 10.52 8.662 9 12 9Zm2.5 4.5a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0Z"
             fill="currentColor"
           />
         </Fragment>
       ) : (
         <Fragment>
           <path
-            fill-rule="evenodd"
-            clip-rule="evenodd"
+            fillRule="evenodd"
+            clipRule="evenodd"
             d="M12 8a4 4 0 1 0 0-8 4 4 0 0 0 0 8Zm0-2a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"
             fill="currentColor"
           />
           <path d="M12 17a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5Z" fill="currentColor" />
           <path
-            fill-rule="evenodd"
-            clip-rule="evenodd"
+            fillRule="evenodd"
+            clipRule="evenodd"
             d="M12 24a1 1 0 1 0 0-2c-1.054 0-2.548-.182-4-.543v-.466c.175-.122.476-.28.92-.439C9.947 20.187 11.22 20 12 20c.78 0 2.053.187 3.08.552.444.159.745.317.92.44v2.52a18.837 18.837 0 0 0 2-.56c2.199-.755 4-1.918 4-3.485v-5.934C22 10.52 15.338 9 12 9S2 10.519 2 13.533v5.934c0 1.567 1.801 2.73 4 3.486l.144.048c.6.2 1.229.37 1.856.51 1.456.326 2.906.489 4 .489Zm5.569-11.984C15.712 11.341 13.443 11 12 11c-1.443 0-3.712.341-5.569 1.016-.93.338-1.627.713-2.054 1.071a1.52 1.52 0 0 0-.348.379.283.283 0 0 0-.028.06L4 13.533v5.934l.001.007a.283.283 0 0 0 .028.06c.043.075.142.207.348.379.358.3.906.613 1.623.905v-.151C6 18.893 9.998 18 12 18s6 .893 6 2.667v.151l.067-.028c.684-.284 1.21-.587 1.556-.877a1.52 1.52 0 0 0 .348-.379.279.279 0 0 0 .028-.06v-.005l.001-.002v-5.936l-.001-.005a.279.279 0 0 0-.028-.06 1.52 1.52 0 0 0-.348-.379c-.427-.357-1.123-.733-2.054-1.071Z"
             fill="currentColor"
           />

diff --git a/packages/ui/src/components/icon/components/child-icon.tsx b/packages/ui/src/components/icon/components/child-icon.tsx
@@ -11,8 +11,8 @@ export function ChildIcon({ 'aria-label': ariaLabel = 'Child', copyrightYear = '
         fill="currentColor"
       />
       <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
+        fillRule="evenodd"
+        clipRule="evenodd"
         d="M12.262.003A12.24 12.24 0 0 0 12 0C5.373 0 0 5.373 0 12s5.373 12 12 12 12-5.373 12-12C24 5.56 18.928.306 12.56.013A1.007 1.007 0 0 0 12.4 0c-.046 0-.092 0-.138.003ZM12 22c5.523 0 10-4.477 10-10 0-5.424-4.318-9.84-9.705-9.996C11.603 2.061 11 2.674 11 3.5c0 .867.665 1.5 1.4 1.5.347 0 .668-.134.918-.368a1 1 0 1 1 1.364 1.463c-.599.558-1.4.905-2.282.905C10.484 7 9 5.394 9 3.5c0-.38.06-.748.17-1.094C5.027 3.626 2 7.46 2 12c0 5.523 4.477 10 10 10Z"
         fill="currentColor"
       />

diff --git a/packages/ui/src/components/icon/components/circle-icon.tsx b/packages/ui/src/components/icon/components/circle-icon.tsx
@@ -1,38 +1,30 @@
-import React, { Fragment } from 'react';
+import React from 'react';
 
 import { Icon } from '../icon.component.js';
 import { type IconProps } from '../icon.types.js';
 
 export function CircleIcon({
   look = 'filled',
   'aria-label': ariaLabel = 'Circle',
-  copyrightYear = '2024',
+  copyrightYear = '2023',
   ...props
 }: IconProps) {
   return (
     <Icon aria-label={ariaLabel} copyrightYear={copyrightYear} {...props}>
       {look === 'filled' ? (
-        <Fragment>
-          <svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path
-              fill-rule="evenodd"
-              clip-rule="evenodd"
-              d="M12 24c6.628 0 12-5.373 12-12S18.628 0 12 0 0 5.373 0 12s5.372 12 12 12Z"
-              fill="currentColor"
-            />
-          </svg>
-        </Fragment>
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M12 24c6.628 0 12-5.373 12-12S18.628 0 12 0 0 5.373 0 12s5.372 12 12 12Z"
+          fill="currentColor"
+        />
       ) : (
-        <Fragment>
-          <svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path
-              fill-rule="evenodd"
-              clip-rule="evenodd"
-              d="M24 12c0 6.627-5.372 12-12 12S0 18.627 0 12 5.372 0 12 0s12 5.373 12 12ZM12 2C6.477 2 2 6.477 2 12s4.477 10 10 10 10-4.477 10-10S17.523 2 12 2Z"
-              fill="currentColor"
-            />
-          </svg>
-        </Fragment>
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M24 12c0 6.627-5.372 12-12 12S0 18.627 0 12 5.372 0 12 0s12 5.373 12 12ZM12 2C6.477 2 2 6.477 2 12s4.477 10 10 10 10-4.477 10-10S17.523 2 12 2Z"
+          fill="currentColor"
+        />
       )}
     </Icon>
   );

diff --git a/packages/ui/src/components/icon/components/drop-left-icon.tsx b/packages/ui/src/components/icon/components/drop-left-icon.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { Icon } from '../icon.component.js';
 import { type IconProps } from '../icon.types.js';
 
-export function DropLeftIcon({ 'aria-label': ariaLabel = 'Drop Left', copyrightYear = '2024', ...props }: IconProps) {
+export function DropLeftIcon({ 'aria-label': ariaLabel = 'Drop Left', copyrightYear = '2023', ...props }: IconProps) {
   return (
     <Icon aria-label={ariaLabel} copyrightYear={copyrightYear} {...props}>
       <path d="m8 19 8-7-8-7v14Z" fill="currentColor" />

diff --git a/packages/ui/src/components/icon/components/drop-right-icon.tsx b/packages/ui/src/components/icon/components/drop-right-icon.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { Icon } from '../icon.component.js';
 import { type IconProps } from '../icon.types.js';
 
-export function DropRightIcon({ 'aria-label': ariaLabel = 'Drop Right', copyrightYear = '2024', ...props }: IconProps) {
+export function DropRightIcon({ 'aria-label': ariaLabel = 'Drop Right', copyrightYear = '2023', ...props }: IconProps) {
   return (
     <Icon aria-label={ariaLabel} copyrightYear={copyrightYear} {...props}>
       <path d="m16 5-8 7 8 7V5Z" fill="currentColor" />

diff --git a/packages/ui/src/components/icon/components/piggy-bank.tsx b/packages/ui/src/components/icon/components/piggy-bank.tsx
@@ -15,9 +15,9 @@ export function PiggyBankIcon({
         <Fragment>
           <path
             fill="currentColor"
-            fill-rule="evenodd"
+            fillRule="evenodd"
             d="M.99 15.975A101.66 101.66 0 0 0 3 24h6v-3h4v3h5.6l2.01-7.92L24 14.97V6.5h-2.61l-2.73-2.63c.04-.24.095-.475.165-.705.07-.23.145-.455.225-.675.04-.1.075-.21.105-.33a1.736 1.736 0 0 0-.48-1.635A1.736 1.736 0 0 0 17.4 0c-.96 0-1.855.21-2.685.63A6.098 6.098 0 0 0 12.6 2.4h-6c-1.84 0-3.4.64-4.68 1.92C.64 5.6 0 7.16 0 9c0 2.136.42 4.19.845 6.264l.145.711ZM6 7a1 1 0 0 1 1-1h5a1 1 0 1 1 0 2H7a1 1 0 0 1-1-1Zm12.5 3.25a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0Z"
-            clip-rule="evenodd"
+            clipRule="evenodd"
           />
         </Fragment>
       ) : (
@@ -28,9 +28,9 @@ export function PiggyBankIcon({
           />
           <path
             fill="currentColor"
-            fill-rule="evenodd"
+            fillRule="evenodd"
             d="M12.6 2.4h-6c-1.84 0-3.4.64-4.68 1.92C.64 5.6 0 7.16 0 9c0 2.136.42 4.19.845 6.264l.145.711A101.66 101.66 0 0 0 3 24h6v-3h4v3h5.6l2.01-7.92L24 14.97V6.5h-2.61l-2.73-2.63c.04-.24.095-.475.165-.705.07-.23.145-.455.225-.675.04-.1.075-.21.105-.33a1.736 1.736 0 0 0-.48-1.635A1.736 1.736 0 0 0 17.4 0c-.96 0-1.855.21-2.685.63A6.098 6.098 0 0 0 12.6 2.4ZM22 8.5h-1.417l-4.069-3.92.173-1.039c.054-.324.129-.644.225-.958.058-.193.12-.384.186-.573a3.808 3.808 0 0 0-1.48.405 4.1 4.1 0 0 0-1.428 1.198l-.6.787H6.6c-1.32 0-2.368.436-3.266 1.334C2.436 6.632 2 7.681 2 9c0 1.921.378 3.772.808 5.877l.142.702A99.66 99.66 0 0 0 4.507 22H7v-3h8v3h2.044l1.898-7.478L22 13.52V8.5Z"
-            clip-rule="evenodd"
+            clipRule="evenodd"
           />
         </Fragment>
       )}

diff --git a/packages/ui/src/components/icon/components/quick-balance-icon.tsx b/packages/ui/src/components/icon/components/quick-balance-icon.tsx
@@ -12,28 +12,24 @@ export function QuickBalanceIcon({
   return (
     <Icon aria-label={ariaLabel} copyrightYear={copyrightYear} {...props}>
       {look === 'filled' ? (
-        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none">
+        <path
+          fillRule="evenodd"
+          d="M24 14c0 3.073-1.155 5.877-3.056 8H3.056A11.955 11.955 0 0 1 0 14C0 7.373 5.373 2 12 2s12 5.373 12 12Zm-3.877-3.88-1.528 1.528c.262.735.405 1.527.405 2.352 0 1.277-.34 2.47-.936 3.5a1 1 0 0 0 1.731 1A8.963 8.963 0 0 0 21 14c0-1.39-.315-2.705-.877-3.88ZM15.88 5.877A9 9 0 0 0 4.204 18.501a1 1 0 0 0 1.732-1.002 7 7 0 0 1 8.416-10.094l1.528-1.528Zm2.827 2.83a1 1 0 0 0-1.414-1.414l-4.775 4.775a2 2 0 1 0 1.414 1.414l4.775-4.775Z"
+          clipRule="evenodd"
+          fill="currentColor"
+        />
+      ) : (
+        <Fragment>
           <path
-            fill-rule="evenodd"
-            d="M24 14c0 3.073-1.155 5.877-3.056 8H3.056A11.955 11.955 0 0 1 0 14C0 7.373 5.373 2 12 2s12 5.373 12 12Zm-3.877-3.88-1.528 1.528c.262.735.405 1.527.405 2.352 0 1.277-.34 2.47-.936 3.5a1 1 0 0 0 1.731 1A8.963 8.963 0 0 0 21 14c0-1.39-.315-2.705-.877-3.88ZM15.88 5.877A9 9 0 0 0 4.204 18.501a1 1 0 0 0 1.732-1.002 7 7 0 0 1 8.416-10.094l1.528-1.528Zm2.827 2.83a1 1 0 0 0-1.414-1.414l-4.775 4.775a2 2 0 1 0 1.414 1.414l4.775-4.775Z"
-            clip-rule="evenodd"
+            d="m17.797 12.446 1.57-1.57c.407.96.633 2.016.633 3.124a7.983 7.983 0 0 1-.526 2.857 1 1 0 1 1-1.868-.714A5.984 5.984 0 0 0 18 14a6.01 6.01 0 0 0-.203-1.554ZM12 6c1.108 0 2.164.225 3.124.633l-1.57 1.57a6 6 0 0 0-7.16 7.94 1 1 0 1 1-1.868.714A8 8 0 0 1 12 6ZM17.293 7.293a1 1 0 1 1 1.414 1.414l-4.775 4.775a2 2 0 1 1-1.414-1.414l4.775-4.775Z"
+            fill="currentColor"
+          />
+          <path
+            fillRule="evenodd"
+            d="M24 14c0 3.073-1.155 5.877-3.056 8H3.056A11.955 11.955 0 0 1 0 14C0 7.373 5.373 2 12 2s12 5.373 12 12Zm-2 0a9.947 9.947 0 0 1-2 6H4a9.948 9.948 0 0 1-2-6C2 8.477 6.477 4 12 4s10 4.477 10 10Z"
+            clipRule="evenodd"
             fill="currentColor"
           />
-        </svg>
-      ) : (
-        <Fragment>
-          <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none">
-            <path
-              d="m17.797 12.446 1.57-1.57c.407.96.633 2.016.633 3.124a7.983 7.983 0 0 1-.526 2.857 1 1 0 1 1-1.868-.714A5.984 5.984 0 0 0 18 14a6.01 6.01 0 0 0-.203-1.554ZM12 6c1.108 0 2.164.225 3.124.633l-1.57 1.57a6 6 0 0 0-7.16 7.94 1 1 0 1 1-1.868.714A8 8 0 0 1 12 6ZM17.293 7.293a1 1 0 1 1 1.414 1.414l-4.775 4.775a2 2 0 1 1-1.414-1.414l4.775-4.775Z"
-              fill="currentColor"
-            />
-            <path
-              fill-rule="evenodd"
-              d="M24 14c0 3.073-1.155 5.877-3.056 8H3.056A11.955 11.955 0 0 1 0 14C0 7.373 5.373 2 12 2s12 5.373 12 12Zm-2 0a9.947 9.947 0 0 1-2 6H4a9.948 9.948 0 0 1-2-6C2 8.477 6.477 4 12 4s10 4.477 10 10Z"
-              clip-rule="evenodd"
-              fill="currentColor"
-            />
-          </svg>
         </Fragment>
       )}
     </Icon>

diff --git a/packages/ui/src/components/icon/components/target-icon.tsx b/packages/ui/src/components/icon/components/target-icon.tsx
@@ -3,28 +3,21 @@ import React from 'react';
 import { Icon } from '../icon.component.js';
 import { type IconProps } from '../icon.types.js';
 
-export function TargetIcon({
-  look = 'filled',
-  'aria-label': ariaLabel = 'Target',
-  copyrightYear = '2023',
-  ...props
-}: IconProps) {
+export function TargetIcon({ 'aria-label': ariaLabel = 'Target', copyrightYear = '2023', ...props }: IconProps) {
   return (
     <Icon aria-label={ariaLabel} copyrightYear={copyrightYear} {...props}>
-      <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-        <path
-          d="M16.9431 11.2432C16.9806 11.49 17 11.7427 17 12C17 14.7614 14.7614 17 12 17C9.23858 17 7 14.7614 7 12C7 9.23858 9.23858 7 12 7C12.2821 7 12.5588 7.02337 12.8282 7.06827L13.1617 5.09595C12.7838 5.03284 12.3957 5 12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.866 19 19 15.866 19 12C19 11.6291 18.9712 11.265 18.9156 10.9097L16.9431 11.2432Z"
-          fill="currentColor"
-        />
-        <path
-          d="M21.8742 10.4095C21.957 10.9275 22 11.4587 22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C12.5662 2 13.1213 2.04705 13.6618 2.13745L13.9953 0.165126C13.3464 0.0565233 12.6798 0 12 0C5.37258 0 0 5.37258 0 12C0 18.6274 5.37258 24 12 24C18.6274 24 24 18.6274 24 12C24 11.3451 23.9475 10.7025 23.8466 10.076L21.8742 10.4095Z"
-          fill="currentColor"
-        />
-        <path
-          d="M14 12C14 13.1046 13.1046 14 12 14C10.8954 14 10 13.1046 10 12C10 10.8954 10.8954 10 12 10C12.1791 10 12.3528 10.0236 12.518 10.0677L15.9861 6.59968L15.5146 4.24268L19.7573 0L20.3129 3.68706L24 4.24264L19.7573 8.48532L17.4003 8.01389L13.9322 11.4819C13.9764 11.6472 14 11.8208 14 12Z"
-          fill="currentColor"
-        />
-      </svg>
+      <path
+        d="M16.9431 11.2432C16.9806 11.49 17 11.7427 17 12C17 14.7614 14.7614 17 12 17C9.23858 17 7 14.7614 7 12C7 9.23858 9.23858 7 12 7C12.2821 7 12.5588 7.02337 12.8282 7.06827L13.1617 5.09595C12.7838 5.03284 12.3957 5 12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.866 19 19 15.866 19 12C19 11.6291 18.9712 11.265 18.9156 10.9097L16.9431 11.2432Z"
+        fill="currentColor"
+      />
+      <path
+        d="M21.8742 10.4095C21.957 10.9275 22 11.4587 22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C12.5662 2 13.1213 2.04705 13.6618 2.13745L13.9953 0.165126C13.3464 0.0565233 12.6798 0 12 0C5.37258 0 0 5.37258 0 12C0 18.6274 5.37258 24 12 24C18.6274 24 24 18.6274 24 12C24 11.3451 23.9475 10.7025 23.8466 10.076L21.8742 10.4095Z"
+        fill="currentColor"
+      />
+      <path
+        d="M14 12C14 13.1046 13.1046 14 12 14C10.8954 14 10 13.1046 10 12C10 10.8954 10.8954 10 12 10C12.1791 10 12.3528 10.0236 12.518 10.0677L15.9861 6.59968L15.5146 4.24268L19.7573 0L20.3129 3.68706L24 4.24264L19.7573 8.48532L17.4003 8.01389L13.9322 11.4819C13.9764 11.6472 14 11.8208 14 12Z"
+        fill="currentColor"
+      />
     </Icon>
   );
 }
diff --git a/packages/ui/src/components/icon/components/x-icon.tsx b/packages/ui/src/components/icon/components/x-icon.tsx
@@ -11,24 +11,24 @@ export function XIcon({ look = 'filled', 'aria-label': ariaLabel = 'X', copyrigh
           <path fill="currentColor" d="M15.815 19.008h2.12L8.178 5.04h-2.12l9.757 13.968Z" />
           <path
             fill="currentColor"
-            fill-rule="evenodd"
+            fillRule="evenodd"
             d="M2 0a2 2 0 0 0-2 2v20a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2Zm17.315 4-5.824 6.775L19.825 20h-4.659l-4.265-6.212L5.56 20H4.18l6.107-7.104L4.18 4H8.84l4.039 5.883L17.935 4h1.38Z"
-            clip-rule="evenodd"
+            clipRule="evenodd"
           />
         </Fragment>
       ) : (
         <Fragment>
           <path
             fill="currentColor"
-            fill-rule="evenodd"
+            fillRule="evenodd"
             d="m19.315 4-5.824 6.775L19.825 20h-4.659l-4.265-6.212L5.56 20H4.18l6.107-7.104L4.18 4H8.84l4.039 5.883L17.935 4h1.38Zm-3.5 15.008h2.12L8.178 5.04h-2.12l9.757 13.968Z"
-            clip-rule="evenodd"
+            clipRule="evenodd"
           />
           <path
             fill="currentColor"
-            fill-rule="evenodd"
+            fillRule="evenodd"
             d="M0 2a2 2 0 0 1 2-2h20a2 2 0 0 1 2 2v20a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2Zm2 0h20v20H2V2Z"
-            clip-rule="evenodd"
+            clipRule="evenodd"
           />
         </Fragment>
       )}