@@ -18,13 +18,22 @@ export const metamaskSignTransaction = async (txn: EIP1559Transaction) => {
1818};
1919
2020const metamaskSendTransaction = async (txn: FakeSignableTx, web3: Web3) => {
21− const accounts = await web3.eth.getAccounts();
22− if(accounts.length === 0) {
23− throw new Error('No accounts connected');
21+ let from = null;
22+ if(window.ethereum) {
23+ from = window.ethereum.selectedAddress;
24+ if (!from) {
25+ const accounts = await window.ethereum.request({ method: 'eth_requestAccounts' });
26+ from = accounts[0] ?? null;
27+ }
28+ } else if (window.web3) {
29+ from = window.web3?.eth?.defaultAccount ?? null;
30+ } else {
31+ const accounts = await web3.eth.getAccounts();
32+ from = accounts[0] ?? null;
2433 }
25− const from = accounts[0];
34+
2635 const { data, to, value, maxPriorityFeePerGas, maxFeePerGas } = txn.toJSON();
27− if (!(data && to && value && maxPriorityFeePerGas && maxFeePerGas && from)) { // TODO
36+ if (!(data && to && value && maxPriorityFeePerGas && maxFeePerGas && from)) {
2837 throw new Error('Unable to send Metamask TX, something is missing');
2938 }
3039