Merge main into release

index.html

@@ -97,5 +97,18 @@
         s.parentNode.insertBefore(g, s);
       })();
     </script>
+    <script type="text/javascript">
+      var _mtm = (window._mtm = window._mtm || []);
+      _mtm.push({ 'mtm.startTime': new Date().getTime(), event: 'mtm.Start' });
+      (function () {
+        var d = document,
+          g = d.createElement('script'),
+          s = d.getElementsByTagName('script')[0];
+        g.async = true;
+        g.src =
+          'https://cdn.matomo.cloud/nethermind.matomo.cloud/container_zPmiPdiA.js';
+        s.parentNode.insertBefore(g, s);
+      })();
+    </script>
   </body>
 </html>

src/onboarding/Login.jsx

@@ -35,8 +35,7 @@ export default function Login() {
         window._paq.push([
           'trackEvent',
           'Login',
-          'User logged in successfully',
-          data.email
+          'User logged in successfully'
         ]);
         navigate('/');
       } else {
@@ -157,6 +156,7 @@ export default function Login() {
 
         <Button
           className="rounded-sm border border-secondary text-secondary hover:border-focus hover:text-focus"
+          data-matomo-id="login-btn"
           fullWidth
           isLoading={state.isLoading}
           type="submit"

src/onboarding/Register.jsx

@@ -69,12 +69,7 @@ export default function Register() {
       });
       if (completeSignUp.status === 'complete') {
         await setActive({ session: completeSignUp.createdSessionId });
-        window._paq.push([
-          'trackEvent',
-          'Sign Up',
-          'New account created',
-          getValues('email')
-        ]);
+        window._paq.push(['trackEvent', 'Sign Up', 'New account created']);
         navigate('/');
       } else {
         console.error(JSON.stringify(completeSignUp, null, 2));
@@ -274,6 +269,7 @@ export default function Register() {
 
         <Button
           className="rounded-sm border border-secondary text-secondary hover:border-focus hover:text-focus"
+          data-matomo-id="create-acc-btn"
           fullWidth
           isLoading={state.isLoading}
           type="submit"

src/shared/Footer.jsx

@@ -20,6 +20,7 @@ export default function Footer() {
             <li className="flex h-6 items-center" key={`footer-main-${i}`}>
               <Link
                 className="text-xs text-foreground-2"
+                data-matomo-id={item.id}
                 href={item.href}
                 onPress={() =>
                   item.matomoEventData &&
@@ -40,6 +41,7 @@ export default function Footer() {
             <li className="flex h-6 items-center" key={`footer-social-${i}`}>
               <Link
                 className={`${item.className} text-xs text-foreground-2`}
+                data-matomo-id={item.id}
                 href={item.href}
                 onPress={() =>
                   item.matomoEventData &&
@@ -69,6 +71,7 @@ export default function Footer() {
 
 const mainLinks = [
   {
+    id: 'audit-smart-contract',
     title: 'Audit smart contract',
     href: 'https://www.nethermind.io/smart-contract-audits',
     matomoEventData: [
@@ -78,6 +81,7 @@ const mainLinks = [
     ]
   },
   {
+    id: 'nethermind-operator',
     title: 'Nethermind operator',
     href: 'https://app.eigenlayer.xyz/operator/0x110af279aaffb0d182697d7fc87653838aa5945e',
     matomoEventData: [
@@ -87,10 +91,12 @@ const mainLinks = [
     ]
   },
   {
+    id: 'legal',
     title: 'Legal',
     href: '/terms-and-conditions'
   },
   {
+    id: 'api-docs',
     title: 'API Docs',
     href: `${import.meta.env.VITE_API_BASE_URL}/swagger`,
     matomoEventData: [
@@ -103,12 +109,14 @@ const mainLinks = [
 
 const socialLinks = [
   {
+    id: 'social-x',
     title: 'Follow us',
     className: 'footer-x',
-    href: 'https://x.com/NethermindEth',
-    matomoEventData: ['Social Media', 'X', 'https://x.com/NethermindEth']
+    href: 'https://x.com/restakinginfo',
+    matomoEventData: ['Social Media', 'X', 'https://x.com/restakinginfo']
   },
   {
+    id: 'social-discord',
     title: 'Join us',
     className: 'footer-discord',
     href: 'https://discord.com/invite/PaCMRFdvWT',

src/shared/Sidebar.jsx

@@ -84,6 +84,7 @@ export default function Sidebar({ onOpenChange }) {
 
           <Button
             className="rounded-md border border-foreground-2"
+            data-matomo-id="support-us-btn"
             onPress={() => {
               window._paq.push([
                 'trackEvent',
@@ -105,6 +106,7 @@ export default function Sidebar({ onOpenChange }) {
           <Button
             className="hover:!text-content1"
             color="primary"
+            data-matomo-id="signin-nav-btn"
             fullWidth
             onClick={() => {
               window._paq.push([