Merge remote-tracking branch 'origin/next' into next

WatchItDev · Jan 10, 2025 · 8a9ad56 · 8a9ad56
2 parents 95958d5 + ac58456
commit 8a9ad56
Show file tree

Hide file tree

Showing 44 changed files with 589 additions and 23,753 deletions.
diff --git a/.github/workflows/next.yml b/.github/workflows/next.yml
@@ -17,7 +17,7 @@ jobs:
       pull-requests: write # to be able to comment on released pull requests
       id-token: write # to enable use of OIDC for npm provenance
     secrets: inherit
-  Deploy-Beta:
+  Deploy-Next:
     needs: [Create-Release]
     uses: ./.github/workflows/cd.yml
     secrets: inherit
diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml
@@ -8,7 +8,8 @@ jobs:
   # Continuous-Integration:
   #   uses: ./.github/workflows/ci.yml
   #   secrets: inherit
-  Deploy-Beta:
-    needs: [Create-Release]
+  Deploy-App:
     uses: ./.github/workflows/cd.yml
     secrets: inherit
+    with:
+      environment: "production"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,42 @@
+# [2.2.0-beta.11](https://github.com/WatchItDev/watchit-app/compare/v2.2.0-beta.10...v2.2.0-beta.11) (2025-01-10)
+
+
+### Features
+
+* adapt new protocol contracts ([08888eb](https://github.com/WatchItDev/watchit-app/commit/08888eb71981aba1cae9193490320d3d2230f067))
+
+# [2.2.0-beta.10](https://github.com/WatchItDev/watchit-app/compare/v2.2.0-beta.9...v2.2.0-beta.10) (2025-01-10)
+
+
+### Bug Fixes
+
+* ensure consistent handling of numeric input for finance forms ([86e84be](https://github.com/WatchItDev/watchit-app/commit/86e84be1feede66394967fe16dc794624bac7b5c))
+* remove some extra error notifications ([d9686a9](https://github.com/WatchItDev/watchit-app/commit/d9686a9105a32389a71673b63356c3060213185a))
+* remove wallet environment detection ([cff1edc](https://github.com/WatchItDev/watchit-app/commit/cff1edc1f27007494787d878d8ee78207e1c75b3))
+
+
+### Features
+
+* added detect wallet environment hook ([aca7dc6](https://github.com/WatchItDev/watchit-app/commit/aca7dc635937c248f5fc774d06530e9471aea57f))
+* added detect wallet environment hook ([247f005](https://github.com/WatchItDev/watchit-app/commit/247f005068ae34a5d7ff66ef5c56c0767f2b9891))
+* **finance:** add helper component for MetaMask guidance ([e42ec9f](https://github.com/WatchItDev/watchit-app/commit/e42ec9f3dbb7c389869d0143eb095930da4b259f))
+
+# [2.2.0-beta.9](https://github.com/WatchItDev/watchit-app/compare/v2.2.0-beta.8...v2.2.0-beta.9) (2025-01-09)
+
+
+### Bug Fixes
+
+* typo ([4fbfa56](https://github.com/WatchItDev/watchit-app/commit/4fbfa5611e8b9134ed5109ec7cd57ad57c3750bf))
+* typo ([ad11871](https://github.com/WatchItDev/watchit-app/commit/ad11871225820785efc63daae9dd027e7c98e6cf))
+
+# [2.2.0-beta.8](https://github.com/WatchItDev/watchit-app/compare/v2.2.0-beta.7...v2.2.0-beta.8) (2025-01-09)
+
+
+### Features
+
+* change aproach of withdraw to select destination on tabs ([0528930](https://github.com/WatchItDev/watchit-app/commit/05289307495da69be521ce813d95f470935d6740))
+* **finance-quick-transfer:** enhance slider validation logic ([f60a687](https://github.com/WatchItDev/watchit-app/commit/f60a6879396ac13e644f2d19ddd0f255c6e14952))
+
 # [2.2.0-beta.7](https://github.com/WatchItDev/watchit-app/compare/v2.2.0-beta.6...v2.2.0-beta.7) (2025-01-09)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "watchit",
   "author": "Watchit",
   "type": "module",
-  "version": "2.2.0-beta.7",
+  "version": "2.2.0-beta.11",
   "description": "Open videos everywhere",
   "email": "[email protected]",
   "private": true,

diff --git a/src/App.tsx b/src/App.tsx
@@ -46,6 +46,7 @@ import { ResponsiveOverlay } from '@src/components/responsive-overlay';
 
 import { Buffer } from 'buffer';
 import { Provider } from 'react-redux';
+import { MetaMaskProvider } from '@metamask/sdk-react';
 
 window.Buffer = Buffer;
 
@@ -67,32 +68,52 @@ export default function App() {
   useScrollToTop();
 
   return (
-    <LocalizationProvider dateAdapter={AdapterDateFns}>
-      <SettingsProvider
-        defaultSettings={{
-          themeMode: 'dark', // 'light' | 'dark'
-          themeDirection: 'ltr', //  'rtl' | 'ltr'
-          themeContrast: 'default', // 'default' | 'bold'
-          themeLayout: 'vertical', // 'vertical' | 'horizontal' | 'mini'
-          themeColorPresets: 'default', // 'default' | 'cyan' | 'purple' | 'blue' | 'orange' | 'red'
-          themeStretch: false,
-        }}
-      >
-        <AuthProvider>
-          <Provider store={store}>
-            <ThemeProvider>
-              <MotionLazy>
-                <SnackbarProvider>
-                  <SettingsDrawer />
-                  <ProgressBar />
-                  <Router />
-                  <ResponsiveOverlay />
-                </SnackbarProvider>
-              </MotionLazy>
-            </ThemeProvider>
-          </Provider>
-        </AuthProvider>
-      </SettingsProvider>
-    </LocalizationProvider>
+    <MetaMaskProvider
+      sdkOptions={{
+        dappMetadata: {
+          name: 'Watchit Dapp',
+          url: window.location.href,
+        },
+        openDeeplink: (url) => {
+          const isMM = (window as any).ethereum?.isMetaMask;
+          if (typeof (window as any).ethereum === 'undefined' || !isMM) {
+            // Mobile version / no extension
+            window.location.href = 'https://metamask.app.link';
+          } else {
+            // Desktop with MetaMask extension
+            window.location.href = url;
+          }
+        },
+        // headless: true,  // If we wanted to personalize our own modals
+      }}
+    >
+      <LocalizationProvider dateAdapter={AdapterDateFns}>
+        <SettingsProvider
+          defaultSettings={{
+            themeMode: 'dark', // 'light' | 'dark'
+            themeDirection: 'ltr', //  'rtl' | 'ltr'
+            themeContrast: 'default', // 'default' | 'bold'
+            themeLayout: 'vertical', // 'vertical' | 'horizontal' | 'mini'
+            themeColorPresets: 'default', // 'default' | 'cyan' | 'purple' | 'blue' | 'orange' | 'red'
+            themeStretch: false,
+          }}
+        >
+          <AuthProvider>
+            <Provider store={store}>
+              <ThemeProvider>
+                <MotionLazy>
+                  <SnackbarProvider>
+                    <SettingsDrawer />
+                    <ProgressBar />
+                    <Router />
+                    <ResponsiveOverlay />
+                  </SnackbarProvider>
+                </MotionLazy>
+              </ThemeProvider>
+            </Provider>
+          </AuthProvider>
+        </SettingsProvider>
+      </LocalizationProvider>
+    </MetaMaskProvider>
   );
 }
diff --git a/src/clients/viem/walletClient.ts b/src/clients/viem/walletClient.ts
diff --git a/src/components/login-modal/profile-select-view.tsx b/src/components/login-modal/profile-select-view.tsx
@@ -85,7 +85,7 @@ export const ProfileSelectView: React.FC<ProfileSelectionProps> = ({
           </Box>
         </Box>
         <Button onClick={onDisconnect} sx={{ ml: 'auto' }}>
-          Change wallet
+          Change Wallet
         </Button>
       </Box>
 

diff --git a/src/config-global.ts b/src/config-global.ts
@@ -22,6 +22,8 @@ export const GLOBAL_CONSTANTS = {
     process.env.VITE_POLICIES_AGG_ADDRESS || import.meta.env.VITE_POLICIES_AGG_ADDRESS || '',
   LEDGER_VAULT_ADDRESS:
     process.env.VITE_LEDGER_VAULT_ADDRESS || import.meta.env.VITE_LEDGER_VAULT_ADDRESS || '',
+  SUBSCRIPTION_CAMPAIGN_ADDRESS:
+    process.env.VITE_SUBSCRIPTION_CAMPAIGN_ADDRESS || import.meta.env.VITE_SUBSCRIPTION_CAMPAIGN_ADDRESS || '',
   OKLINK_API_KEY: process.env.VITE_OKLINK_API_KEY || import.meta.env.VITE_OKLINK_API_KEY || '',
   RIGHT_POLICY_AUTHORIZER:
     process.env.VITE_RIGHT_POLICY_AUTHORIZER || import.meta.env.VITE_RIGHT_POLICY_AUTHORIZER || '',