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.

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

Hotfix: stability fee #669

Merged
merged 34 commits into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
094773c
matomo race conditions (#613)
jahabeebs Jul 9, 2024
4629318
typo fix (#618)
jahabeebs Jul 10, 2024
75431ce
Issue #606: Vaults explorer page (#611)
jahabeebs Jul 10, 2024
1945db1
Merge branch 'staging' into dev
pi0neerpat Jul 10, 2024
0ff3736
remove fuul (#620)
pi0neerpat Jul 10, 2024
8ab866a
bump sdk (#621)
pi0neerpat Jul 10, 2024
aafec60
remove maintenance from bolts
pi0neerpat Jul 10, 2024
b516220
add credit guild block (#622)
pi0neerpat Jul 10, 2024
c3b781e
api url hotfix
pi0neerpat Jul 10, 2024
4a63b7a
Od-weth QA (#623)
pi0neerpat Jul 10, 2024
ee6c0c5
New "initializing" loader (#609)
alekseevaiana Jul 10, 2024
69c335c
Borrow + Deposit tabs cleanup (#631)
alekseevaiana Jul 15, 2024
ce771b1
Address ENS loading skeleton (#632)
alekseevaiana Jul 15, 2024
400bcd4
Merge branch 'main' into staging
pi0neerpat Jul 17, 2024
37c8828
Merge branch 'staging' into dev
pi0neerpat Jul 17, 2024
686337e
Update react, react-router (#602)
pi0neerpat Jul 17, 2024
4fef374
Issue #557: View internal balances (#633)
jahabeebs Jul 18, 2024
24ff2c4
fix infinite loop when pushed from other page (#640)
jahabeebs Jul 18, 2024
206eb24
Issue #630: Explore page design improvements (#639)
jahabeebs Jul 18, 2024
041f7c6
fix navigate issue (#643)
jahabeebs Jul 22, 2024
ce85d49
Add GRT (#652)
pi0neerpat Jul 22, 2024
6ce1e4f
Issue #642: Reconnect on refresh (#644)
jahabeebs Jul 22, 2024
63c0150
bump svg generator (#649)
jahabeebs Jul 22, 2024
f08ae22
bump sdk
pi0neerpat Jul 23, 2024
d3aae47
Replace all 'any' with correct Types (#638)
alekseevaiana Jul 23, 2024
6bef9b6
QA: Tracking error, empty vault (#645)
alekseevaiana Jul 23, 2024
14e8471
App meta tags (#657)
alekseevaiana Jul 25, 2024
df40578
Issue #656 (app PR): country.is failure (#660)
jahabeebs Jul 25, 2024
c84c377
Add PT-rETH PT-wstETH (#661)
pi0neerpat Jul 31, 2024
038ada0
QA: Header (#646)
alekseevaiana Jul 31, 2024
e3be1ef
fix bg (#659)
alekseevaiana Jul 31, 2024
217812b
fix gnosis safe (#664)
jahabeebs Jul 31, 2024
4d3296d
Merge branch 'main' into staging
pi0neerpat Jul 31, 2024
0c615e4
fix stability fee by removing multiplication (#667) (#668)
pi0neerpat Aug 1, 2024
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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@ethersproject/address": "^5.0.10",
"@ethersproject/experimental": "5.4.0",
"@ethersproject/providers": "5.4.5",
"@opendollar/sdk": "1.7.4-rc.3",
"@opendollar/sdk": "1.7.5",
"@opendollar/svg-generator": "1.7.4",
"@react-spring/web": "^9.7.3",
"@sentry/cli": "^2.31.0",
Expand Down Expand Up @@ -65,7 +65,7 @@
"react-device-detect": "^1.13.1",
"react-dom": "^18.3.1",
"react-feather": "^2.0.9",
"react-helmet-async": "^1.0.7",
"react-helmet-async": "^2.0.5",
"react-i18next": "^11.7.2",
"react-loading-skeleton": "^3.4.0",
"react-number-format": "^5.2.2",
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<title>OD | App</title>

<!-- Matomo -->
<script src="./tracking.js"></script>
<script src="%PUBLIC_URL%/tracking.js"></script>
<script src="https://usekeyp.matomo.cloud/matomo.js"></script>
<!-- End Matomo Code -->
<!-- <script type="text/javascript" src="https://kb.wowto.ai/widgets/M4cmuZpuJqb/widget.js" async defer></script> -->
Expand Down
42 changes: 8 additions & 34 deletions src/GlobalStyle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ const GlobalStyle = createGlobalStyle`
}

body {
color: ${(props: any) => props.theme.colors.primary};
background-color:${(props: any) => props.theme.colors.background};
background-image: url('/squares1x.webp'), url('/wavy-blue.webp');
background-color: #E2F1FF;
background-size: contain, 100%;
background-position: bottom left, top right;
background-repeat: no-repeat;
Expand Down Expand Up @@ -60,27 +59,6 @@ const GlobalStyle = createGlobalStyle`

}
}
.place-left {
&:after{
border-left-color:${(props: any) => props.theme.colors.foreground} !important
}
}

.place-top {
&:after{
border-top-color:${(props: any) => props.theme.colors.foreground} !important
}
}
.place-bottom {
&:after{
border-bottom-color:${(props: any) => props.theme.colors.foreground} !important
}
}
.place-right {
&:after{
border-right-color:${(props: any) => props.theme.colors.foreground} !important
}
}

.Toastify__toast-container {
padding: 0;
Expand All @@ -92,12 +70,8 @@ const GlobalStyle = createGlobalStyle`
padding-top: 20px;
padding-bottom: 20px;
border-radius: 5px;
color:${(props: any) => props.theme.colors.primary};
opacity: 1 !important;
background: ${(props: any) => props.theme.colors.foreground};
border: ${(props: any) => props.theme.colors.border} !important;
box-shadow: 0 0 6px rgba(0, 0, 0, 0.16);

box-shadow: 0 0 6px rgba(0, 0, 0, 0.16);
}
}
`
Expand All @@ -109,8 +83,8 @@ export const ExternalLinkArrow = css`
outline: none;
padding: 0;
margin: 0;
color: ${(props: any) => props.theme.colors.blueish};
font-size: ${(props: any) => props.theme.font.small};
color: ${(props) => props.theme.colors.blueish};
font-size: ${(props) => props.theme.font.small};
font-weight: 600;
line-height: 24px;
letter-spacing: -0.18px;
Expand All @@ -136,20 +110,20 @@ export const BtnStyle = css<{
color?: 'blueish' | 'greenish' | 'yellowish' | 'colorPrimary' | 'colorSecondary'
border?: boolean
}>`
pointer-events: ${({ theme, disabled }) => (disabled ? 'none' : 'inherit')};
pointer-events: ${({ disabled }) => (disabled ? 'none' : 'inherit')};
outline: none;
cursor: ${({ theme, disabled }) => (disabled ? 'not-allowed' : 'pointer')};
cursor: ${({ disabled }) => (disabled ? 'not-allowed' : 'pointer')};
min-width: 134px;
border: ${({ theme, border }) => (border ? `1px solid ${theme.colors.blueish}` : 'none')};
box-shadow: none;
line-height: 24px;
font-size: ${(props: any) => props.theme.font.small};
font-size: ${(props) => props.theme.font.small};
font-weight: 600;
padding: 8px 30px;
color: ${({ theme, border }) => (border ? theme.colors.blueish : theme.colors.neutral)};
background: ${({ theme, disabled, color }) =>
disabled ? theme.colors.dimmedBackground : theme.colors[color ?? 'blueish']};
border-radius: ${(props: any) => props.theme.global.borderRadius};
border-radius: ${(props) => props.theme.global.borderRadius};
transition: all 0.3s ease;
display: flex;
align-items: center;
Expand Down
17 changes: 17 additions & 0 deletions src/assets/gm-eth.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 29 additions & 10 deletions src/assets/grt.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading