From c7247d101eb6117314519d054958e5189920975d Mon Sep 17 00:00:00 2001
From: Nico <nicomarchand29@gmail.com>
Date: Tue, 31 Dec 2024 16:18:43 +0100
Subject: [PATCH] MEP 31/12/2024 (#967)

* Fix: Add distinct warning for expired domains

* Fix: Add distinct warning for expired domains

* Fix: Add distinct warning for expired domains

* Fix: Add distinct warning for expired domains

* add distinct warning for expired domains

* expiring soon checks if enbaled auto renewal

* removing space

* fix: paymaster problems (#957)

* fix: paymaster problems

* add comment

---------

Co-authored-by: Aroso Emmanuel <emmanueladedejiaroso@gmail.com>
Co-authored-by: Aroso Emmanuel  Adedeji <57766083+emarc99@users.noreply.github.com>
---
 .gitignore                                    |   2 +-
 components/UI/navbar.tsx                      |   2 +-
 components/UI/walletConnect.tsx               |   2 +-
 components/identities/identitiesGalleryV1.tsx |  24 +--
 public/fonts/poppins/OFL.txt                  | 186 +++++++++---------
 utils/callData/registrationCalls.ts           |   2 +-
 6 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4b340ef1..8053fde5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,4 +38,4 @@ next-env.d.ts
 
 yarn.lock
 
-.env
\ No newline at end of file
+.env
diff --git a/components/UI/navbar.tsx b/components/UI/navbar.tsx
index 003a4816..710051af 100644
--- a/components/UI/navbar.tsx
+++ b/components/UI/navbar.tsx
@@ -327,7 +327,7 @@ const Navbar: FunctionComponent = () => {
                       </li>
                     </Link>
                     <Link
-                      href={process.env.NEXT_PUBLIC_STARKNET_ID as string}
+                      href={`${process.env.NEXT_PUBLIC_STARKNET_ID as string}`}
                       target="_blank"
                     >
                       <li className={styles.menuItemSmall} onClick={handleNav}>
diff --git a/components/UI/walletConnect.tsx b/components/UI/walletConnect.tsx
index f072664b..3db1e96b 100644
--- a/components/UI/walletConnect.tsx
+++ b/components/UI/walletConnect.tsx
@@ -134,4 +134,4 @@ const WalletConnect: FunctionComponent<WalletConnectProps> = ({
   );
 };
 
-export default WalletConnect;
+export default WalletConnect;
\ No newline at end of file
diff --git a/components/identities/identitiesGalleryV1.tsx b/components/identities/identitiesGalleryV1.tsx
index 7eab56c5..22ab88c5 100644
--- a/components/identities/identitiesGalleryV1.tsx
+++ b/components/identities/identitiesGalleryV1.tsx
@@ -57,28 +57,28 @@ const IdentitiesGalleryV1: FunctionComponent<IdentitiesGalleryV1Props> = ({
     // Our Indexer
     <div className={styles.galleryContainer}>
       {identities.map((identity, index) => {
+        const isExpired = isIdentityExpired(identity);
+        const isExpiringSoon = isIdentityExpiringSoon(identity);
+        const expiryDate = timestampToReadableDate(identity?.domain_expiry ?? 0);
+
         return (
           <div
             key={index}
             className={styles.imageGallery}
             onClick={() => router.push(`/identities/${identity.id}`)}
           >
-            {needAutoRenewal?.includes(identity.domain) &&
-            isIdentityExpiringSoon(identity) ? (
+            {isExpired ? (
               <div className={styles.expiryWarning}>
-                <Tooltip
-                  title={
-                    isIdentityExpired(identity)
-                      ? "This domain is expired"
-                      : `Be careful, this domain will expire on ${timestampToReadableDate(
-                          identity?.domain_expiry ?? 0
-                        )}`
-                  }
-                  arrow
-                >
+                <Tooltip title="This domain has expired! Renew it now to keep using it." arrow>
                   <ErrorIcon color="error" />
                 </Tooltip>
               </div>
+            ) : isExpiringSoon && needAutoRenewal?.includes(identity.domain) ? (
+              <div className={styles.expiryWarning}>
+                <Tooltip title={`This domain is expiring soon on ${expiryDate}`} arrow>
+                  <ErrorIcon color="warning" />
+                </Tooltip>
+              </div>
             ) : null}
             <div
               className={styles.identityImg}
diff --git a/public/fonts/poppins/OFL.txt b/public/fonts/poppins/OFL.txt
index 246c977c..76df3b56 100644
--- a/public/fonts/poppins/OFL.txt
+++ b/public/fonts/poppins/OFL.txt
@@ -1,93 +1,93 @@
-Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/utils/callData/registrationCalls.ts b/utils/callData/registrationCalls.ts
index 5982f244..54526998 100644
--- a/utils/callData/registrationCalls.ts
+++ b/utils/callData/registrationCalls.ts
@@ -234,7 +234,7 @@ export const getFreeRegistrationCalls = (
         numberToStringHex(newTokenId),
         numberToStringHex(encodedDomain),
         signature.map((s) => numberToStringHex(s)),
-        hexToDecimal(txMetadataHash),
+        numberToStringHex(hexToDecimal(txMetadataHash)), // Reformat hex hash
       ].flat(),
     },
   ];