Skip to content

Commit 203272b

Browse files
Aniket-Enggyann300
authored andcommitted
fix address copy
1 parent d9e307e commit 203272b

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

libs/remix-ui/run-tab/src/lib/actions/account.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { shortenAddress } from "@remix-ui/helper"
22
import { RunTab } from "../types/run-tab"
33
import { clearInstances, setAccount, setExecEnv } from "./actions"
44
import { displayNotification, displayPopUp, fetchAccountsListFailed, fetchAccountsListRequest, fetchAccountsListSuccess, setMatchPassphrase, setPassphrase } from "./payload"
5-
import { RunTabState } from "../types"
5+
import { toChecksumAddress } from '@ethereumjs/util'
66

77
export const updateAccountBalances = async (plugin: RunTab, dispatch: React.Dispatch<any>) => {
88
const accounts = plugin.REACT_API.accounts.loadedAccounts
@@ -37,8 +37,7 @@ export const fillAccountsList = async (plugin: RunTab, dispatch: React.Dispatch<
3737

3838
if (provider === 'injected') {
3939
const selectedAddress = plugin.blockchain.getInjectedWeb3Address()
40-
41-
if (!(Object.keys(loadedAccounts).includes(selectedAddress))) setAccount(dispatch, null)
40+
if (!(Object.keys(loadedAccounts).includes(toChecksumAddress(selectedAddress)))) setAccount(dispatch, null)
4241
}
4342
dispatch(fetchAccountsListSuccess(loadedAccounts))
4443
}).catch((e) => {

libs/remix-ui/run-tab/src/lib/components/account.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ export function AccountUI(props: AccountProps) {
1818
const intl = useIntl()
1919

2020
useEffect(() => {
21-
if (!selectedAccount && accounts.length > 0) props.setAccount(accounts[0])
21+
if ((!selectedAccount || !accounts.includes(selectedAccount)) && accounts.length > 0) {
22+
props.setAccount(accounts[0])
23+
}
2224
}, [accounts, selectedAccount])
2325

2426
useEffect(() => {

0 commit comments

Comments
 (0)