Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Metroxe
Metroxe committed Dec 7, 2023
2 parents a3065cc + 10bc049 commit c0e3687
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 15 deletions.
1 change: 0 additions & 1 deletion apps/sentry-client-desktop/src/components/blockpass/Blockpass.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export function Blockpass({onClick = () => {}, children = "Begin KYC"}: PropsWit
function onClickHelper() {
if (selectedCountry) {
if (
selectedCountry === "BG" || //Bulgaria
selectedCountry === "CN" || //China
selectedCountry === "HK" || //Hong Kong
selectedCountry === "MK" || //Macedonia
Expand Down
2 changes: 1 addition & 1 deletion apps/sentry-client-desktop/src/features/home/SentryWallet.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ export function SentryWallet() {

{sentryRunning && balance?.wei === 0n && (
<p className="border border-[#D9771F] bg-[#FEFCE8] text-[#D9771F] text-xs font-semibold uppercase rounded-full px-2">
No ETH
No AETH
</p>
)}

Expand Down
6 changes: 3 additions & 3 deletions apps/sentry-client-desktop/src/features/home/SentryWalletHeader.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ export function SentryWalletHeader() {
<div className="flex items-center gap-1">
<h2 className="font-semibold">Sentry Wallet Balance</h2>
<Tooltip
header={"Funds in ETH required"}
header={"Funds in AETH required"}
body={"Sentry Wallet balance is used to pay gas fees for automatically claiming accrued esXAI."}
banner={true}
bannerTitle={"Recommended minimum balance"}
bannerValue={"0.005 ETH"}
bannerValue={"0.005 AETH"}
>
<AiOutlineInfoCircle className="text-[#A3A3A3]"/>
</Tooltip>
Expand All @@ -43,7 +43,7 @@ export function SentryWalletHeader() {
<div className="flex justify-center items-center gap-4">
<div className="flex justify-center items-center gap-1">
<FaEthereum className="w-6 h-6"/>
<p className={classNames(getEthFundsTextColor(), "text-2xl font-semibold")}>{(balance == undefined) ? "" : (balance.ethString === "0.0" ? "0" : balance.ethString)} ETH</p>
<p className={classNames(getEthFundsTextColor(), "text-2xl font-semibold")}>{(balance == undefined) ? "" : (balance.ethString === "0.0" ? "0" : balance.ethString)} AETH</p>
</div>
{isBalanceLoading ? (
<p className="flex items-center text-[15px] text-[#A3A3A3] select-none">
Expand Down
4 changes: 2 additions & 2 deletions ...ntry-client-desktop/src/features/home/modals/actions-required/FundsInSentryWalletCard.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export function FundsInSentryWalletCard() {
/>

<p className="text-[15px] text-[#525252] mt-3">
To fund the Sentry Wallet, send ETH to this address
To fund the Sentry Wallet, send AETH to this address
</p>

<div
Expand Down Expand Up @@ -80,7 +80,7 @@ export function FundsInSentryWalletCard() {

<div className="flex flex-row items-center gap-1">
<FaEthereum className="w-4 h-4 mb-[-2px]"/>
<p className="text-[#525252] text-[14px] font-semibold">0.005 ETH</p>
<p className="text-[#525252] text-[14px] font-semibold">0.005 AETH</p>
</div>
</div>
</>
Expand Down
8 changes: 4 additions & 4 deletions apps/sentry-client-desktop/src/features/keys/modals/buy-keys/BuyKeysOrderTotal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ export function BuyKeysOrderTotal({quantity, promoCode, setPromoCode}: BuyKeysOr
</div>
<div className="flex flex-row items-center gap-1">
<p className="font-semibold">
{ethers.formatEther(item.totalPriceForTier)} ETH
{ethers.formatEther(item.totalPriceForTier)} AETH
</p>
</div>
</div>
<p className="text-[13px] text-[#A3A3A3] mb-4">
{ethers.formatEther(item.pricePer)} ETH per key
{ethers.formatEther(item.pricePer)} AETH per key
</p>
</div>
);
Expand Down Expand Up @@ -118,7 +118,7 @@ export function BuyKeysOrderTotal({quantity, promoCode, setPromoCode}: BuyKeysOr
</div>
<div className="flex flex-row items-center gap-1">
<p className="text-[#2A803D] font-semibold">
{ethers.formatEther(getPriceData.price * BigInt(5) / BigInt(100))} ETH
{ethers.formatEther(getPriceData.price * BigInt(5) / BigInt(100))} AETH
</p>
</div>
</div>
Expand Down Expand Up @@ -217,7 +217,7 @@ export function BuyKeysOrderTotal({quantity, promoCode, setPromoCode}: BuyKeysOr
: ethers.formatEther(getPriceData.price)
}
</p>
<p>ETH</p>
<p>AETH</p>
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions apps/web-connect/src/features/checkout/WebBuyKeysOrderTotal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ export function WebBuyKeysOrderTotal(
<div className="flex flex-row items-center gap-1">
<span
className="font-semibold">
{ethers.formatEther(item.totalPriceForTier)} ETH
{ethers.formatEther(item.totalPriceForTier)} AETH
</span>
</div>
</div>
<p className="text-[13px] text-[#A3A3A3] mb-4">
{ethers.formatEther(item.pricePer)} ETH per key
{ethers.formatEther(item.pricePer)} AETH per key
</p>
</div>
);
Expand Down Expand Up @@ -121,7 +121,7 @@ export function WebBuyKeysOrderTotal(
</div>
<div className="flex flex-row items-center gap-1">
<span className="text-[#2A803D] font-semibold">
{ethers.formatEther(getPriceData.price * BigInt(5) / BigInt(100))} ETH
{ethers.formatEther(getPriceData.price * BigInt(5) / BigInt(100))} AETH
</span>
</div>
</div>
Expand Down Expand Up @@ -224,7 +224,7 @@ export function WebBuyKeysOrderTotal(
: ethers.formatEther(getPriceData.price)
}
</span>
<span>ETH</span>
<span>AETH</span>
</div>
</div>
</div>
Expand Down

0 comments on commit c0e3687

Please sign in to comment.