Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.0",
"bignumber.js": "^9.0.2",
"ethers": "5.7.0",
"qrcode.react": "^3.0.1",
"react-localization": "^1.0.19",
"react-syntax-highlighter": "^15.5.0",
Expand Down
5 changes: 4 additions & 1 deletion src/example/components/AccountSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import MetaMaskIcon from "./MetaMaskIcon";
import ReefIcon from "../../ui-kit/components/assets/ReefIcon";
import ReefSign from "../../ui-kit/components/assets/ReefSign";
import { WalletConnectLogo } from "../../ui-kit/components/assets/WalletConnect";
import {BigNumber} from "ethers";

const availableExtensions: Extension[] = [
{
Expand Down Expand Up @@ -52,6 +53,8 @@ const accounts = [
name: "Test Account 1",
address: "5CSJtNRJHEazGS4xs5PvmRddTb5xGSwLkhQcs7KAyHAdshpY",
evmAddress: "0x8Cc9EB01a8B68696768dB0b8D5C6dDF8dE467523",
freeBalance: BigNumber.from("0x0d0a800fbbfc34d69740"),
lockedBalance: BigNumber.from("0x00"),
},
{
name: "Test Account 2",
Expand Down Expand Up @@ -148,7 +151,7 @@ const code = `const accounts = [
{
name: "Test Account 1",
address: "5CSJtNRJHEazGS4xs5PvmRddTb5xGSwLkhQcs7KAyHAdshpY",
evmAddress: "0x8Cc9EB01a8B68696768dB0b8D5C6dDF8dE467523"
evmAddress: "0x8Cc9EB01a8B68696768dB0b8D5C6dDF8dE467523",
},
{
name: "Test Account 2",
Expand Down
30 changes: 29 additions & 1 deletion src/ui-kit/components/organisms/AccountSelector/Account.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Identicon from "@polkadot/react-identicon";
import { formatAddress } from "../../../utils/format";
import { formatAddress, formatHumanAmount } from "../../../utils/format";
import CopyButton from "../CopyButton";
import Button from "../../atoms/Button";
import QRCode from "../../atoms/QRCode";
Expand All @@ -12,6 +12,7 @@ import Input from "../../atoms/Input";
import Form from "../../atoms/Form";
import Text from "../../atoms/Text";
import * as util from '@reef-chain/util-lib';
import { BigNumber, ethers } from "ethers";

export interface Props {
name?: string;
Expand All @@ -26,6 +27,8 @@ export interface Props {
onForget?: () => any;
className?: string;
isEvmClaimed?: boolean;
lockedBalance?:BigNumber;
freeBalance?:BigNumber;
}

const Account = ({
Expand All @@ -35,6 +38,8 @@ const Account = ({
source,
isSelected,
isEvmClaimed,
lockedBalance,
freeBalance,
showOptions,
onSelect,
onRename,
Expand Down Expand Up @@ -139,6 +144,29 @@ const Account = ({
</div>
}

{freeBalance && <div className="uik-account-selector-account__balance">
<div className="uik-account-selector-account__address">
Free Balance :
</div>
<div className="uik-account-selector-account__balance">
<img src="/logo512.png" alt="" className="uik-account-selector-account__balance-icon"/>
<div className="uik-account-selector-account__address">
{freeBalance && freeBalance.gt(0)? `${ethers.utils.formatEther(freeBalance).substring(0,ethers.utils.formatEther(freeBalance).indexOf('.'))} REEFs`:"0 REEF"}
</div>
</div>
</div>}
{lockedBalance && <div className="uik-account-selector-account__balance">
<div className="uik-account-selector-account__address">
Locked Balance :
</div>
<div className="uik-account-selector-account__balance">
<img src="/logo512.png" alt="" className="uik-account-selector-account__balance-icon"/>
<div className="uik-account-selector-account__address">
{lockedBalance && lockedBalance.gt(0)? `${ethers.utils.formatEther(lockedBalance).substring(0,ethers.utils.formatEther(lockedBalance).indexOf('.'))} REEFs`:"0 REEF"}
</div>
</div>
</div>}

<a
className="uik-account-selector-account__open-btn"
href={`https://reefscan.com/account/${address}`}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useEffect, useRef, useState } from "react";
import { CSSTransition } from "react-transition-group";
import { BigNumber } from "ethers";

import Icon from "./../../atoms/Icon";
import {
Expand Down Expand Up @@ -46,6 +47,8 @@ export type Account = {
evmAddress?: string;
source?: string;
isEvmClaimed?: boolean;
lockedBalance?:BigNumber;
freeBalance?:BigNumber;
};

export type Network = "mainnet" | "testnet";
Expand Down Expand Up @@ -566,6 +569,8 @@ function AccountSelector({
address={account.address}
evmAddress={account.evmAddress}
source={account.source}
lockedBalance={account.lockedBalance}
freeBalance={account.freeBalance}
isEvmClaimed={account.isEvmClaimed}
onSelect={() => select(account)}
onRename={
Expand Down Expand Up @@ -602,6 +607,8 @@ function AccountSelector({
evmAddress={account.evmAddress}
source={account.source}
isEvmClaimed={account.isEvmClaimed}
lockedBalance={account.lockedBalance}
freeBalance={account.freeBalance}
onSelect={() => select(account)}
onRename={
onRename
Expand Down
10 changes: 10 additions & 0 deletions src/ui-kit/components/organisms/AccountSelector/index.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
.extension-icon{
display: flex;
padding-right: 4px;
}

.uik-account-selector-account__balance{
display: flex;
}

.uik-account-selector-account__balance-icon{
width: 1rem;
margin-left: 0.5rem;
margin-right: 0.2rem;
}
Loading