From a3a7fc2965281de07d6d8064f5df29dc4496a684 Mon Sep 17 00:00:00 2001
From: jeryongchan <jeryong86@gmail.com>
Date: Fri, 26 Jan 2024 11:29:31 +0700
Subject: [PATCH] yet another metamask-webpack fix

---
 .erb/configs/webpack.config.base.ts           |  2 +-
 package-lock.json                             |  2 +-
 src/renderer/components/payment/Payment.tsx   | 12 +++++++++++-
 src/renderer/components/payment/handlePay.tsx |  8 +++++---
 src/renderer/utils/cryptoUtils.tsx            |  1 +
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.erb/configs/webpack.config.base.ts b/.erb/configs/webpack.config.base.ts
index 6861879..2444264 100644
--- a/.erb/configs/webpack.config.base.ts
+++ b/.erb/configs/webpack.config.base.ts
@@ -81,7 +81,7 @@ const configuration: webpack.Configuration = {
     // There is no need to add aliases here, the paths in tsconfig get mirrored
     plugins: [new TsconfigPathsPlugins()],
     alias: {
-      react: path.resolve('./node_modules/react')
+      react: path.resolve('./src/node_modules/react')
     }
   },
 
diff --git a/package-lock.json b/package-lock.json
index f6e4cd1..e86b240 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "mec_anywhere_desktop",
+  "name": "test_meca",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
diff --git a/src/renderer/components/payment/Payment.tsx b/src/renderer/components/payment/Payment.tsx
index 8f8dbf4..01903e9 100644
--- a/src/renderer/components/payment/Payment.tsx
+++ b/src/renderer/components/payment/Payment.tsx
@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
-import { MetaMaskSDK, SDKProvider } from '@metamask/sdk';
 import { Box, Typography } from '@mui/material';
+import { MetaMaskSDK, SDKProvider } from '../../../node_modules/@metamask/sdk';
+import Web3 from '../../../node_modules/web3';
 import QRCodePopover from './QRCodePopover';
 import WalletDisconnected from './WalletDisconnected';
 import WalletConnected from './WalletConnected';
@@ -29,6 +30,14 @@ const Payment = () => {
     setErrorDialogOpen(false);
   };
 
+  useEffect(()=>{
+    console.log("sdk", sdk)
+  }, [sdk])
+
+  useEffect(()=>{
+    console.log("provider", provider)
+  }, [provider])
+
   useEffect(() => {
     const getClientBalance = async () => {
       if (provider && account.length === 42) {
@@ -44,6 +53,7 @@ const Payment = () => {
   }, [provider, account]);
 
   const handleConnect = async () => {
+    console.log('Web3', Web3)
     const clientSdk = new MetaMaskSDK({
       shouldShimWeb3: false,
       storage: {
diff --git a/src/renderer/components/payment/handlePay.tsx b/src/renderer/components/payment/handlePay.tsx
index 4d5906b..32394fd 100644
--- a/src/renderer/components/payment/handlePay.tsx
+++ b/src/renderer/components/payment/handlePay.tsx
@@ -1,5 +1,7 @@
-import Web3 from 'web3';
-import { AbiItem } from 'web3-utils';
+// import { AbiItem } from '../../../web3-utils';
+// import { AbiItem } from '../../../node_modules/web3-utils';
+// import { AbiItem } from '../../../node_modules/web3-utils';
+import Web3 from '../../../node_modules/web3';
 import paymentContractAbi from './PaymentContract.json';
 
 const handlePay = async (
@@ -10,7 +12,7 @@ const handlePay = async (
 ) => {
   try {
     const web3 = new Web3(provider);
-    const paymentContract = paymentContractAbi as AbiItem[];
+    const paymentContract = paymentContractAbi;
     const contract = new web3.eth.Contract(paymentContract, contractAddress);
     const did = window.electron.store.get('did');
     const amountToSend = web3.utils.toWei(amount.toString(), 'ether');
diff --git a/src/renderer/utils/cryptoUtils.tsx b/src/renderer/utils/cryptoUtils.tsx
index e7e4733..0627d70 100644
--- a/src/renderer/utils/cryptoUtils.tsx
+++ b/src/renderer/utils/cryptoUtils.tsx
@@ -5,6 +5,7 @@ import sha3 from 'js-sha3';
 import secp256k1 from '../../node_modules/secp256k1';
 
 export const generateKeyPair = async (mnemonic: string) => {
+  console.log("secp256k1", secp256k1)
   const seed = mnemonicToSeedSync(mnemonic).toString('hex');
   const privateKey = SHA256(seed).toString();
   const privateKeyBuffer = Buffer.from(privateKey, 'hex');