wip

ribbon-finance · Aug 23, 2023 · 8339c7d · 8339c7d
1 parent 8e41221
commit 8339c7d
Show file tree

Hide file tree

Showing 8 changed files with 1,727 additions and 39 deletions.
diff --git a/governance/src/App.tsx b/governance/src/App.tsx
@@ -1,5 +1,5 @@
 import { Web3ReactProvider } from "@web3-react/core";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import smoothscroll from "smoothscroll-polyfill";
 import { ConnectionProvider } from "@solana/wallet-adapter-react";
 import "shared/lib/i18n/config";

diff --git a/governance/src/components/Wallet/AccountStatus.tsx b/governance/src/components/Wallet/AccountStatus.tsx
@@ -6,7 +6,6 @@ import React, {
   useState,
 } from "react";
 import styled from "styled-components";
-import { setTimeout } from "timers";
 import { WalletConnectConnector } from "@web3-react/walletconnect-connector";
 
 import Indicator from "shared/lib/components/Indicator/Indicator";

diff --git a/landing/src/components/Header/ItemWithDropdown.tsx b/landing/src/components/Header/ItemWithDropdown.tsx
@@ -1,6 +1,5 @@
 import React, { useCallback, useEffect, useRef, useState } from "react";
 import styled from "styled-components";
-import { setTimeout } from "timers";
 
 import sizes from "../../designSystem/sizes";
 import { Title, BaseButton } from "../../designSystem";

diff --git a/nft-drop/src/components/Wallet/AccountStatus.tsx b/nft-drop/src/components/Wallet/AccountStatus.tsx
@@ -7,7 +7,6 @@ import React, {
 } from "react";
 import styled from "styled-components";
 import { useWeb3React } from "@web3-react/core";
-import { setTimeout } from "timers";
 import { WalletConnectConnector } from "@web3-react/walletconnect-connector";
 
 import Indicator from "shared/lib/components/Indicator/Indicator";

diff --git a/webapp/package.json b/webapp/package.json
@@ -20,8 +20,8 @@
     "@davatar/react": "^1.8.1",
     "@project-serum/anchor": "0.24.2",
     "@solana/wallet-adapter-base": "^0.7.1",
-    "@solana/wallet-adapter-react": "^0.13.1",
-    "@solana/wallet-adapter-wallets": "^0.11.3",
+    "@solana/wallet-adapter-react": "0.15.3",
+    "@solana/wallet-adapter-wallets": "0.19.20",
     "@solana/web3.js": "1.43.6",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
@@ -94,6 +94,14 @@
     "@types/react-router-dom": "^5.1.7",
     "@types/smoothscroll-polyfill": "^0.3.1",
     "@types/styled-components": "^5.1.9",
+    "buffer": "npm:buffer@6.0.3",
+    "crypto": "npm:crypto-browserify@3.12.0",
+    "http": "npm:stream-http@3.2.0",
+    "https": "npm:https-browserify@1.0.0",
+    "stream": "npm:stream-browserify@3.0.0",
+    "util": "npm:util@0.12.5",
+    "zlib": "npm:browserify-zlib@0.2.0",
+    "os": "npm:os-browserify@0.3.0",
     "yarn-audit-fix": "^10.0.0"
   }
 }
diff --git a/webapp/src/App.tsx b/webapp/src/App.tsx
@@ -2,8 +2,8 @@ import { Web3ReactProvider } from "@web3-react/core";
 import { useEffect } from "react";
 import smoothscroll from "smoothscroll-polyfill";
 import {
-  getPhantomWallet,
-  getSolflareWallet,
+  PhantomWalletAdapter,
+  SolflareWalletAdapter,
 } from "@solana/wallet-adapter-wallets";
 import { WalletProvider as SolanaWalletProvider } from "@solana/wallet-adapter-react";
 import RootApp from "./components/RootApp";
@@ -21,7 +21,11 @@ import TextPreview from "shared/lib/components/TextPreview/TextPreview";
 import Geoblocked from "shared/lib/components/Geoblocked/Geoblocked";
 import { LoadingText } from "shared/lib/hooks/useLoadingText";
 import "shared/lib/i18n/config";
-const SOLANA_WALLETS = [getPhantomWallet(), getSolflareWallet()];
+
+const SOLANA_WALLETS = [
+  new PhantomWalletAdapter(),
+  new SolflareWalletAdapter(),
+];
 
 function App() {
   const { loading, rejected } = useGeofence(GeofenceCountry.SINGAPORE);

diff --git a/webapp/src/components/Wallet/AccountStatus.tsx b/webapp/src/components/Wallet/AccountStatus.tsx
@@ -7,7 +7,6 @@ import React, {
 } from "react";
 import styled from "styled-components";
 import { useWeb3Wallet } from "shared/lib/hooks/useWeb3Wallet";
-import { setTimeout } from "timers";
 import Davatar from "@davatar/react";
 
 import sizes from "shared/lib/designSystem/sizes";