Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Codebase Cleanup #1008

Merged
merged 16 commits into from
Jun 15, 2022
Merged

Codebase Cleanup #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e55cc67
fix language in PnL graphic
platschi Jun 14, 2022
03dc29b
remove shorting relicts
platschi Jun 15, 2022
6a1f2c6
fix type error
platschi Jun 15, 2022
5605564
correct homepage hero maxLeverage to 10x
platschi Jun 15, 2022
5a98352
bump @uniswap/widgets from 1.0.0 to 1.1.1
platschi Jun 15, 2022
3667245
Merge branch 'dev' into fix/cleanup
asherism Jun 15, 2022
8785e92
segment button improvements
asherism Jun 15, 2022
ed0cc23
light mode segment control improvements
asherism Jun 15, 2022
043a59d
Merge branch 'dev' into fix/cleanup
platschi Jun 15, 2022
a96d401
market badge improvements
asherism Jun 15, 2022
733e233
Merge branch 'fix/cleanup' of https://github.com/Kwenta/kwenta into f…
asherism Jun 15, 2022
e2da744
market dropdown improvement
asherism Jun 15, 2022
f6e221a
tab button active/inactive state improvement
asherism Jun 15, 2022
0895075
exchange improvements
asherism Jun 15, 2022
7fed6da
fixing regressions in manage position component
asherism Jun 15, 2022
bda75de
clean up noOutline & lint warning
platschi Jun 15, 2022
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
6 changes: 3 additions & 3 deletions components/Badge/Badge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import styled from 'styled-components';

const Badge = styled.span`
text-transform: uppercase;
color: ${(props) => props.theme.colors.black};
padding: 2px 3px 1px 5px;
padding: 1.6px 3px 1px 5px;
text-align: center;
font-family: ${(props) => props.theme.fonts.black};
background: ${(props) => props.theme.colors.selectedTheme.red};
color: ${(props) => props.theme.colors.selectedTheme.badge.text};
background: ${(props) => props.theme.colors.selectedTheme.badge.background};
border-radius: 100px;
letter-spacing: 1px;
margin-left: 4px;
Expand Down
5 changes: 4 additions & 1 deletion components/Button/TabButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ const StyledButton = styled(Button)<{
padding-top: 10px;
padding-bottom: 10px;
justify-content: center;
background-color: ${(props) => !props.active && 'transparent'};
background-color: ${(props) =>
props.active
? props.theme.colors.selectedTheme.tab.background.active
: props.theme.colors.selectedTheme.tab.background.inactive};
p {
margin: 0;
font-size: 13px;
Expand Down
4 changes: 2 additions & 2 deletions components/SegmentedControl/SegmentedControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@ const SegmentedControlContainer = styled.div<{ $length: number }>`

const SegmentedControlOption = styled.button<{ isSelected: boolean }>`
font-size: 13px;
font-family: ${(props) => props.theme.fonts.bold};
font-family: ${(props) => props.theme.fonts.regular};
cursor: pointer;

${(props) =>
props.isSelected
? css`
background: ${(props) => props.theme.colors.selectedTheme.segmented.button.background};
position: relative;
box-shadow: ${(props) => props.theme.colors.selectedTheme.segmented.button.shadow};
border: ${(props) => props.theme.colors.selectedTheme.border};
border-radius: 6px;
color: ${(props) => props.theme.colors.selectedTheme.button.text};
font-family: ${(props) => props.theme.fonts.bold};
&::before {
border-radius: 6px;
}
Expand Down
1 change: 0 additions & 1 deletion constants/links.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ export const EXTERNAL_LINKS = {
DaoRoles: 'https://docs.kwenta.io/dao/dao-roles',
HowToUse: 'https://docs.kwenta.io/onboard/how-to-start-using-kwenta',
Perpetuals: 'https://docs.kwenta.io/products/futures',
Shorting: ' https://docs.kwenta.io/products/what-is-shorting',
Spot: 'https://docs.kwenta.io/products/swaps ',
DevDao: 'https://docs.kwenta.io/dao/contribute/devdao-contribute',
MarketingDao: 'https://docs.kwenta.io/dao/contribute/marketingDAO',
Expand Down
13 changes: 0 additions & 13 deletions constants/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,6 @@ export const ROUTES = {
Home: '/leaderboard',
Trader: (trader: string) => normalizeRoute('/leaderboard', `${trader}`, 'trader'),
},
Shorting: {
Home: '/shorting',
ManageShortAddCollateral: (id: string) =>
normalizeRoute(`/shorting/manage/add-collateral`, id, 'id'),
ManageShortRemoveCollateral: (id: string) =>
normalizeRoute(`/shorting/manage/remove-collateral`, id, 'id'),
ManageShortDecreasePosition: (id: string) =>
normalizeRoute(`/shorting/manage/decrease-position`, id, 'id'),
ManageShortIncreasePosition: (id: string) =>
normalizeRoute(`/shorting/manage/increase-position`, id, 'id'),
ManageShortClosePosition: (id: string) =>
normalizeRoute(`/shorting/manage/close-position`, id, 'id'),
},
Earn: {
Home: '/earn',
},
Expand Down
Loading