Monorepo implementation, resolves FRONT-597

.changeset/README.md

@@ -0,0 +1,8 @@
+# Changesets
+
+Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
+with multi-package repos, or single-package repos to help you version and publish your code. You can
+find the full documentation for it [in our repository](https://github.com/changesets/changesets)
+
+We have a quick list of common questions to get you started engaging with this project in
+[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/config.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "https://unpkg.com/@changesets/config@3.1.1/schema.json",
+  "changelog": "@changesets/cli/changelog",
+  "commit": false,
+  "fixed": [],
+  "linked": [],
+  "access": "public",
+  "baseBranch": "dev-monorepo",
+  "updateInternalDependencies": "patch",
+  "privatePackages": {
+    "version": true,
+    "tag": false
+  },
+  "ignore": [
+    "@layerswap/bridge",
+    "widget-playground",
+    "layerswap-explorer"
+  ]
+}

.eslintrc.json

@@ -1,8 +1,4 @@
 {
-  "extends": [
-    "next/core-web-vitals",
-    "plugin:storybook/recommended"
-  ],
   "plugins": [
     "no-conditional-literals-in-jsx"
   ],

.github/workflows/wallets-data-fetch.yml

@@ -15,50 +15,89 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Fetch new walletsData.json
+      - name: Fetch new EVM walletsData.json
         id: fetch_wallets_data
         run: |
-          echo "Fetching new walletsData.json..."
+          echo "Fetching new EVM walletsData.json..."
           curl --fail -s -o new_walletsData.json https://explorer-api.walletconnect.com/v3/wallets?projectId=4b988e37fe730153d49f1ecb64fbbaa7
 
           if [ ! -s new_walletsData.json ]; then
-            echo "❌ Downloaded walletsData.json is empty!"
+            echo "❌ Downloaded EVM walletsData.json is empty!"
             exit 1
           fi
 
           if ! jq empty new_walletsData.json > /dev/null 2>&1; then
-            echo "❌ Downloaded walletsData.json is not valid JSON!"
+            echo "❌ Downloaded EVM walletsData.json is not valid JSON!"
             cat new_walletsData.json
             exit 1
           fi
 
-      - name: Compare with existing walletsData.json
+      - name: Fetch new Solana walletsData.json
+        id: fetch_solana_wallets_data
+        run: |
+          echo "Fetching new Solana walletsData.json..."
+          curl --fail -s -o new_solana_walletsData.json "https://explorer-api.walletconnect.com/v3/wallets?projectId=4b988e37fe730153d49f1ecb64fbbaa7&chains=solana:4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z,solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp,solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1"
+
+          if [ ! -s new_solana_walletsData.json ]; then
+            echo "❌ Downloaded Solana walletsData.json is empty!"
+            exit 1
+          fi
+
+          if ! jq empty new_solana_walletsData.json > /dev/null 2>&1; then
+            echo "❌ Downloaded Solana walletsData.json is not valid JSON!"
+            cat new_solana_walletsData.json
+            exit 1
+          fi
+
+      - name: Compare with existing EVM walletsData.json
         id: compare_wallets_data
         run: |
-          echo "Comparing new walletsData.json with existing one..."
-          jq --sort-keys . public/walletsData.json > old_normalized.json
+          echo "Comparing new EVM walletsData.json with existing one..."
+          jq --sort-keys . packages/wallets/evm/src/jsons/walletsData.json > old_normalized.json
           jq --sort-keys . new_walletsData.json > new_normalized.json
 
           if diff -q old_normalized.json new_normalized.json > /dev/null; then
-            echo "No changes detected in walletsData.json."
+            echo "No changes detected in EVM walletsData.json."
             echo "changed=false" >> $GITHUB_OUTPUT
           else
-            echo "Changes detected in walletsData.json."
-            jq --sort-keys . new_walletsData.json > public/walletsData.json
+            echo "Changes detected in EVM walletsData.json."
+            jq --sort-keys . new_walletsData.json > packages/wallets/evm/src/jsons/walletsData.json
             echo "changed=true" >> $GITHUB_OUTPUT
           fi
 
           # Clean up temporary files
           rm -f old_normalized.json new_normalized.json new_walletsData.json
 
+      - name: Compare with existing Solana walletsData.json
+        id: compare_solana_wallets_data
+        run: |
+          echo "Comparing new Solana walletsData.json with existing one..."
+          jq --sort-keys . packages/wallets/svm/src/jsons/walletsData.json > old_solana_normalized.json
+          jq --sort-keys . new_solana_walletsData.json > new_solana_normalized.json
+
+          if diff -q old_solana_normalized.json new_solana_normalized.json > /dev/null; then
+            echo "No changes detected in Solana walletsData.json."
+            echo "solana_changed=false" >> $GITHUB_OUTPUT
+          else
+            echo "Changes detected in Solana walletsData.json."
+            jq --sort-keys . new_solana_walletsData.json > packages/wallets/svm/src/jsons/walletsData.json
+            echo "solana_changed=true" >> $GITHUB_OUTPUT
+          fi
+
+          # Clean up temporary files
+          rm -f old_solana_normalized.json new_solana_normalized.json new_solana_walletsData.json
+
       - name: Create Pull Request
-        if: steps.compare_wallets_data.outputs.changed == 'true'
+        if: steps.compare_wallets_data.outputs.changed == 'true' || steps.compare_solana_wallets_data.outputs.solana_changed == 'true'
         uses: peter-evans/create-pull-request@v5
         with:
           commit-message: "chore: update walletsData.json"
           title: "chore: update walletsData.json"
           body: |
-            This PR updates `public/walletsData.json` with the latest data.
+            This PR updates wallet data with the latest information from WalletConnect API.
+
+            - EVM wallets: ${{ steps.compare_wallets_data.outputs.changed == 'true' && 'Updated ✅' || 'No changes' }}
+            - Solana wallets: ${{ steps.compare_solana_wallets_data.outputs.solana_changed == 'true' && 'Updated ✅' || 'No changes' }}
           branch: update-wallets-data
           base: dev
           delete-branch: true

.gitignore

@@ -2,14 +2,15 @@
 
 # dependencies
 *node_modules
+dist/
 /.pnp
 .pnp.js
 
 # testing
 /coverage
 
 # next.js
-/.next/
+*.next/
 /out/
 
 # production
@@ -34,6 +35,7 @@ yarn-error.log*
 # Moving to yarn
 package-lock.json
 storybook-static/*
+
 # Sentry Config File
 .sentryclirc
 .env*.local

.npmrc

@@ -0,0 +1,10 @@
+auto-install-peers=false
+strict-peer-dependencies=true
+prefer-workspace-packages=true
+public-hoist-pattern[]=react
+public-hoist-pattern[]=react-*
+public-hoist-pattern[]=wagmi
+public-hoist-pattern[]=@wagmi/*
+public-hoist-pattern[]=viem
+public-hoist-pattern[]=@tanstack/react-query
+public-hoist-pattern[]=@tanstack/query-core

apps/bridge/.eslintrc.json

@@ -0,0 +1,7 @@
+{
+  "extends": [
+    "../../.eslintrc.json",
+    "next/core-web-vitals",
+    "plugin:storybook/recommended"
+  ]
+}

apps/bridge/.gitignore

@@ -0,0 +1 @@
+.vercel

Models/QueryParams.ts → apps/bridge/Models/QueryParams.ts

@@ -29,7 +29,6 @@ export class PersistantQueryParams {
     hideDepositMethod?: boolean = false;
     hideLogo?: boolean = false
     sameAccountNetwork?: string = "";
-    lockAddress?: boolean = false;
     clientId?: string = "";
     defaultTab?: string = "";
 

README.md → apps/bridge/README.md

@@ -6,7 +6,7 @@
 
 This repository contains implementation of Layerswap UI
 
- 
+
 
 ### Run locally
 

apps/bridge/components/AppWrapper.tsx

@@ -0,0 +1,50 @@
+import { X } from "lucide-react";
+import toast, { ToastBar, Toaster } from "react-hot-toast"
+import Navbar from "./navbar"
+import GlobalFooter from "./globalFooter";
+import type { JSX } from 'react';
+
+type Props = {
+    children: JSX.Element | JSX.Element[]
+}
+export default function ThemeWrapper({ children }: Props) {
+    return <main className="styled-scroll h-full w-full">
+        <div className="invisible light" />
+        <div className="flex flex-col items-center min-h-screen relative font-robo">
+            <Toaster position="top-center" toastOptions={{
+                duration: 5000,
+                style: {
+                    background: 'rgb(var(--ls-colors-secondary-600))',
+                    color: 'rgb(var(--ls-colors-secondary-text))'
+                },
+                position: 'top-center',
+                error: {
+                    duration: Infinity,
+                },
+            }}
+            >
+                {(t) => (
+                    <ToastBar toast={t}>
+                        {({ icon, message }) => (
+                            <>
+                                {icon}
+                                {message}
+                                {t.type !== 'loading' && (
+                                    <button type="button" onClick={() => toast.dismiss(t.id)}><X className="h-5" /></button>
+                                )}
+                            </>
+                        )}
+                    </ToastBar>
+                )}
+            </Toaster>
+            <Navbar />
+            <div className="w-full h-full z-auto flex flex-col items-center justify-center">
+                <div className="h-full w-full text-primary-text">
+                    {children}
+                </div>
+            </div>
+            <div id="offset-for-stickyness" className="block md:hidden"></div>
+            <GlobalFooter />
+        </div>
+    </main>
+}

apps/bridge/components/Icons/FailIcon.tsx

@@ -0,0 +1,9 @@
+const FailIcon = (props) => <svg {...props} xmlns="http://www.w3.org/2000/svg" width="116" height="116" viewBox="0 0 116 116" fill="none">
+    <circle cx="58" cy="58" r="58" fill="#E43636" fillOpacity="0.1" />
+    <circle cx="58" cy="58" r="45" fill="#E43636" fillOpacity="0.5" />
+    <circle cx="58" cy="58" r="30" fill="#E43636" />
+    <path d="M48 69L68 48" stroke="white" strokeWidth="3.15789" strokeLinecap="round" />
+    <path d="M48 48L68 69" stroke="white" strokeWidth="3.15789" strokeLinecap="round" />
+</svg>;
+
+export default FailIcon;

components/icons/NotFoundIcon.tsx → apps/bridge/components/Icons/NotFoundIcon.tsx

@@ -5,6 +5,4 @@ const NotFoundIcon = (props) => (
 
 );
 
-export default NotFoundIcon;
-
-
+export default NotFoundIcon;

components/icons/layerSwapLogo.tsx → apps/bridge/components/Icons/layerSwapLogo.tsx

@@ -1,6 +1,6 @@
-import { SVGProps, forwardRef } from "react";
+import { SVGProps } from "react";
 
-const LayerswapLogo = forwardRef<HTMLDivElement, SVGProps<SVGSVGElement>>((props) => {
+const LayerswapLogo = ((props: SVGProps<SVGSVGElement>) => {
     return (
         <>
             <svg xmlns="http://www.w3.org/2000/svg" width="302" height="77" viewBox="0 0 302 77" fill="none" {...props}>

components/icons/layerSwapMobileLogo.tsx → apps/bridge/components/Icons/layerSwapMobileLogo.tsx

@@ -1,6 +1,6 @@
-import { SVGProps, forwardRef } from "react";
+import { SVGProps } from "react";
 
-const LayerswapMobileLogo = forwardRef<HTMLDivElement, SVGProps<SVGSVGElement>>((props) => {
+const LayerswapMobileLogo = ((props: SVGProps<SVGSVGElement>) => {
     return (
         <>
             <svg {...props} width="88" height="16" viewBox="0 0 88 16" fill="none" xmlns="http://www.w3.org/2000/svg">

components/MessageComponent.tsx → apps/bridge/components/MessageComponent.tsx

@@ -1,7 +1,9 @@
-import CancelIcon from "./icons/CancelIcon";
-import DelayIcon from "./icons/DelayIcon";
-import FailIcon from "./icons/FailIcon";
-import SuccessIcon from "./icons/SuccessIcon";
+import CancelIcon from "./Icons/CancelIcon";
+import DelayIcon from "./Icons/DelayIcon";
+import FailIcon from "./Icons/FailIcon";
+import SuccessIcon from "./Icons/SuccessIcon";
+import type { JSX } from 'react';
+
 type iconStyle = 'red' | 'green' | 'yellow' | 'gray'
 
 class MessageComponentProps {