Merge pull request #512 from trilitech/fix-fa-icons

Fix FA1/2 icon colour on AddressPill
trilitech · Oct 19, 2023 · 00bfa47 · 00bfa47
2 parents 8c5340b + f5affc3
commit 00bfa47
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/src/assets/icons/FA1.2.tsx b/src/assets/icons/FA1.2.tsx
@@ -4,17 +4,14 @@ import colors from "../../style/colors";
 const FA12Icon: React.FC<IconProps> = props => {
   return (
     <Icon
-      width="30"
-      height="15"
+      width="30px"
+      height="15px"
       viewBox="1 1 30 15"
-      fill="none"
+      fill={colors.gray[450]}
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <path
-        d="M1.2429 13V4.27273H7.02131V5.79403H3.08807V7.87358H6.63778V9.39489H3.08807V13H1.2429ZM8.67685 13H6.69957L9.71236 4.27273H12.0902L15.0987 13H13.1214L10.9354 6.26705H10.8672L8.67685 13ZM8.55327 9.5696H13.2237V11.0099H8.55327V9.5696ZM19.4847 4.27273V13H17.6396V6.02415H17.5884L15.5898 7.27699V5.64062L17.7504 4.27273H19.4847ZM22.1683 13.1108C21.8871 13.1108 21.6456 13.0114 21.4439 12.8125C21.245 12.6108 21.1456 12.3693 21.1456 12.0881C21.1456 11.8097 21.245 11.571 21.4439 11.3722C21.6456 11.1733 21.8871 11.0739 22.1683 11.0739C22.4411 11.0739 22.6797 11.1733 22.8842 11.3722C23.0888 11.571 23.1911 11.8097 23.1911 12.0881C23.1911 12.2756 23.1428 12.4474 23.0462 12.6037C22.9524 12.7571 22.8288 12.8807 22.6754 12.9744C22.522 13.0653 22.353 13.1108 22.1683 13.1108ZM24.6644 13V11.6705L27.771 8.79403C28.0352 8.53835 28.2567 8.30824 28.4357 8.10369C28.6175 7.89915 28.7553 7.69886 28.8491 7.50284C28.9428 7.30398 28.9897 7.08949 28.9897 6.85938C28.9897 6.60369 28.9315 6.38352 28.815 6.19886C28.6985 6.01136 28.5394 5.8679 28.3377 5.76847C28.136 5.66619 27.9073 5.61506 27.6516 5.61506C27.3846 5.61506 27.1516 5.66903 26.9528 5.77699C26.7539 5.88494 26.6005 6.03977 26.4925 6.24148C26.3846 6.44318 26.3306 6.68324 26.3306 6.96165H24.5792C24.5792 6.39062 24.7085 5.89489 24.967 5.47443C25.2255 5.05398 25.5877 4.72869 26.0536 4.49858C26.5195 4.26847 27.0565 4.15341 27.6644 4.15341C28.2894 4.15341 28.8335 4.2642 29.2965 4.4858C29.7624 4.70455 30.1246 5.00852 30.3832 5.39773C30.6417 5.78693 30.771 6.23295 30.771 6.7358C30.771 7.06534 30.7056 7.39062 30.5749 7.71165C30.4471 8.03267 30.2184 8.3892 29.8888 8.78125C29.5593 9.17045 29.0948 9.63778 28.4954 10.1832L27.2212 11.4318V11.4915H30.886V13H24.6644Z"
-        fill={colors.gray[450]}
-      />
+      <path d="M1.2429 13V4.27273H7.02131V5.79403H3.08807V7.87358H6.63778V9.39489H3.08807V13H1.2429ZM8.67685 13H6.69957L9.71236 4.27273H12.0902L15.0987 13H13.1214L10.9354 6.26705H10.8672L8.67685 13ZM8.55327 9.5696H13.2237V11.0099H8.55327V9.5696ZM19.4847 4.27273V13H17.6396V6.02415H17.5884L15.5898 7.27699V5.64062L17.7504 4.27273H19.4847ZM22.1683 13.1108C21.8871 13.1108 21.6456 13.0114 21.4439 12.8125C21.245 12.6108 21.1456 12.3693 21.1456 12.0881C21.1456 11.8097 21.245 11.571 21.4439 11.3722C21.6456 11.1733 21.8871 11.0739 22.1683 11.0739C22.4411 11.0739 22.6797 11.1733 22.8842 11.3722C23.0888 11.571 23.1911 11.8097 23.1911 12.0881C23.1911 12.2756 23.1428 12.4474 23.0462 12.6037C22.9524 12.7571 22.8288 12.8807 22.6754 12.9744C22.522 13.0653 22.353 13.1108 22.1683 13.1108ZM24.6644 13V11.6705L27.771 8.79403C28.0352 8.53835 28.2567 8.30824 28.4357 8.10369C28.6175 7.89915 28.7553 7.69886 28.8491 7.50284C28.9428 7.30398 28.9897 7.08949 28.9897 6.85938C28.9897 6.60369 28.9315 6.38352 28.815 6.19886C28.6985 6.01136 28.5394 5.8679 28.3377 5.76847C28.136 5.66619 27.9073 5.61506 27.6516 5.61506C27.3846 5.61506 27.1516 5.66903 26.9528 5.77699C26.7539 5.88494 26.6005 6.03977 26.4925 6.24148C26.3846 6.44318 26.3306 6.68324 26.3306 6.96165H24.5792C24.5792 6.39062 24.7085 5.89489 24.967 5.47443C25.2255 5.05398 25.5877 4.72869 26.0536 4.49858C26.5195 4.26847 27.0565 4.15341 27.6644 4.15341C28.2894 4.15341 28.8335 4.2642 29.2965 4.4858C29.7624 4.70455 30.1246 5.00852 30.3832 5.39773C30.6417 5.78693 30.771 6.23295 30.771 6.7358C30.771 7.06534 30.7056 7.39062 30.5749 7.71165C30.4471 8.03267 30.2184 8.3892 29.8888 8.78125C29.5593 9.17045 29.0948 9.63778 28.4954 10.1832L27.2212 11.4318V11.4915H30.886V13H24.6644Z" />
     </Icon>
   );
 };

diff --git a/src/assets/icons/FA2.tsx b/src/assets/icons/FA2.tsx
@@ -4,17 +4,14 @@ import colors from "../../style/colors";
 const FA2Icon: React.FC<IconProps> = props => {
   return (
     <Icon
-      width="13"
-      height="2.5"
-      viewBox="0 0 22 9"
-      fill="none"
+      width="30px"
+      height="15px"
+      viewBox="1 1 30 15"
+      fill={colors.gray[450]}
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <path
-        d="M0.0261008 9V0.272727H5.80451V1.79403H1.87127V3.87358H5.42099V5.39489H1.87127V9H0.0261008ZM7.46005 9H5.48278L8.49556 0.272727H10.8734L13.8819 9H11.9047L9.71857 2.26705H9.65039L7.46005 9ZM7.33647 5.5696H12.0069V7.00994H7.33647V5.5696ZM14.8812 9V7.67045L17.9877 4.79403C18.252 4.53835 18.4735 4.30824 18.6525 4.10369C18.8343 3.89915 18.9721 3.69886 19.0659 3.50284C19.1596 3.30398 19.2065 3.08949 19.2065 2.85938C19.2065 2.60369 19.1483 2.38352 19.0318 2.19886C18.9153 2.01136 18.7562 1.8679 18.5545 1.76847C18.3528 1.66619 18.1241 1.61506 17.8684 1.61506C17.6014 1.61506 17.3684 1.66903 17.1696 1.77699C16.9707 1.88494 16.8173 2.03977 16.7093 2.24148C16.6014 2.44318 16.5474 2.68324 16.5474 2.96165H14.796C14.796 2.39062 14.9252 1.89489 15.1838 1.47443C15.4423 1.05398 15.8045 0.728693 16.2704 0.498579C16.7363 0.268466 17.2733 0.153409 17.8812 0.153409C18.5062 0.153409 19.0502 0.264204 19.5133 0.485795C19.9792 0.704545 20.3414 1.00852 20.6 1.39773C20.8585 1.78693 20.9877 2.23295 20.9877 2.7358C20.9877 3.06534 20.9224 3.39062 20.7917 3.71165C20.6639 4.03267 20.4352 4.3892 20.1056 4.78125C19.7761 5.17045 19.3116 5.63778 18.7122 6.18324L17.438 7.43182V7.49148H21.1028V9H14.8812Z"
-        fill={colors.gray[450]}
-      />
+      <path d="M1.0261 13V4.27273H6.80451V5.79403H2.87127V7.87358H6.42099V9.39489H2.87127V13H1.0261ZM8.46005 13H6.48278L9.49556 4.27273H11.8734L14.8819 13H12.9047L10.7186 6.26705H10.6504L8.46005 13ZM8.33647 9.5696H13.0069V11.0099H8.33647V9.5696ZM15.8812 13V11.6705L18.9877 8.79403C19.252 8.53835 19.4735 8.30824 19.6525 8.10369C19.8343 7.89915 19.9721 7.69886 20.0659 7.50284C20.1596 7.30398 20.2065 7.08949 20.2065 6.85938C20.2065 6.60369 20.1483 6.38352 20.0318 6.19886C19.9153 6.01136 19.7562 5.8679 19.5545 5.76847C19.3528 5.66619 19.1241 5.61506 18.8684 5.61506C18.6014 5.61506 18.3684 5.66903 18.1696 5.77699C17.9707 5.88494 17.8173 6.03977 17.7093 6.24148C17.6014 6.44318 17.5474 6.68324 17.5474 6.96165H15.796C15.796 6.39062 15.9252 5.89489 16.1838 5.47443C16.4423 5.05398 16.8045 4.72869 17.2704 4.49858C17.7363 4.26847 18.2733 4.15341 18.8812 4.15341C19.5062 4.15341 20.0502 4.2642 20.5133 4.4858C20.9792 4.70455 21.3414 5.00852 21.6 5.39773C21.8585 5.78693 21.9877 6.23295 21.9877 6.7358C21.9877 7.06534 21.9224 7.39062 21.7917 7.71165C21.6639 8.03267 21.4352 8.3892 21.1056 8.78125C20.7761 9.17045 20.3116 9.63778 19.7122 10.1832L18.438 11.4318V11.4915H22.1028V13H15.8812Z" />
     </Icon>
   );
 };

diff --git a/src/components/AddressPill/AddressPill.tsx b/src/components/AddressPill/AddressPill.tsx
@@ -83,7 +83,7 @@ const AddressPill: React.FC<{ address: Address; mode?: AddressPillMode } & BoxPr
             data-testid="address-pill-left-icon"
             addressKind={addressKind}
             ml={2}
-            stroke={iconColor}
+            fill={iconColor}
           />
         )}