Merge remote-tracking branch 'origin/main' into jjjj/jup-api-liquidator

CODEOWNERS

@@ -1,3 +1,3 @@
 # CODEOWNERS
 
-* @edgarpavlovsky @losman0s @jkbpvsc
+* @chambaz @losman0s

apps/marginfi-v2-ui/.gitignore

@@ -42,3 +42,9 @@ next-env.d.ts
 
 # Sentry Auth Token
 .sentryclirc
+
+# PWA
+public/sw.js
+public/workbox-*.js
+public/sw.js.map
+public/workbox-*.js.map

apps/marginfi-v2-ui/components.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://ui.shadcn.com/schema.json",
+  "style": "new-york",
+  "rsc": false,
+  "tsx": true,
+  "tailwind": {
+    "config": "tailwind.config.js",
+    "css": "~/styles/globals.css",
+    "baseColor": "zinc",
+    "cssVariables": true
+  },
+  "aliases": {
+    "components": "~/components",
+    "utils": "~/utils/themeUtils"
+  }
+}

apps/marginfi-v2-ui/next.config.js

@@ -1,8 +1,13 @@
+const withPWA = require("next-pwa")({
+  dest: "public",
+  disable: process.env.NODE_ENV === "development",
+});
+
 const withBundleAnalyzer = require("@next/bundle-analyzer")({
   enabled: process.env.ANALYZE === "true",
 });
 
-module.exports = withBundleAnalyzer({
+let config = withBundleAnalyzer({
   /**
    * Dynamic configuration available for the browser and server.
    * Note: requires `ssr: true` or a `getInitialProps` in `_app.tsx`
@@ -55,6 +60,18 @@ module.exports = withBundleAnalyzer({
         port: "",
         pathname: "/static-marginfi/**",
       },
+      {
+        protocol: "https",
+        hostname: "lh3.googleusercontent.com",
+        port: "",
+        pathname: "/**",
+      },
+      {
+        protocol: "https",
+        hostname: "pbs.twimg.com",
+        port: "",
+        pathname: "/profile_images/**",
+      },
       {
         protocol: "https",
         hostname: "arweave.net",
@@ -65,16 +82,34 @@ module.exports = withBundleAnalyzer({
         protocol: "https",
         hostname: "shdw-drive.genesysgo.net",
         port: "",
-        pathname: "/6tcnBSybPG7piEDShBcrVtYJDPSvGrDbVvXmXKpzBvWP/**",
+        pathname: "/**",
+      },
+      {
+        protocol: "https",
+        hostname: "solblaze.org",
+        port: "",
+        pathname: "/assets/**",
+      },
+      {
+        protocol: "https",
+        hostname: "s.gravatar.com",
+        port: "",
+        pathname: "/avatar/**",
+      },
+      {
+        protocol: "https",
+        hostname: "pyth.network",
+        port: "",
+        pathname: "/**",
       },
     ],
   },
 });
 
 const { withSentryConfig } = require("@sentry/nextjs");
 
-module.exports = withSentryConfig(
-  module.exports,
+config = withSentryConfig(
+  config,
   {
     // For all available options, see:
     // https://github.com/getsentry/sentry-webpack-plugin#options
@@ -105,3 +140,5 @@ module.exports = withSentryConfig(
     disableLogger: true,
   }
 );
+
+module.exports = withPWA(config);

apps/marginfi-v2-ui/package.json

@@ -17,6 +17,7 @@
     "@emotion/styled": "^11.10.5",
     "@jup-ag/api": "^6.0.6",
     "@jup-ag/react-hook": "^6.0.0-beta.2",
+    "@moonpay/moonpay-js": "^0.1.0",
     "@mrgnlabs/lip-client": "*",
     "@mrgnlabs/marginfi-client-v2": "*",
     "@mrgnlabs/marginfi-v2-ui-state": "*",
@@ -25,33 +26,59 @@
     "@mui/material": "^5.11.2",
     "@next/bundle-analyzer": "^13.4.19",
     "@next/font": "13.1.1",
-    "@sentry/nextjs": "^7.68.0",
+    "@radix-ui/react-collapsible": "^1.0.3",
+    "@radix-ui/react-dialog": "^1.0.5",
+    "@radix-ui/react-icons": "^1.3.0",
+    "@radix-ui/react-label": "^2.0.2",
+    "@radix-ui/react-popover": "^1.0.7",
+    "@radix-ui/react-select": "^2.0.0",
+    "@radix-ui/react-slot": "^1.0.2",
+    "@sentry/nextjs": "^7.77.0",
     "@socialgouv/matomo-next": "^1.4.0",
     "@solana/spl-stake-pool": "^0.6.5",
     "@solana/spl-token-registry": "^0.2.4574",
-    "@solana/wallet-adapter-base": "^0.9.20",
-    "@solana/wallet-adapter-react": "^0.15.28",
-    "@solana/wallet-adapter-react-ui": "^0.9.27",
+    "@solana/wallet-adapter-ant-design": "^0.11.31",
+    "@solana/wallet-adapter-base": "^0.9.23",
+    "@solana/wallet-adapter-material-ui": "^0.16.33",
+    "@solana/wallet-adapter-react": "^0.15.35",
+    "@solana/wallet-adapter-react-ui": "^0.9.34",
     "@solana/wallet-adapter-wallets": "^0.19.10",
     "@solana/web3.js": "^1.73.0",
+    "@tabler/icons-react": "^2.40.0",
     "@vercel/analytics": "^1.0.0",
+    "@walletconnect/modal": "^2.6.2",
+    "@web3auth/no-modal": "^7.0.4",
+    "@web3auth/openlogin-adapter": "^7.0.4",
+    "@web3auth/solana-provider": "^7.0.4",
+    "@web3auth/solana-wallet-connector-plugin": "^7.0.4",
     "bignumber.js": "^9.1.1",
     "bn.js": "^5.2.1",
     "bs58": "^5.0.0",
+    "class-variance-authority": "^0.7.0",
+    "clsx": "^2.0.0",
+    "cmdk": "^0.2.0",
     "firebase": "^9.22.1",
     "firebase-admin": "^11.9.0",
     "jsbi": "^4.3.0",
     "lodash.debounce": "^4.0.8",
+    "minidenticons": "^4.2.0",
     "next": "13.4.19",
+    "next-pwa": "^5.6.0",
     "react": "18.2.0",
+    "react-cookie": "^6.1.1",
+    "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "18.2.0",
     "react-hotkeys-hook": "^4.4.1",
     "react-katex": "^3.0.1",
     "react-number-format": "^5.2.2",
+    "react-responsive": "^9.0.2",
     "react-spinners": "^0.13.8",
     "react-toastify": "^9.1.1",
     "sharp": "^0.31.3",
     "superstruct": "^1.0.3",
+    "swiper": "^11.0.3",
+    "tailwind-merge": "^1.14.0",
+    "tailwindcss-animate": "^1.0.7",
     "tweetnacl": "^1.0.3",
     "uuid": "^9.0.0",
     "zustand": "^4.4.1"
@@ -63,6 +90,7 @@
     "@types/node": "18.11.18",
     "@types/numeral": "^2.0.2",
     "@types/react": "18.0.26",
+    "@types/react-copy-to-clipboard": "^5.0.5",
     "@types/react-dom": "18.0.10",
     "@types/react-katex": "^3.0.0",
     "@types/uuid": "^9.0.2",

apps/marginfi-v2-ui/public/manifest.json

@@ -0,0 +1,22 @@
+{
+  "name": "marginfi",
+  "short_name": "marginfi",
+  "icons": [
+    {
+      "src": "/mrgn_logo_192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "any maskable"
+    },
+    {
+      "src": "/mrgn_logo_512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#0F1111",
+  "background_color": "#0F1111",
+  "start_url": "/",
+  "display": "standalone",
+  "orientation": "portrait"
+}