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

Tribe Turbo #63

Merged
merged 165 commits into from
Apr 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
165 commits
Select commit Hold shift + click to select a range
4c2b594
Turbo UI WIP
nathanhleung Mar 18, 2022
5dc4e62
Create Turbo landing page
nathanhleung Mar 19, 2022
a7e27b5
Turbo create safe (#64)
cryptickoan Mar 23, 2022
b8223b1
Design first two steps of turbo modal (#66)
nathanhleung Mar 24, 2022
ffce2e5
Bump rari-components in Turbo (#67)
nathanhleung Mar 24, 2022
72d446a
Safe page (#70)
jarbacoa Mar 25, 2022
8fb54c4
Turbo Safe Modal (#71)
nathanhleung Mar 26, 2022
1195b9d
Bump rari-components, fix type error
nathanhleung Mar 26, 2022
ce63ff4
Add approval modal state (#72)
nathanhleung Mar 26, 2022
0cf2c77
Modal Final Touches (#73)
nathanhleung Mar 27, 2022
5802659
Progress on individual safe page (#74)
nathanhleung Mar 28, 2022
5497a49
Clean up context
nathanhleung Mar 28, 2022
77ba188
Connected Data to Safe Page (#76)
jarbacoa Mar 29, 2022
26e8e33
Add deposit, withdraw, and claim interest modals (#77)
nathanhleung Mar 30, 2022
c836181
show strategy data in table (#78)
jarbacoa Mar 30, 2022
a11c9c3
custom Statistics component
jarbacoa Mar 30, 2022
895be43
update table
jarbacoa Mar 30, 2022
5a11211
moved modals into folder
jarbacoa Mar 30, 2022
a168700
moved safe health into safe type
jarbacoa Mar 30, 2022
55f8b16
Aaron's UI fixes (#79)
nathanhleung Mar 31, 2022
cac7eb1
Fix type error in safe strategies table (#80)
nathanhleung Mar 31, 2022
3877267
added usdPricedTurboSafe data - updatedSafeData hook - reorg files
jarbacoa Apr 1, 2022
15e2608
fixed safe utilization errors on preview
jarbacoa Apr 1, 2022
277ba8c
Statistic component, Aaron's feedback
nathanhleung Apr 1, 2022
4b41bb1
updated StatisticsTable
jarbacoa Apr 1, 2022
acc3898
update StatisticsTable
jarbacoa Apr 1, 2022
42c384d
🅱️oost
jarbacoa Apr 1, 2022
17279d4
less built into boost modal
jarbacoa Apr 1, 2022
429fd41
Second ModalStep for flows + add safebalanceFei to claimable
jarbacoa Apr 1, 2022
d054c20
claiming works
jarbacoa Apr 2, 2022
16d1f6e
Fix type error that was breaking build (#83)
nathanhleung Apr 3, 2022
ebed19f
Modify lockfile to install rari-components over https instead of ssh …
nathanhleung Apr 3, 2022
571aa06
fetchmaxSafeAmount + form validation on modals
jarbacoa Apr 3, 2022
d93b916
Work on Turbo Index page (#84)
nathanhleung Apr 3, 2022
b6d43d5
Handle undefined strategy case (#85)
nathanhleung Apr 3, 2022
16d26be
Finish index page ui (#86)
nathanhleung Apr 3, 2022
9e83059
Turbo Safe Card update
jarbacoa Apr 3, 2022
307fd62
max boost using lens secondary
jarbacoa Apr 4, 2022
ca89d5d
Fix table key issue (#87)
nathanhleung Apr 4, 2022
0df1270
withdraw feature works
jarbacoa Apr 4, 2022
6845585
CreateSafe fix
cryptickoan Apr 5, 2022
05fc8de
Updated lens
cryptickoan Apr 5, 2022
c20e0de
Updating addresses
cryptickoan Apr 5, 2022
10c9295
Updating params
cryptickoan Apr 5, 2022
70e3f52
Fix type errors, bring in working package-lock.json
nathanhleung Apr 4, 2022
37f2be2
Polish CreateSafeModal (#90)
nathanhleung Apr 4, 2022
d12eb79
Add mocked net APY, create final state for deposit modal (#91)
nathanhleung Apr 4, 2022
d5b7469
Stack stats in SafeCard, give Modal buttons more vertical padding (#92)
nathanhleung Apr 4, 2022
983f7b3
Updating utils to match new lens
cryptickoan Apr 5, 2022
389605f
Adding maxBoost to safe info
cryptickoan Apr 5, 2022
056de23
Using chainID now
cryptickoan Apr 5, 2022
a5fab3d
Fixed deposit modal
cryptickoan Apr 5, 2022
1c359b5
UI fix
cryptickoan Apr 5, 2022
72d1583
removed unnecessary queries
cryptickoan Apr 5, 2022
deb4abb
Fix safeAndDeposit steps
cryptickoan Apr 5, 2022
38500cd
Comments and stats edition
cryptickoan Apr 5, 2022
9c4482d
Fix type errors
nathanhleung Apr 5, 2022
0606429
MaxDeposit button for safe creation
cryptickoan Apr 5, 2022
f07ca66
Skip button fix
cryptickoan Apr 5, 2022
db58887
Fixed allowance bug
cryptickoan Apr 5, 2022
be08f2d
stepper
cryptickoan Apr 5, 2022
2943304
Revert
cryptickoan Apr 5, 2022
1c07d50
parse deposit amount
cryptickoan Apr 6, 2022
65c4d63
Don't increment step if createSafe fails
nathanhleung Apr 6, 2022
86c73f2
Wait until safe is created before setting loading to false
nathanhleung Apr 6, 2022
55e6f56
Open Learn More Medium article in new window
nathanhleung Apr 6, 2022
98cc340
Bump rari-components
nathanhleung Apr 6, 2022
22bd903
Make checkbox smaller on success screen
nathanhleung Apr 6, 2022
e7934a6
Change “back to Turbo home” to “All safes”
nathanhleung Apr 6, 2022
e01097b
boost caps // strategies filter // Safe Card refactor
jarbacoa Apr 6, 2022
9f549bb
context + refactor
jarbacoa Apr 6, 2022
b8ecaac
approvals + err handling on modal funcs
jarbacoa Apr 6, 2022
644f263
Fix Boost modal
nathanhleung Apr 6, 2022
086c84d
makes devnet faster
cryptickoan Apr 6, 2022
1179fbb
navigate to created safe
cryptickoan Apr 6, 2022
14334da
fix pool 156
jarbacoa Apr 6, 2022
fae5ddc
Bunch of stuff
jarbacoa Apr 6, 2022
fe8fa1e
apy fix
jarbacoa Apr 6, 2022
19cb6c2
Fix type error
nathanhleung Apr 7, 2022
a5b4401
Only show APY up to hundredths
nathanhleung Apr 7, 2022
ea57739
Make Getting Started clicks functional
nathanhleung Apr 7, 2022
dbd8e31
Fix disabled calculation in modals
nathanhleung Apr 7, 2022
f6cd3bb
Resolve Aaron's notes
nathanhleung Apr 7, 2022
53cb2a9
updatedSafe skeleton
jarbacoa Apr 7, 2022
d5a6473
Big dump flushhh
jarbacoa Apr 7, 2022
6af268a
Adding TurboOracle to constants
cryptickoan Apr 7, 2022
ec33d2e
created getMarketCF
cryptickoan Apr 7, 2022
d90d1a0
Adding simulation stats to createSafeAndDeposit
cryptickoan Apr 7, 2022
3c7fbf1
Stats at the end
cryptickoan Apr 7, 2022
b5f3047
boost caps
jarbacoa Apr 7, 2022
82d9514
lookin good big dog
jarbacoa Apr 7, 2022
b202e1b
Fix build error caused by missing BalancesContext
nathanhleung Apr 7, 2022
774323e
Fix
cryptickoan Apr 7, 2022
e1ec081
agg data
jarbacoa Apr 7, 2022
e446b0b
agg data
jarbacoa Apr 7, 2022
9abab9c
new header
jarbacoa Apr 7, 2022
312f7c8
Update SafeCard
nathanhleung Apr 7, 2022
24f18dd
Make header font-weight 600
nathanhleung Apr 7, 2022
96dcdb9
More safe card cosemetic updates
nathanhleung Apr 7, 2022
1031332
Add APY arrow on safe index page
nathanhleung Apr 7, 2022
530a16c
fix avg apy calc
jarbacoa Apr 7, 2022
de46267
Fix splitHairs function
nathanhleung Apr 7, 2022
e79b861
Make Turbo Safe Page responsive
nathanhleung Apr 7, 2022
9288fa8
Prefetch TRIBE token data
nathanhleung Apr 7, 2022
146d01c
admin check
jarbacoa Apr 7, 2022
fea0b79
admin alert
jarbacoa Apr 7, 2022
cca9574
More mobile handling
nathanhleung Apr 7, 2022
8748714
Getting started step styling
nathanhleung Apr 8, 2022
be042d8
Use theme colors in alerts
nathanhleung Apr 8, 2022
cbe32a6
Account Change
cryptickoan Apr 11, 2022
607d7ea
lift boostmodal state to top
jarbacoa Apr 11, 2022
1ac0682
remove rss
jarbacoa Apr 11, 2022
10262f9
many minor changes
jarbacoa Apr 12, 2022
47f7c39
fix undefined bug on safe creation
jarbacoa Apr 12, 2022
f14b3ef
Approval fix
cryptickoan Apr 12, 2022
1a5d5b2
Deposit modal tx rejection handle
cryptickoan Apr 12, 2022
1ebd799
Modal reset after tx
cryptickoan Apr 12, 2022
fdec02b
Strategy boost bug fix
cryptickoan Apr 13, 2022
1197ba3
build error fix
cryptickoan Apr 13, 2022
3d42481
Refactor TurboIndex page
jarbacoa Apr 13, 2022
62e86d6
small stuff
jarbacoa Apr 13, 2022
d349635
Create Boost/Less success state (#98)
nathanhleung Apr 14, 2022
2e2d817
Add claim interest success state (#99)
nathanhleung Apr 14, 2022
c8bcde6
Use newest version of rari-components StatisticsTable (#100)
nathanhleung Apr 14, 2022
5e22555
Update Boost Modal StatisticsTable (#101)
nathanhleung Apr 14, 2022
2502756
Update deposit/withdraw modals (#102)
nathanhleung Apr 14, 2022
1546007
Bump rari-components and fix button disabled hover style
nathanhleung Apr 14, 2022
9fb95f8
Delete dead code
nathanhleung Apr 14, 2022
b76b272
liquidation prices
jarbacoa Apr 14, 2022
9302044
Create new index page (#103)
nathanhleung Apr 15, 2022
8d8bb68
ui touchups
jarbacoa Apr 15, 2022
a3173e7
animations
jarbacoa Apr 15, 2022
1d4141e
build err
jarbacoa Apr 15, 2022
4749106
updated colors on deposit modal
jarbacoa Apr 15, 2022
dc04616
fix
jarbacoa Apr 15, 2022
a11f241
Deposit Modal Validation
jarbacoa Apr 15, 2022
800afc6
re-add slidefade
jarbacoa Apr 15, 2022
ef0999b
bring back searchbar
jarbacoa Apr 15, 2022
11cd913
Fix landing page spacing
nathanhleung Apr 16, 2022
a9742c6
Bump rari-components
nathanhleung Apr 16, 2022
5ddddde
Handle DIVIDER case in UpadtingStatisticsTable
nathanhleung Apr 16, 2022
5869fa1
Modal footer
cryptickoan Apr 18, 2022
155d76c
boost bug
cryptickoan Apr 18, 2022
3c05b01
finally reset stepper
cryptickoan Apr 18, 2022
a1bce66
merge conflix
jarbacoa Apr 18, 2022
180e73b
create safe through TurboMaster
jarbacoa Apr 18, 2022
1fb0e04
fix
jarbacoa Apr 18, 2022
fcf0465
remove hardcap
jarbacoa Apr 18, 2022
fa50b6a
max withdraw
cryptickoan Apr 18, 2022
ef9d534
:bug: :gun:
cryptickoan Apr 19, 2022
3a6160d
fix withdraw + add anims
jarbacoa Apr 19, 2022
048feaf
trying logo anim on main page
jarbacoa Apr 19, 2022
e3227b2
max withdraw on zero util
jarbacoa Apr 19, 2022
247f189
strat names
jarbacoa Apr 19, 2022
2d20090
remove deposit input err
jarbacoa Apr 19, 2022
dad7d28
remove deposit input err
jarbacoa Apr 19, 2022
d256c2c
fix approve deposit flow
jarbacoa Apr 19, 2022
2f23c85
delist strats + deposit fix
jarbacoa Apr 19, 2022
7ebceb3
collat boost cap
jarbacoa Apr 19, 2022
7d78d07
small stuff
jarbacoa Apr 19, 2022
3f7b2b3
Safes page
cryptickoan Apr 20, 2022
80c49c3
Protocol safes page
cryptickoan Apr 20, 2022
bc4a9c1
cosmetics
jarbacoa Apr 20, 2022
9f75da6
Merge branch 'main' into turbo
jarbacoa Apr 20, 2022
d8cd783
disabled buttons if not admin
jarbacoa Apr 20, 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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
/.nyc_output
/reports


/src/static/contracts/compiled/*.ts
/src/static/compiled/*.json

Expand All @@ -35,10 +34,13 @@ cypress/screenshots
cypress/videos
cypress.env.json

tsconfig.tsbuildinfo

# vercel
.now
.vercel
.env
.env.local

.eslintcache

8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@ Rari Capital's Web3 Portal.

- Run `npm run dev` to start the development server.
- Run `npm run build` to build a production bundle
- Run `npm run bump-rari-components` to automatically install the latest version (i.e. most recent commit hash) of rari-components and update `package.json`.
- Run `npm run bump-rari-components` to automatically install the latest version (i.e. most recent commit hash) of [rari-components](https://github.com/Rari-Capital/rari-components) and update `package.json`.
- Run `npm run typecheck` to typecheck

## Environment

- Set `NEXT_PUBLIC_USE_MOCKS` to `true` to test the dapp with mock objects (e.g. `NEXT_PUBLIC_USE_MOCKS=true npm run dev`).
- Currently, this env var is only used in the Turbo code — <kbd>Ctrl+F</kbd> for `process.env.NEXT_PUBLIC_USE_MOCKS` to see the specific use sites.

## Requirements

Expand Down
6 changes: 3 additions & 3 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ module.exports = withBundleAnalyzer({

config.module.rules.push({
test: /\.tsx?/,
// Transpile rari-components, even though it is in node_modules
include: [/node_modules\/rari-components/],
// Transpile rari-components
include: [/rari-components/],
use: "next-swc-loader",
});

return config;
},
});
});
27 changes: 14 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@0xsequence/multicall": "^0.35.5",
"@aave/protocol-v2": "^1.0.1",
"@chakra-ui/icons": "^1.0.0",
"@chakra-ui/react": "^1.8.1",
"@chakra-ui/react": "1.8.1",
"@emotion/react": "^11.0.0",
"@emotion/styled": "^11.0.0",
"@walletconnect/web3-provider": "^1.4.1",
Expand Down Expand Up @@ -35,7 +35,7 @@
"node-fetch": "^2.6.1",
"node-vibrant": "^3.1.6",
"polished": "^4.1.3",
"rari-components": "github:Rari-Capital/rari-components#1131c95058f26b36048d9cfe507abb15ae5adaa8",
"rari-components": "github:Rari-Capital/rari-components#144451807e8673b4586274adfb8e78346ab32fce",
"rari-tokens-generator": "^2.0.0",
"react": "^17.0.2",
"react-apexcharts": "1.3.7",
Expand All @@ -45,6 +45,7 @@
"react-error-boundary": "^3.0.2",
"react-fast-marquee": "^1.1.3",
"react-infinite-scroll-hook": "^4.0.1",
"react-intersection-observer": "^8.34.0",
"react-jazzicon": "^0.1.3",
"react-query": "^3.13.10",
"react-responsive-carousel": "^3.2.18",
Expand All @@ -61,7 +62,7 @@
},
"scripts": {
"bump-rari-components": "rm -rf .next && npm i \"git+https://github.com/Rari-Capital/rari-components#$(git ls-remote https://github.com/Rari-Capital/rari-components.git HEAD | awk '{ print $1}')\"",
"typecheck": "tsc --skipLibCheck -p ./tsconfig.json",
"typecheck": "tsc --noEmit",
"postinstall": "rari-tokens-generator ./src/static/compiled/tokens.json",
"start": "next start",
"build": "next build",
Expand Down
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 added public/static/turbo/isolated-actions.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/turbo/noseke.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/turbo/one-collateral-type.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/turbo/treasury-assets.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/turbo/turbo-engine-3d-trimmed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/turbo/turbo-engine-3d.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions public/static/turbo/turbo-engine-green.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/static/turbo/turbo-engine-red.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/turbo/turbo-no-bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/turbo/turbo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/turbo/turbo2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/turbo/user-icons/daos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/turbo/user-icons/individuals.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/turbo/user-icons/more.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/turbo/user-icons/protocols.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions src/components/pages/Fuse/FusePoolsPage/PoolRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,12 @@ export const PoolRow = ({
<Center height="100%" width="13%">
<b>{poolNumber}</b>
</Center>
<Center height="100%" width="16%">
<b>{smallUsdFormatter(tvl)}</b>
</Center>
<Center height="100%" width="16%">
<b>{smallUsdFormatter(borrowed)}</b>
</Center>
<Center height="100%" width="16%">
<b>{smallUsdFormatter(tvl)}</b>
</Center>
<Center height="100%" width="16%">
<b>{smallUsdFormatter(borrowed)}</b>
</Center>
</>
)}
</Row>
Expand Down
Loading