Skip to content
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified e2e/screenshots/strategy/overlapping/Overlapping/create/form.png
Binary file modified e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png
Binary file modified e2e/screenshots/strategy/overlapping/Overlapping/duplicate/form.png
Binary file modified e2e/screenshots/strategy/overlapping/Overlapping/undercut/form.png
Binary file modified e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png
4 changes: 2 additions & 2 deletions e2e/utils/simulator/CreateSimulationDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class CreateSimulationDriver {

async waitForPriceChart(timeout?: number) {
const btn = this.page.getByTestId('start-simulation-btn');
await expect(btn).toHaveText('Start Simulation');
await expect(btn).toHaveText('Start simulation');
return waitFor(this.page, 'price-chart', timeout);
}

Expand Down Expand Up @@ -191,7 +191,7 @@ export class CreateSimulationDriver {

async submit() {
const btn = this.page.getByTestId('start-simulation-btn');
await expect(btn).toHaveText('Start Simulation');
await expect(btn).toHaveText('Start simulation');
await expect(btn).toBeEnabled();
return btn.click();
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/activity/ActivityExport.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export const ActivityExport = () => {
disabled={loading}
className={styles.exportButton}
>
<span className={styles.export}>Export Activities</span>
<span className={styles.export}>Export activities</span>
<span className={styles.exporting}>Exporting</span>
<svg
className={styles.loading}
Expand Down
14 changes: 7 additions & 7 deletions src/components/activity/ActivityFilter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ export const ActivityFilter: FC<ActivityFilterProps> = (props) => {
value={ids ?? []}
label={
ids?.length
? `${ids.length} Strategies Selected`
: 'Filter Strategies'
? `${ids.length} strategies selected`
: 'Filter strategies'
}
filterLabel="Search by ID or Symbol"
options={allIds.map(({ id, base, quote }) => (
Expand Down Expand Up @@ -114,9 +114,9 @@ export const ActivityFilter: FC<ActivityFilterProps> = (props) => {
name="pairs"
value={pairs ?? []}
label={
pairs?.length ? `${pairs.length} Pairs Selected` : 'Filter Pairs'
pairs?.length ? `${pairs.length} pairs selected` : 'Filter pairs'
}
filterLabel="Search by Pair"
filterLabel="Search by pair"
options={allPairs.map(({ pair, base, quote }) => (
<Option key={pair} value={pair}>
<TokensOverlap tokens={[base, quote]} size={14} />
Expand All @@ -131,10 +131,10 @@ export const ActivityFilter: FC<ActivityFilterProps> = (props) => {
value={actions ?? []}
label={
actions?.length
? `${actions.length} Actions Selected`
: 'Filter Actions'
? `${actions.length} actions selected`
: 'Filter actions'
}
filterLabel="Search by Action"
filterLabel="Search by action"
options={allActions.map((action) => (
<Option key={action} value={action}>
{activityActionName[action]}
Expand Down
6 changes: 3 additions & 3 deletions src/components/activity/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import * as v from 'valibot';

export const activityActionName: Record<ActivityAction, string> = {
create: 'Create',
edit: 'Edit Price',
edit: 'Edit price',
deposit: 'Deposit',
withdraw: 'Withdraw',
buy: 'Buy Low',
sell: 'Sell High',
buy: 'Buy low',
sell: 'Sell high',
transfer: 'Transfer',
delete: 'Delete',
pause: 'Pause',
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/combobox/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ export const Combobox: FC<ComboboxProps> = (props) => {
onClick={reset}
className="btn text-12 font-medium rounded-2xl p-8"
>
Reset Filter
Reset filter
</button>
<div
role="listbox"
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/datePicker/DateRangePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ interface Props {
}

const displayRange = (start?: Date, end?: Date) => {
if (!start || !end) return 'Select Date Range';
if (!start || !end) return 'Select date range';
if (isSameDay(start, end)) return dateFormatter.format(start);
return `${dateFormatter.format(start)} - ${dateFormatter.format(end)}`;
};
Expand Down Expand Up @@ -249,7 +249,7 @@ export const DatePickerButton = memo(function DatePickerButton({
className="justify-self-end text-main-0/60"
data-testid="simulation-dates"
>
{hasDates ? `${_sD_} - ${_eD_}` : 'Select Date Range'}
{hasDates ? `${_sD_} - ${_eD_}` : 'Select date range'}
</span>
<KeyboardArrowDownIcon className="size-24 rotate-180 text-main-0/80" />
</>
Expand Down
2 changes: 1 addition & 1 deletion src/components/core/error/ErrorUserBlocked.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const ErrorUserBlocked = () => {
to={externalLinks.treasuryGov}
className="w-full btn-on-surface text-14 "
>
Learn More
Learn more
</NewTabLink>
<button className="btn-on-surface text-14 " onClick={disconnect}>
Logout
Expand Down
2 changes: 1 addition & 1 deletion src/components/core/menu/mainMenu/MainMenuRight.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const TenderlyForkAlert = () => {
to="/debug"
className="bg-warning text-14 rounded-full px-16 py-8 text-main-950"
>
Debug Mode
Debug mode
</Link>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const useBurgerMenuItems = () => {
if (config.ui.showTerms) {
mainItems.push(
<Link key="terms" role="menuitem" className={menuitemClass} to="/terms">
Terms of Use
Terms of use
</Link>,
);
}
Expand All @@ -77,7 +77,7 @@ export const useBurgerMenuItems = () => {
className={menuitemClass}
to="/privacy"
>
Privacy Policy
Privacy policy
</Link>,
);
}
Expand Down Expand Up @@ -151,7 +151,7 @@ export const useBurgerMenuItems = () => {
className={menuitemClass}
to={externalLinks.techDocs}
>
Tech Docs
Tech docs
</NewTabLink>,
<NewTabLink
key="litepaper"
Expand All @@ -178,7 +178,7 @@ export const useBurgerMenuItems = () => {
className={menuitemClass}
to={externalLinks.simulatorRepo}
>
Simulator Repo
Simulator repo
</NewTabLink>,
);
}
Expand All @@ -189,7 +189,7 @@ export const useBurgerMenuItems = () => {
className={menuitemClass}
to={externalLinks.duneDashboard}
>
Dune Dashboard
Dune dashboard
</NewTabLink>;
}
menuMap.set('resources', resourcesItems);
Expand Down
12 changes: 6 additions & 6 deletions src/components/core/menu/mainMenu/MainMenuRightWallet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ export const MainMenuRightWallet: FC = () => {
}, [isSupportedNetwork, isUserBlocked, user]);

const buttonText = useMemo(() => {
if (isUserBlocked) return 'Wallet Blocked';
if (!isSupportedNetwork) return 'Wrong Network';
if (isUserBlocked) return 'Wallet blocked';
if (!isSupportedNetwork) return 'Wrong network';
if (!user) {
if (location.pathname === '/') return 'Launch App';
return 'Connect Wallet';
if (location.pathname === '/') return 'Launch app';
return 'Connect wallet';
}
return shortenString(ensName || user);
}, [ensName, isSupportedNetwork, isUserBlocked, location.pathname, user]);
Expand Down Expand Up @@ -125,7 +125,7 @@ const ConnectedMenu: FC = () => {
onClick={copyAddress}
>
<ContentCopyIcon className="size-24" />
<span>Copy Address</span>
<span>Copy address</span>
</button>
</>
) : (
Expand All @@ -134,7 +134,7 @@ const ConnectedMenu: FC = () => {
className="rounded-sm text-error/80 hover:text-error flex w-full p-8 hover:bg-main-900/40"
onClick={switchNetwork}
>
Switch Network
Switch network
</button>
)}
<button
Expand Down
2 changes: 1 addition & 1 deletion src/components/explorer/pairs/PairTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export const PairTable: FC<Props> = ({ url, pairs }) => {
to="/trade"
search={{ base: base.address, quote: quote.address }}
>
Create Position
Create position
</Link>
<Link
className="btn-on-surface"
Expand Down
2 changes: 1 addition & 1 deletion src/components/explorer/pairs/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export type PairFilter = keyof PairFilterMap;
export const pairSort = {
pairAsc: 'Pair (A->Z)',
pairDesc: 'Pair (Z->A)',
trades: 'Total Trades',
trades: 'Total trades',
trades24h: 'Trades (24h)',
liquidity: 'Liquidity',
strategyAmount: 'Strategies',
Expand Down
6 changes: 3 additions & 3 deletions src/components/explorer/strategies/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ export type StrategyFilter = {
};

export const strategySort = {
recent: 'Recently Created',
old: 'Oldest Created',
recent: 'Recently created',
old: 'Oldest created',
pairAsc: 'Pair (A->Z)',
pairDesc: 'Pair (Z->A)',
totalBudgetDesc: 'Total Budget',
totalBudgetDesc: 'Total budget',
trades: 'Trades',
};

Expand Down
4 changes: 2 additions & 2 deletions src/components/explorer/suggestion/SuggestionList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export const SuggestionList: FC<Props> = (props) => {
className="text-14 font-medium btn cursor-pointer rounded-full "
onClick={() => setMaxTokens((v) => v + 5)}
>
View More
View more
</button>
</footer>
)}
Expand Down Expand Up @@ -134,7 +134,7 @@ export const SuggestionList: FC<Props> = (props) => {
className="text-14 font-medium btn cursor-pointer rounded-full "
onClick={() => setMaxPairs((v) => v + 5)}
>
View More
View more
</button>
</footer>
)}
Expand Down
4 changes: 2 additions & 2 deletions src/components/simulator/input/SimInputStrategyType.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ const items = [
{
id: 'overlapping',
type: 'Essentials',
label: 'Liquidity Position',
label: 'Liquidity position',
to: 'overlapping',
search: {},
svg: <IconOverlappingStrategy className="hidden md:block size-20" />,
},
{
id: 'recurring-range',
type: 'Advanced',
label: 'Recurring Range',
label: 'Recurring range',
to: 'recurring',
search: {},
svg: <IconTwoRanges className="hidden md:block size-20" />,
Expand Down
2 changes: 1 addition & 1 deletion src/components/strategies/FullOutcome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const FullOutcome: FC<FullOutcomeProps> = (props) => {
rel="noreferrer"
className="font-medium text-primary inline-flex items-center gap-4"
>
<span>Learn More</span>
<span>Learn more</span>
<OpenInNewIcon className="inline size-24" />
</a>
</p>
Expand Down
2 changes: 1 addition & 1 deletion src/components/strategies/PortfolioHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const PortfolioHeader = () => {
className="btn-main-gradient whitespace-nowrap"
data-testid="create-strategy-desktop"
>
Create Strategy
Create strategy
</Link>
</div>
</header>
Expand Down
4 changes: 2 additions & 2 deletions src/components/strategies/common/InitMarketPrice.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const EditMarketPrice: FC<Props> = (props) => {
type="button"
>
<EditSquareIcon className="size-16" />
<span>Edit Market Price</span>
<span>Edit market price</span>
</button>
);

Expand Down Expand Up @@ -171,7 +171,7 @@ export const InitMarketPrice = (props: FieldProps) => {
type="submit"
data-testid="set-overlapping-price"
>
Set New Market Price
Set new market price
</button>
</form>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/strategies/common/InputLimit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export const InputLimit: FC<InputLimitProps> = (props) => {
type="button"
onClick={setMarket}
>
Use Market
Use market
</button>
)}
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/strategies/common/InputRange.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export const InputRange: FC<Props> = (props) => {
onClick={setMinMarket}
data-testid="market-price-min"
>
Use Market
Use market
</button>
)}
</header>
Expand Down Expand Up @@ -253,7 +253,7 @@ export const InputRange: FC<Props> = (props) => {
onClick={setMaxMarket}
data-testid="market-price-max"
>
Use Market
Use market
</button>
)}
</header>
Expand Down
2 changes: 1 addition & 1 deletion src/components/strategies/common/StrategyChartLegend.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const StrategyChartLegend = () => {
<footer className="text-12 flex flex-col gap-16">
<p className="flex items-center gap-8">
<IconLock className="size-16 shrink-0" />
Strategy prices can only be modified when selecting "Edit Prices"
Strategy prices can only be modified when selecting "Edit prices"
option.
</p>
<p className="flex items-center gap-8">
Expand Down
2 changes: 1 addition & 1 deletion src/components/strategies/common/TokenSelection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export const TokenSelection: FC<Props> = ({ url, base, quote }) => {
data-testid="select-base-token"
onClick={() => openTokenListModal('base')}
>
<DisplayToken token={base} label="Buy or Sell" />
<DisplayToken token={base} label="Buy or sell" />
</button>
<button
role="menuitem"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export const CreateGradientStrategyForm: FC<FormProps> = (props) => {
onClick={addToCart}
data-testid="add-strategy-to-cart"
>
Add to Cart
Add to cart
</Button>
)}
<Button
Expand All @@ -118,7 +118,7 @@ export const CreateGradientStrategyForm: FC<FormProps> = (props) => {
loadingChildren={loadingText}
data-testid="create-strategy"
>
Create Strategy
Create strategy
</Button>
</>
)}
Expand All @@ -133,7 +133,7 @@ export const CreateGradientStrategyForm: FC<FormProps> = (props) => {
loadingChildren={loadingText}
onClick={openConnect}
>
Connect Wallet
Connect wallet
</Button>
)}
</form>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export const GradientPriceRange: FC<Props> = (props) => {
onClick={setStartMarket}
data-testid="market-start-price"
>
Use Market
Use market
</button>
)}
</header>
Expand Down Expand Up @@ -187,7 +187,7 @@ export const GradientPriceRange: FC<Props> = (props) => {
onClick={setEndMarket}
data-testid="market-end-price"
>
Use Market
Use market
</button>
)}
</header>
Expand Down
Loading