feat: oxychatwallet

web3sp · Jun 15, 2023 · 093b611 · 093b611
1 parent 724d780
commit 093b611
Show file tree

Hide file tree

Showing 11 changed files with 571 additions and 6 deletions.
diff --git a/examples/react/package.json b/examples/react/package.json
@@ -18,7 +18,7 @@
     "react-scripts": "5.0.1",
     "styled-components": "^5.3.5",
     "typescript": "^4.4.2",
-    "venom-connect": "^1.0.17"
+    "venom-connect": "1.0.21"
   },
   "scripts": {
     "start": "react-scripts start",

diff --git a/examples/react/src/App.tsx b/examples/react/src/App.tsx
@@ -16,7 +16,7 @@ import {
   Container,
   Divider,
   Grid,
-  Typography,
+  Typography
 } from "@mui/material";
 
 const initTheme = "light" as const;
@@ -109,6 +109,33 @@ const initVenomConnect = async () => {
           "android",
         ],
       },
+      oxychatwallet: {
+        walletWaysToConnect: [
+          {
+            // NPM package
+            package: ProviderRpcClient,
+            packageOptions: {
+              fallback:
+                VenomConnect.getPromise("oxychatwallet", "extension") ||
+                (() => Promise.reject()),
+              forceUseFallback: true,
+            },
+            packageOptionsStandalone: {
+              fallback: standaloneFallback,
+              forceUseFallback: true,
+            },
+
+            // Setup
+            id: "extension",
+            type: "extension",
+          },
+        ],
+        defaultWalletWaysToConnect: [
+          // List of enabled options
+          "ios",
+          "android",
+        ],
+      },
       //
       // Temporarily hidden Ever wallet
       //
@@ -283,6 +310,24 @@ const App = () => {
         <Grid item>
           <Typography variant="h1" component="h1" textAlign="center">
             Example
+            {/* (v1.0.14) */}
+            <br />
+            <small>(OXY.CHAT version)</small>
+            <div
+              style={{
+                display: "flex",
+                justifyContent: "center",
+                alignItems: "center",
+              }}
+            >
+              <i
+                style={{
+                  fontSize: "0.3em",
+                }}
+              >
+                [Deployment: Nov 28 2022]
+              </i>
+            </div>
           </Typography>
         </Grid>
       </Grid>

diff --git a/src/VenomConnect.tsx b/src/VenomConnect.tsx
@@ -210,6 +210,10 @@ class VenomConnect {
         } else if (this.checkIsWalletBrowser().isEverWalletBrowser) {
           await this.connectTo("everwallet", "extension");
 
+          // проверяем что мобильный oxychat
+        } else if (this.checkIsWalletBrowser().isOxyWalletBrowser) {
+          await this.connectTo("oxychatwallet", "extension");
+
           // показываем обычный попап
         } else {
           await this._toggleModal();
@@ -398,6 +402,7 @@ class VenomConnect {
 
   private checkIsWalletBrowser = () => {
     const ids = this.options.map(({ id }) => id);
+
     const isVenomWalletBrowser = !!(
       navigator &&
       navigator.userAgent.includes("VenomWalletBrowser") &&
@@ -408,10 +413,17 @@ class VenomConnect {
       navigator.userAgent.includes("EverWalletBrowser") &&
       ids.includes("everwallet")
     );
+    const isOxyWalletBrowser = !!(
+      navigator &&
+      navigator.userAgent.includes("OxyWalletBrowser") &&
+      ids.includes("oxychatwallet")
+    );
     return {
       isVenomWalletBrowser,
       isEverWalletBrowser,
-      isOneOfWalletBrowsers: isVenomWalletBrowser || isEverWalletBrowser,
+      isOxyWalletBrowser,
+      isOneOfWalletBrowsers:
+        isVenomWalletBrowser || isEverWalletBrowser || isOxyWalletBrowser,
     };
   };
 

diff --git a/src/components/Modal.tsx b/src/components/Modal.tsx
@@ -47,6 +47,9 @@ declare global {
     __hasVenomProvider?: boolean;
     __venom?: any;
 
+    // oxychat wallet
+    __oxy?: any;
+
     // lib
     updateVenomModal: any;
     venomNetworkIntervalId?: number;
@@ -151,7 +154,6 @@ export const Modal = ({
       ret = [...ret, ...o.walletWaysToConnect];
     });
     return ret;
-    // return options.find(({ id }) => id === _walletId)?.walletWaysToConnect;
   };
 
   // const getInitialSlide = () =>

diff --git a/src/components/NotSupported.tsx b/src/components/NotSupported.tsx
@@ -69,7 +69,7 @@ type BrowserTextProps = {
   browserName: Browsers | string;
 };
 const BrowserText = ({ browserName }: BrowserTextProps) => (
-  <>You need to install {browserName} browser</>
+  browserName ? <>You need to install {browserName} browser</> : <></>
 );
 
 type ProviderBadgeProps = {

diff --git a/src/controllers/ProviderController.ts b/src/controllers/ProviderController.ts
@@ -78,6 +78,32 @@ export const getPromiseRaw = (
         return Promise.reject();
       },
     },
+    oxychatwallet: {
+      // todo
+      extension: () => {
+        if (windowObject) {
+          return new Promise((resolve, reject) => {
+            if (windowObject.__oxy) {
+              resolve(windowObject.__oxy);
+              return;
+            }
+            let nTries = 0; // число попыток, иначе он будет бесконечно, может это вынести в конфиг
+            let interval = setInterval(() => {
+              if (windowObject.__oxy) {
+                clearInterval(interval);
+                resolve(windowObject.__oxy);
+              } else if (nTries > 0) {
+                nTries--;
+              } else {
+                clearInterval(interval);
+                reject("Ever wallet is not found");
+              }
+            }, 100);
+          });
+        }
+        return Promise.reject();
+      },
+    },
   };
 
   // @ts-ignore
@@ -159,6 +185,17 @@ export class ProviderController {
             standalone: {}, // ?
           }
         : {},
+      oxychatwallet: window
+        ? {
+            extension: {
+              forceUseFallback: true,
+              fallback:
+                getPromiseRaw(window, "oxychatwallet") ||
+                (() => Promise.reject("oxychatwallet fallback error")),
+            },
+            standalone: {}, // ?
+          }
+        : {},
     };
 
     this.checkNetworkId = options.checkNetworkId;

diff --git a/src/providers/connectors/index.ts b/src/providers/connectors/index.ts
@@ -1,4 +1,5 @@
 import everwallet from "./everwallet";
+import oxychatwallet from "./oxychatwallet";
 import venomwallet from "./venomwallet";
 
-export { venomwallet, everwallet };
+export { everwallet, oxychatwallet, venomwallet };