diff --git a/package.json b/package.json index d68735c..3c1f8ac 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ghost-dao-interface", "private": true, - "version": "0.7.34", + "version": "0.7.35", "type": "module", "scripts": { "dev": "vite", diff --git a/src/containers/Bond/components/BondConfirmModal.jsx b/src/containers/Bond/components/BondConfirmModal.jsx index 921e755..8e3901f 100644 --- a/src/containers/Bond/components/BondConfirmModal.jsx +++ b/src/containers/Bond/components/BondConfirmModal.jsx @@ -59,7 +59,7 @@ const BondConfirmModal = ({ setAcknowledgedWarmup(event.target.checked)} icon={} @@ -68,7 +68,7 @@ const BondConfirmModal = ({ } label={ - {`I understand the ${bondQuoteTokenName} I’m bonding will only be available to claim ${warmupLength.toString()} epochs after my transaction is confirmed, and the warmup extends with each bond purchase`} + {`I understand the ${bondQuoteTokenName} I’m bonding will only be available to claim ${warmupLength.toString()} epochs after my transaction is confirmed, and the warm-up extends with each bond purchase`} } /> @@ -85,7 +85,7 @@ const BondConfirmModal = ({ fullWidth href="https://ghostchain.io/ghostdao_litepaper" > - Why is there a warmup? + Why is there a warm-up? ); diff --git a/src/containers/Bond/components/WarmupConfirmModal.jsx b/src/containers/Bond/components/WarmupConfirmModal.jsx index 11f7e12..b9f57d1 100644 --- a/src/containers/Bond/components/WarmupConfirmModal.jsx +++ b/src/containers/Bond/components/WarmupConfirmModal.jsx @@ -56,14 +56,14 @@ const WarmupConfirmModal = ({ ? setIsChecked(event.target.checked)} icon={} checkedIcon={} /> } - label={`I acknowledge that I am releasing warmup funds for the bonding contract on behalf of the collective.`} + label={`I acknowledge that I am releasing warm-up funds for the bonding contract on behalf of the collective.`} /> : `Bonding address is in a warm-up period and cannot be claimed now. It'll be available for claim in ${warmupLength} epochs.` } diff --git a/src/containers/Breakout/BreakoutModal.jsx b/src/containers/Breakout/BreakoutModal.jsx index 74b44e9..5e5414a 100644 --- a/src/containers/Breakout/BreakoutModal.jsx +++ b/src/containers/Breakout/BreakoutModal.jsx @@ -68,8 +68,8 @@ const BreakoutModal = ({ chainId, address }) => { const header = useMemo(() => { if (isStakingOpened && warmupPeriod <= 0) return "Stake Warmed-up" if (isClaimBondOpened && warmupPeriod <= 0) return "Bond Warmed-up" - if (isStakingOpened && warmupPeriod > 0) return "Stake in Warmup" - if (isClaimBondOpened && warmupPeriod > 0) return "Bond in Warmup" + if (isStakingOpened && warmupPeriod > 0) return "Stake in Warm-up" + if (isClaimBondOpened && warmupPeriod > 0) return "Bond in Warm-up" }, [isStakingOpened, isClaimBondOpened, warmupPeriod]); const bridgeNumbers = useMemo(() => { @@ -176,7 +176,7 @@ const BridgeView = ({ - Generate a unique address for per tx with GHOST connect for privacy. + Generate a unique address for per tx with GHOST Connect for privacy. {warmupPeriod <= 0 - ? `You've succesfully warmed-up your ${isStakingOpened ? " " : "bonded "}${ftsoSymbol} staked at:` - : `${isStakingOpened ? "Stake" : "Bond"} is in warm-up${isStakingOpened ? "" : ", which extends with each purchase"}. Your ${ftsoSymbol} is staked at:` + ? `You've succesfully warmed-up your ${isStakingOpened ? " " : "bonded "}${ftsoSymbol} ${isStakingOpened ? "(3, 3)" : "(1, 1)"} staked at:` + : `${isStakingOpened ? "Stake" : "Bond"} is in warm-up${isStakingOpened ? "" : ", which extends with each purchase"}. Your ${ftsoSymbol} ${isStakingOpened ? "(3, 3)" : "(1, 1)"} is staked at:` } @@ -282,7 +282,7 @@ const WelcomeView = ({ loading={isPending} fullWidth > - {isPending ? "Claiming..." : `Claim ${isStakingOpened ? "(3, 3) Stake" : "(1, 1) Bond"}`} + {`${isPending ? "Claiming..." : "Claim"} ${isStakingOpened ? "(3, 3) Stake" : "(1, 1) Bond"}`} } @@ -293,7 +293,7 @@ const WelcomeView = ({ Skip the Warm-up Now! - {`Bridge your ${ghstSymbol} to GHOST Chain and stake at:`} + {`Bridge your ${ghstSymbol} to GHOST Chain and start ${bridgeNumbers} ${"stake\u00B2"} at:`} @@ -387,7 +387,7 @@ const ConfirmStep = ({ <> - + {ghstSymbol} @@ -395,7 +395,7 @@ const ConfirmStep = ({ - + {ghstSymbol} @@ -411,7 +411,7 @@ const ConfirmStep = ({ setAcknowledgeBridgingRisk(event.target.checked)} icon={} @@ -447,7 +447,7 @@ const ConfirmStep = ({ setAcknowledgeWalletCustody(event.target.checked)} icon={} diff --git a/src/containers/Stake/components/ClaimsArea.jsx b/src/containers/Stake/components/ClaimsArea.jsx index d13d629..b4ff765 100644 --- a/src/containers/Stake/components/ClaimsArea.jsx +++ b/src/containers/Stake/components/ClaimsArea.jsx @@ -101,7 +101,7 @@ export const ClaimsArea = ({ chainId, address, epoch }) => { if (claim.shares === 0n) return <>; - const warmupTooltip = `Your claim earns rebases during warmup. You can emergency withdraw, but this forfeits the rebases`; +const warmupTooltip = `Your claim earns rebases during warm-up. You can emergency withdraw, but this forfeits the rebases`; return ( <> diff --git a/src/containers/Stake/components/StakeConfirmationModal.jsx b/src/containers/Stake/components/StakeConfirmationModal.jsx index 072159b..1e91cc1 100644 --- a/src/containers/Stake/components/StakeConfirmationModal.jsx +++ b/src/containers/Stake/components/StakeConfirmationModal.jsx @@ -32,7 +32,7 @@ const StakeConfirmationModal = (props) => { setAcknowledgedWarmup(event.target.checked)} icon={} @@ -59,7 +59,7 @@ const StakeConfirmationModal = (props) => { fullWidth href="https://ghostchain.io/ghostdao_litepaper" > - Why is there a warmup? + Why is there a warm-up? ); diff --git a/src/containers/Stake/components/StakeSettingsModal.jsx b/src/containers/Stake/components/StakeSettingsModal.jsx index 1b94304..88b0416 100644 --- a/src/containers/Stake/components/StakeSettingsModal.jsx +++ b/src/containers/Stake/components/StakeSettingsModal.jsx @@ -35,7 +35,7 @@ const StakeSettingsModal = props => { checkedIcon={} /> } - label={Always try to claim during stake, works only if warmup period is zero} + label={Always try to claim during stake, works only if warm-up period is zero} /> diff --git a/src/containers/TreasuryDashboard/components/ProtocolDetails.jsx b/src/containers/TreasuryDashboard/components/ProtocolDetails.jsx index d5cd414..8a46f31 100644 --- a/src/containers/TreasuryDashboard/components/ProtocolDetails.jsx +++ b/src/containers/TreasuryDashboard/components/ProtocolDetails.jsx @@ -139,7 +139,7 @@ const ProtocolDetails = ({ chainId, isMobileScreen, theme, }) => { url={`/${networkName.toLowerCase()}/bridge`} name={`${bridgeNumbers} Stake\u00B2`} sideName={`${formatNumber(apyInner * gatekeepedApy, 0)}% APY`} - description={`Staking\u00B2 strategy further deepens long-term incentives powered by sustainable crosschain bridging revenue. ${bridgeNumbers} Stake\u00B2 your ${csprSymbol} to receive organic APY with no warmup and no dilution.`} + description={`Staking\u00B2 strategy further deepens long-term incentives powered by sustainable crosschain bridging revenue. ${bridgeNumbers} Stake\u00B2 your ${csprSymbol} to receive organic APY with no warm-up and no dilution.`} /> diff --git a/src/hooks/staking/index.js b/src/hooks/staking/index.js index 4fa1d6c..f6cb891 100644 --- a/src/hooks/staking/index.js +++ b/src/hooks/staking/index.js @@ -155,7 +155,7 @@ export const stake = async (chainId, account, amount, isRebase, isClaim, ftsoSym const args = [amount, account, isRebase, isClaim]; const messages = { replacedMsg: "Staking transaction was replaced. Wait for inclusion please.", - successMsg: `${ftsoSymbol} tokens staked successfully! Wait for the warmup period to claim your ${isRebase ? stnkSymbol : ghstSymbol}.`, + successMsg: `${ftsoSymbol} tokens staked successfully! Wait for the warm-up period to claim your ${isRebase ? stnkSymbol : ghstSymbol}.`, errorMsg: "Staking transaction failed. Check logs for error detalization.", }; await executeOnChainTransaction({