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
4 changes: 2 additions & 2 deletions src/components/ClaimModal/ClaimModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ export function ClaimModalMultichain(p: Props) {
helperToast.success(
<div className="flex items-center justify-between">
<div className="text-white/50">
<Trans>Claiming funding fees</Trans>
<Trans>Claiming funding fees...</Trans>
</div>
<SpinnerIcon className="spin size-15 text-white" />
</div>,
Expand Down Expand Up @@ -281,7 +281,7 @@ export function ClaimModalMultichain(p: Props) {
return {
text: (
<>
<Trans>Loading</Trans>
<Trans>Loading...</Trans>
<SpinnerIcon className="ml-4 animate-spin" />
</>
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function ClaimablePositionPriceImpactRebateModalSettlementChain({
onSubmit?: () => void;
} = useMemo(() => {
if (isSubmitting) {
return { text: t`Claiming`, disabled: true };
return { text: t`Claiming...`, disabled: true };
}
return { text: t`Claim`, disabled: false, onSubmit: handleSubmit };
}, [handleSubmit, isSubmitting]);
Expand Down Expand Up @@ -201,7 +201,7 @@ function ClaimablePositionPriceImpactRebateModalMultichain({
helperToast.success(
<div className="flex items-center justify-between">
<div className="text-white/50">
<Trans>Claiming position price impact fees</Trans>
<Trans>Claiming position price impact fees...</Trans>
</div>
<SpinnerIcon className="spin size-15 text-white" />
</div>,
Expand Down Expand Up @@ -247,7 +247,7 @@ function ClaimablePositionPriceImpactRebateModalMultichain({
onSubmit?: () => void;
} = useMemo(() => {
if (isSubmitting) {
return { text: t`Claiming`, disabled: true };
return { text: t`Claiming...`, disabled: true };
}
return { text: t`Claim`, disabled: false, onSubmit: handleSubmit };
}, [handleSubmit, isSubmitting]);
Expand Down
2 changes: 1 addition & 1 deletion src/components/EmptyTableContent/EmptyTableContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export function EmptyTableContent({

return (
<div className="flex min-h-[164px] w-full grow items-center justify-center bg-slate-900 text-[13px] text-typography-secondary">
{isLoading ? <Trans>Loading</Trans> : isEmpty ? emptyText : null}
{isLoading ? <Trans>Loading...</Trans> : isEmpty ? emptyText : null}
</div>
);
}
4 changes: 2 additions & 2 deletions src/components/GmxAccountModal/DepositView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ export const DepositView = () => {
buttonState = {
text: (
<>
<Trans>Approving</Trans>
<Trans>Approving...</Trans>
<SpinnerIcon className="ml-4 animate-spin" />
</>
),
Expand All @@ -739,7 +739,7 @@ export const DepositView = () => {
buttonState = {
text: (
<>
<Trans>Depositing</Trans>
<Trans>Depositing...</Trans>
<SpinnerIcon className="ml-4 animate-spin" />
</>
),
Expand Down
2 changes: 1 addition & 1 deletion src/components/GmxAccountModal/WithdrawalView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ export const WithdrawalView = () => {
buttonState = {
text: (
<>
<Trans>Loading</Trans>
<Trans>Loading...</Trans>
<SpinnerIcon className="ml-4 animate-spin" />
</>
),
Expand Down
2 changes: 1 addition & 1 deletion src/components/NpsModal/NpsModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function NpsModal() {
const submitButtonState = useMemo(() => {
if (isSubmitting) {
return {
text: t`Submitting`,
text: t`Submitting...`,
disabled: true,
};
}
Expand Down
11 changes: 5 additions & 6 deletions src/components/OldSubaccountWithdraw/OldSubaccountWithdraw.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ export function OldSubaccountWithdraw() {
setIsWithdrawing(true);

helperToast.success(
<StatusNotification title={t`Withdrawing from subaccount`}>
<TransactionStatus status="loading" text={t`Withdrawing ${balanceFormatted} to main account`} />
<StatusNotification title={t`Withdrawing from subaccount...`}>
<TransactionStatus status="loading" text={t`Withdrawing ${balanceFormatted} to main account...`} />
</StatusNotification>,
{
className: "SubaccountNotification",
Expand All @@ -68,7 +68,7 @@ export function OldSubaccountWithdraw() {
});

helperToast.success(
<StatusNotification title={t`Withdrawing from subaccount`}>
<StatusNotification title={t`Withdrawing from subaccount...`}>
{t`Withdrawn ${balanceFormatted} to main account.`}
</StatusNotification>
);
Expand All @@ -77,7 +77,7 @@ export function OldSubaccountWithdraw() {
} catch (error) {
metrics.pushError(error, "subaccount.withdrawOldBalance");
helperToast.error(
<StatusNotification title={t`Withdrawing from subaccount`}>
<StatusNotification title={t`Withdrawing from subaccount...`}>
{t`Failed to withdraw ${balanceFormatted} to main account.`}
</StatusNotification>
);
Expand All @@ -97,9 +97,8 @@ export function OldSubaccountWithdraw() {
return (
<ColorfulBanner color="blue" icon={IconInfo}>
<Trans>You have {balanceFormatted} remaining in your old version 1CT subaccount.</Trans>

<ColorfulButtonLink color="blue" onClick={withdrawWeth} disabled={isWithdrawing}>
{isWithdrawing ? <Trans>Withdrawing</Trans> : <Trans>Withdraw</Trans>}
{isWithdrawing ? <Trans>Withdrawing...</Trans> : <Trans>Withdraw</Trans>}
</ColorfulButtonLink>
</ColorfulBanner>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/OrderEditor/OrderEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ export function OrderEditor(p: Props) {

function getError() {
if (isSubmitting) {
return t`Updating order`;
return t`Updating order...`;
}

if (isSwapOrderType(p.order.orderType)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ export function usePositionEditorButtonState(operation: Operation): {
}

if (isSubmitting) {
return [t`Creating order`];
return [t`Creating order...`];
}

return [];
Expand Down
2 changes: 1 addition & 1 deletion src/components/PositionItem/PositionItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ export function PositionItem(p: Props) {
})}
/>
<StatsTooltipRow
label={t`Accrued Positive Funding Fee`}
label={t`Positive Funding Fee`}
showDollar={false}
value={formatDeltaUsd(p.position.pendingClaimableFundingFeesUsd) || "..."}
valueClassName="numbers"
Expand Down
6 changes: 3 additions & 3 deletions src/components/PositionSeller/PositionSeller.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ export function PositionSeller() {
}

if (isSubmitting) {
return t`Creating order`;
return t`Creating order...`;
}
}, [
account,
Expand Down Expand Up @@ -816,7 +816,7 @@ export function PositionSeller() {
const buttonState = useMemo(() => {
if (!isAllowanceLoaded) {
return {
text: t`Loading`,
text: t`Loading...`,
disabled: true,
};
}
Expand All @@ -825,7 +825,7 @@ export function PositionSeller() {
return {
text: (
<>
{t`Loading Express params`}
{t`Loading Express params...`}
<SpinnerIcon className="ml-4 animate-spin" />
</>
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export function PositionSellerPriceImpactFeesRow() {
handle={t`Net Price Impact`}
content={
<Trans>
Net price impact is the price impact for your position, calculated when decreasing it.{" "}
Net price impact is the price impact for your position.{" "}
<ExternalLink href={"https://docs.gmx.io/docs/trading/v2#price-impact-and-price-impact-rebates"} newTab>
Read more
</ExternalLink>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Referrals/AddAffiliateCode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,12 @@ export function AffiliateCodeForm({
};
} else if (referralCodeCheckStatus === "checking") {
buttonState = {
text: t`Checking code`,
text: t`Checking code...`,
disabled: true,
};
} else if (isProcessing) {
buttonState = {
text: t`Creating`,
text: t`Creating...`,
disabled: true,
};
} else {
Expand Down
10 changes: 5 additions & 5 deletions src/components/Referrals/JoinReferralCode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,12 @@ function ReferralCodeForm({
};
} else if (isEdit && isSubmitting) {
buttonState = {
text: t`Updating`,
text: t`Updating...`,
disabled: true,
};
} else if (isSubmitting) {
buttonState = {
text: t`Adding`,
text: t`Adding...`,
disabled: true,
};
} else if (debouncedReferralCode === "") {
Expand Down Expand Up @@ -547,12 +547,12 @@ function ReferralCodeFormMultichain({
};
} else if (isEdit && isSubmitting) {
buttonState = {
text: t`Updating`,
text: t`Updating...`,
disabled: true,
};
} else if (isSubmitting) {
buttonState = {
text: t`Adding`,
text: t`Adding...`,
disabled: true,
};
} else if (debouncedReferralCode === "") {
Expand All @@ -574,7 +574,7 @@ function ReferralCodeFormMultichain({
buttonState = {
text: (
<>
<Trans>Loading</Trans>
<Trans>Loading...</Trans>
<SpinnerIcon className="ml-4 animate-spin" />
</>
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ export function FeesSettlementStatusNotification({ orders, toastTimestamp, marke
</Trans>
);

let text = <Trans>{positionName} Settling fees.</Trans>;
let text = <Trans>{positionName} Settling fees...</Trans>;
let status: TransactionStatusType = "muted";
let txnHash: string | undefined;

Expand Down
12 changes: 6 additions & 6 deletions src/components/StatusNotification/GmStatusNotification.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -250,23 +250,23 @@ export function GmStatusNotification({
let createdTxnHash: string | undefined;

if (operation === "deposit") {
text = t`Sending buy request.`;
text = t`Sending buy request...`;

if (depositStatus?.createdTxnHash) {
text = t`Buy request sent.`;
status = "success";
createdTxnHash = depositStatus?.createdTxnHash;
}
} else if (operation === "withdrawal") {
text = t`Sending sell request.`;
text = t`Sending sell request...`;

if (withdrawalStatus?.createdTxnHash) {
text = t`Sell request sent.`;
status = "success";
createdTxnHash = withdrawalStatus?.createdTxnHash;
}
} else {
text = t`Sending shift request.`;
text = t`Sending shift request...`;

if (shiftStatus?.createdTxnHash) {
text = t`Shift request sent.`;
Expand All @@ -284,7 +284,7 @@ export function GmStatusNotification({
let txnHash: string | undefined;

if (operation === "deposit") {
text = t`Fulfilling buy request.`;
text = t`Fulfilling buy request...`;

if (depositStatus?.createdTxnHash) {
status = "loading";
Expand All @@ -302,7 +302,7 @@ export function GmStatusNotification({
txnHash = depositStatus?.cancelledTxnHash;
}
} else if (operation === "withdrawal") {
text = t`Fulfilling sell request.`;
text = t`Fulfilling sell request...`;

if (withdrawalStatus?.createdTxnHash) {
status = "loading";
Expand All @@ -320,7 +320,7 @@ export function GmStatusNotification({
txnHash = withdrawalStatus?.cancelledTxnHash;
}
} else {
text = t`Fulfilling shift request.`;
text = t`Fulfilling shift request...`;

if (shiftStatus?.createdTxnHash) {
status = "loading";
Expand Down
4 changes: 2 additions & 2 deletions src/components/StatusNotification/OrderStatusNotification.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ export function OrderStatusNotification({
}, [orderData, orderStatus?.createdTxnHash, isGelatoTaskFailed]);

const sendingStatus = useMemo(() => {
let text = t`Sending order request`;
let text = t`Sending order request...`;
let status: TransactionStatusType = "loading";
let txnHash: string | undefined;
let txnLink: string | undefined;
Expand Down Expand Up @@ -282,7 +282,7 @@ export function OrderStatusNotification({
return null;
}

let text = t`Fulfilling order request`;
let text = t`Fulfilling order request...`;
let status: TransactionStatusType = "muted";
let txnHash: string | undefined;

Expand Down
5 changes: 3 additions & 2 deletions src/components/TradeBox/TradeBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ import { TradeMode } from "sdk/types/trade";
import { AlertInfoCard } from "components/AlertInfo/AlertInfoCard";
import Button from "components/Button/Button";
import BuyInputSection from "components/BuyInputSection/BuyInputSection";
import ExternalLink from "components/ExternalLink/ExternalLink";
import { LeverageSlider } from "components/LeverageSlider/LeverageSlider";
import { MarketSelector } from "components/MarketSelector/MarketSelector";
import SuggestionInput from "components/SuggestionInput/SuggestionInput";
Expand Down Expand Up @@ -1007,8 +1008,8 @@ export function TradeBox({ isMobile }: { isMobile: boolean }) {
{isSwap && isLimit && !isTwap && (
<AlertInfoCard key="showHasBetterOpenFeesAndNetFeesWarning">
<Trans>
The actual execution price may differ from the set limit price due to fees and price impact. This
ensures that you receive at least the minimum receive amount.
The execution price may differ from the set limit price due to fees and price impact. This
ensures that you receive at least the minimum receive amount. <ExternalLink href="https://docs.gmx.io/docs/trading/v2/#limit-orders" newTab>Read more</ExternalLink>.
</Trans>
</AlertInfoCard>
)}
Expand Down
5 changes: 2 additions & 3 deletions src/components/TradeBox/TradeBoxRows/PriceImpactFeesRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export function PriceImpactFeesRow() {
handle={t`Net Price Impact / Fees`}
content={
<Trans>
Net price impact is the price impact for your position, calculated when decreasing it.{" "}
Net price impact is the price impact for your position.{" "}
<ExternalLink href={"https://docs.gmx.io/docs/trading/v2#price-impact-and-price-impact-rebates"} newTab>
Read more
</ExternalLink>
Expand Down Expand Up @@ -166,8 +166,7 @@ export function PriceImpactFeesRow() {
handle={t`Price Impact`}
content={
<Trans>
There is no price impact for increase orders, orders are filled at the mark price. Price impact is
applied during decrease orders.{" "}
There is no price impact for increase orders, orders are filled at the mark price.{" "}
<ExternalLink href={"https://docs.gmx.io/docs/trading/v2#price-impact-and-price-impact-rebates"} newTab>
Read more
</ExternalLink>
Expand Down
2 changes: 1 addition & 1 deletion src/components/TradeBox/hooks/useTradeButtonState.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ export function useTradeboxButtonState({
...commonState,
text: (
<>
{t`Loading Express params`}
{t`Loading Express params...`}
<SpinnerIcon className="ml-4 animate-spin" />
</>
),
Expand Down
6 changes: 3 additions & 3 deletions src/domain/multichain/useMultichainFundingToast.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ export function useMultichainFundingToast() {

let content: ToastContent = (
<div className="flex flex-col gap-8">
{hasDeposits && !hasWithdrawals && <Trans>Depositing funds to GMX Account</Trans>}
{hasWithdrawals && !hasDeposits && <Trans>Withdrawing funds from GMX Account</Trans>}
{hasDeposits && hasWithdrawals && <Trans>Depositing and withdrawing funds to/from GMX Account</Trans>}
{hasDeposits && !hasWithdrawals && <Trans>Depositing funds to GMX Account...</Trans>}
{hasWithdrawals && !hasDeposits && <Trans>Withdrawing funds from GMX Account...</Trans>}
{hasDeposits && hasWithdrawals && <Trans>Depositing and withdrawing funds to/from GMX Account...</Trans>}
{Object.keys(multichainFundingPendingIds).map((staticId, index, array) => {
const guid = multichainFundingPendingIds[staticId];
const item = pendingItems[guid];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export async function createClaimCollateralTxn(
});

const txn = await callContract(chainId, exchangeRouter, "claimCollateral", args, {
sentMsg: t`Claiming price impact rebates.`,
sentMsg: t`Claiming price impact rebates...`,
successMsg: t`Price impact rebates claimed.`,
failMsg: t`Failed to claim price impact rebates.`,
});
Expand Down
Loading