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

Hai app landing page rebrand #11

Merged
merged 163 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
163 commits
Select commit Hold shift + click to select a range
352097d
extract styling updates and new in-progress splash page from next con…
haf-decent Oct 25, 2023
1bacf27
no default exports for hooks, type designations, clean up imports usi…
haf-decent Oct 25, 2023
d06ffa3
splash updates
haf-decent Oct 25, 2023
5169876
new splash page first pass with elves and zoom on scroll
haf-decent Oct 26, 2023
0cb6093
more splash page updates, refactoring
haf-decent Oct 27, 2023
bbce168
add third scene, add scroll snap
haf-decent Oct 27, 2023
f9c5af2
3d coin, extract 3d update function (further refactor would be nice),…
haf-decent Oct 28, 2023
dfaa3da
add Kite icon + coin, add footer, refactor 3d elements to be defined …
haf-decent Oct 28, 2023
be30240
replace old hai logo in currency pairs
haf-decent Oct 28, 2023
05a317d
finish footer, adjust header
haf-decent Oct 28, 2023
56de3a4
initial mobile styling
haf-decent Oct 30, 2023
a6fd8f9
icon/asset overhaul
haf-decent Oct 30, 2023
9151bcd
add arrow icons to learn cards, adjust text styling
haf-decent Oct 30, 2023
19c0e26
adjust footer breakpoint styles
haf-decent Oct 30, 2023
8dbd70a
refactor 3d scenes to render individual elves/clouds/coins rather tha…
haf-decent Oct 30, 2023
bf96271
slight style / copy updates
haf-decent Oct 30, 2023
bbb9655
title/description
haf-decent Oct 30, 2023
22c5951
add music playlist
haf-decent Oct 30, 2023
3e68724
add progress bar animation
haf-decent Oct 30, 2023
1890603
update elves
haf-decent Oct 30, 2023
bc16631
update elf-3
haf-decent Oct 30, 2023
20dac3e
update music toggle icon
haf-decent Oct 30, 2023
4037341
remove blur for now
haf-decent Oct 30, 2023
f4ae5ba
update elf-2
haf-decent Oct 31, 2023
bd744d1
more mobile styling, fix scroll snap on mobile
haf-decent Oct 31, 2023
d878b17
clean up space/tab formatting
haf-decent Oct 31, 2023
c53c6a8
new elf-3, slight adjustments
haf-decent Oct 31, 2023
6e4f472
twitter metadata (need banner image)
haf-decent Oct 31, 2023
f54457e
remove tailwind and postcss
haf-decent Nov 1, 2023
4fd0d98
slight style adjustments
haf-decent Nov 1, 2023
f63b99e
update settings if audio fails to play (due to permissions issue on m…
haf-decent Nov 1, 2023
68b691e
scroll overhaul
haf-decent Nov 1, 2023
c1c7161
replace scroll element on third with arrow buttons, simplify scroll
haf-decent Nov 2, 2023
d490f1b
clean up button blur
haf-decent Nov 2, 2023
bca463c
create internal link container
haf-decent Nov 3, 2023
99bbc61
move header and bg video to shared, add ticker in preparation for ful…
haf-decent Nov 3, 2023
de0110a
disable unavailable routes, clean up
haf-decent Nov 3, 2023
45c855c
add links (with placeholders), clean up based on feedback
haf-decent Nov 4, 2023
0013935
add placeholder third scene, move 3 to 4
haf-decent Nov 4, 2023
198c280
add eslint to enable linting, address linting issues
haf-decent Nov 6, 2023
6c0c818
Merge branch 'dev' into ng-rh-dev
haf-decent Nov 7, 2023
e5c649a
landing page updates
haf-decent Nov 8, 2023
8d66585
try out text-shadow hack for outside text outline
haf-decent Nov 8, 2023
45ea03a
progress bar update
haf-decent Nov 8, 2023
11abeed
update text along with animation
haf-decent Nov 8, 2023
950e52b
splash page updates, revert text stroke/shadow
haf-decent Nov 9, 2023
451bf4a
reinstate routes, safes -> vaults
haf-decent Nov 10, 2023
707ea7e
add custom connect button, update header for non-splash pages
haf-decent Nov 10, 2023
823403c
create intention header for earn/vault pages
haf-decent Nov 10, 2023
5990a2f
add custom styling borders and popouts, add earn stats placeholder, c…
haf-decent Nov 10, 2023
dc6d217
add notifications to header, clean up
haf-decent Nov 10, 2023
3c703b5
add earn page, clean up tokens and floating elements
haf-decent Nov 11, 2023
9af868d
move floating elements, clean up splash page
haf-decent Nov 11, 2023
9b426bd
add parallax background clouds
haf-decent Nov 11, 2023
71bae9c
clean up strategies, add max width to non-splash pages
haf-decent Nov 11, 2023
6f5778b
add hai alert footer
haf-decent Nov 11, 2023
0e12843
initial table sorting, add arrow icons
haf-decent Nov 13, 2023
feffb07
create tooltip, example, clean up
haf-decent Nov 13, 2023
506b130
fix deployment error?
haf-decent Nov 14, 2023
32c0062
fix info icon, fix vercel config
haf-decent Nov 14, 2023
c4ad826
initial vault page redesign, clean up
haf-decent Nov 16, 2023
f575fb4
add auctions intention header def
haf-decent Nov 16, 2023
f557de8
add updated outlined caret icon to intention dropdown
haf-decent Nov 16, 2023
35ad2e0
standardize icons, remove unused, use ReactChildren type
haf-decent Nov 16, 2023
dacc9a9
slight adjustment to popout svg, update image preloader
haf-decent Nov 16, 2023
6cc0c32
organize imports
haf-decent Nov 16, 2023
029a16a
reorganize, clean up shared and connect button
haf-decent Nov 16, 2023
f90dc86
create StatusLabel
haf-decent Nov 17, 2023
5fff9aa
add animation to popout, update more button in header, add default dr…
haf-decent Nov 20, 2023
7ed5be0
small ui tweaks
haf-decent Nov 21, 2023
af0f12b
auctions page rework, refactor page stats
haf-decent Nov 21, 2023
e752fdb
refactor Header, add dummy notifications
haf-decent Nov 21, 2023
3d21c37
add loading state for auctions, clean up
haf-decent Nov 21, 2023
13387ba
slight style/copy updates from call today
haf-decent Nov 21, 2023
6dcd7da
analytics page v1, clean up tooltips and table headers
haf-decent Nov 22, 2023
f93e286
add pie chart, refactor shared elements, add legends, clean up
haf-decent Nov 22, 2023
35f86af
manage vault rework, add simulation values
haf-decent Nov 25, 2023
be427d5
add ProxyPrompt to replace Steps, styling/icon clean up
haf-decent Nov 26, 2023
69282d0
fix ProxyPrompt order
haf-decent Nov 27, 2023
74641b4
rk theming update, add custom rk avatar
haf-decent Nov 27, 2023
89da785
refactor Overview, fix button label on VaultActions, clean up
haf-decent Nov 27, 2023
69e1483
clean up "as any" usage
haf-decent Nov 27, 2023
4165716
fix SplashImage import
haf-decent Nov 28, 2023
e4d133e
move analytics provider to top level, create providers folder, update…
haf-decent Nov 28, 2023
a0d7590
clean up modals, other
haf-decent Nov 28, 2023
0b471e5
massive update for vault management
haf-decent Nov 28, 2023
abb7384
slight clean up + tooltips
haf-decent Nov 28, 2023
660224c
payback -> repay, clean up error handling
haf-decent Nov 29, 2023
4ffb179
refactor VaultProvider/useVaultInfo
haf-decent Nov 29, 2023
8c59283
some TODOs, clean up Marquee formatting
haf-decent Nov 29, 2023
18f31d1
create new modal folder, create WrapETHModal, generalize ActionInput …
haf-decent Nov 29, 2023
17b7170
refactor Button (will probably remove entirely later) and Loader
haf-decent Nov 30, 2023
7220f3a
3d modal animation + clouds
haf-decent Nov 30, 2023
4788f51
rework NumberInput slightly to consistently show conversion label for…
haf-decent Nov 30, 2023
4416083
fix marquee width calc to avoid jitter
haf-decent Nov 30, 2023
6e24957
random clean up, check collateral balance for deposit/create
haf-decent Dec 6, 2023
836b136
vault transaction integration + review modal, pre-format values in su…
haf-decent Dec 6, 2023
350bd3a
Merge branch 'dev' into ng-rh-dev-app-vaults
haf-decent Dec 6, 2023
9367bfa
fix stability fee calc, clean up vault tables, add create safe step t…
haf-decent Dec 7, 2023
88d655f
add initial graphql endpoints + update analytics, band-aid auctions, …
haf-decent Dec 8, 2023
96990ec
update wallet popup modal styling
haf-decent Dec 8, 2023
b4738c9
add active state to dropdown options, clean up vault dropdown
haf-decent Dec 8, 2023
e230808
add animation to hai alert footer
haf-decent Dec 8, 2023
e856552
rework some auction stuff
haf-decent Dec 8, 2023
550ce8f
hide dropdown on manage vault, add more robust eslint config file + m…
haf-decent Dec 10, 2023
d358541
refactor utils/types, remove old components, fix main header, extract…
haf-decent Dec 11, 2023
7bf6e44
clean up action states (loading, success, error), new background colo…
haf-decent Dec 11, 2023
c94eed4
close modal on success, Create Vault -> Open Vault, refactor manage v…
haf-decent Dec 11, 2023
499f564
new earn table, move strategy ads to vault table,
haf-decent Dec 11, 2023
1017ede
use kite coin as elf kite, clean up 3d elements
haf-decent Dec 12, 2023
6097a57
add correct links for strategy ads
haf-decent Dec 12, 2023
1d6c942
update graph queries, add more stats/tooltips to analytics page
haf-decent Dec 12, 2023
81c7722
fix initialization modal when no wallet connected, add padding to bot…
haf-decent Dec 12, 2023
b44043e
extract formatting of system state query to provider hook
haf-decent Dec 12, 2023
d01388f
safe -> vault (as much as possible)
haf-decent Dec 12, 2023
eeed20a
rework auctions modal
haf-decent Dec 23, 2023
97966de
updates from call
haf-decent Dec 23, 2023
fe16473
Merge branch 'dev' into ng-rh-dev-app-vaults
haf-decent Dec 23, 2023
5bda732
add VaultExplorer page, slightly rework Pagination
haf-decent Dec 24, 2023
616d975
standardize tokenAssets object, All Vaults -> Available Vaults, promp…
haf-decent Dec 24, 2023
df52624
add routing to vaults page (/vaults, /vaults/open, /vaults/manage), c…
haf-decent Dec 26, 2023
5f38bad
add liquidate modal, fix checkbox styling, more StatusLabel styling o…
haf-decent Dec 26, 2023
f1ea51f
add dummy claim modal, clean up Shared stuff
haf-decent Dec 26, 2023
0b74235
clean up, remove unused stuff, use toSorted
haf-decent Dec 26, 2023
3fdd436
remove final unused components/packages, clean up default exports, cl…
haf-decent Dec 26, 2023
6fbd4a1
add unwrap functionality, slightly adjust formatting, update some sty…
haf-decent Dec 26, 2023
d90dd82
clean up Sorting type
haf-decent Dec 27, 2023
8d30de0
add header background to settingsModel, toggle it on splash page when…
haf-decent Dec 28, 2023
9be5a2a
adjust margin on learn cards/arrows on splash page
haf-decent Dec 28, 2023
b6f9a41
add start auction actions to intention header on /auctions page
haf-decent Dec 28, 2023
a7a1d72
Squashed commit of the following:
haf-decent Dec 29, 2023
ad17be7
extract Table styling/configuration into component, add TableButton s…
haf-decent Jan 2, 2024
5bc6067
fix overlapping for dropdowns on mobile
haf-decent Jan 2, 2024
94a4689
clean up Modal
haf-decent Jan 3, 2024
20a33d6
safeIsSafe -> vaultIsSafe in utils test
haf-decent Jan 3, 2024
ce956c1
fix dropdown positioning/width
haf-decent Jan 3, 2024
fcf82f7
limit proxy prompt to connect wallet only, add to necessary tables
haf-decent Jan 3, 2024
dc0ff27
fix header size
haf-decent Jan 3, 2024
35f98cb
optimize safe query
haf-decent Jan 4, 2024
fbc2458
standardize sort functionality, add suffixed formatter for large/esti…
haf-decent Jan 4, 2024
c1b460b
add available subgraph values as fallbacks for analytics data
haf-decent Jan 5, 2024
9c6e480
clean up some TODOs, use totalDebt in myVaults table
haf-decent Jan 9, 2024
86e6096
add confirm step to auction bid/claim/settle/buy
haf-decent Jan 10, 2024
cf4db41
add useMyBids query/hook to use with auction stats
haf-decent Jan 10, 2024
dab8bbb
Privacy page placeholder
haf-decent Jan 10, 2024
5339072
add vaults by owner page
haf-decent Jan 10, 2024
dc42600
replace all mentions of 'safe' with 'vault' in contract names/descrip…
haf-decent Jan 10, 2024
4500877
fix onFocus bug
haf-decent Jan 10, 2024
19c745c
add vault-by-id page v1, standardize conversion of query safe to vaul…
haf-decent Jan 10, 2024
75b5cd0
add confiscation data to vault activity table, clean up styling
haf-decent Jan 18, 2024
7419c72
add minimum decimal string and significant figure override for decima…
haf-decent Jan 18, 2024
27d0bee
fix progress bar curvature at low values
haf-decent Jan 23, 2024
87ee477
update splash page (links, discord)
haf-decent Jan 29, 2024
fddeab7
update progress bar styling
haf-decent Jan 29, 2024
3d596bc
remove enter app button, routing, connect button
haf-decent Jan 29, 2024
add6997
Merge branch 'dev' into ng-rh-dev
haf-decent Jan 29, 2024
1b0e0ee
update chain in wallet file
haf-decent Jan 29, 2024
a415be8
splash logo should scroll to top, clean up some styling
haf-decent Jan 30, 2024
75257b3
prettier formatting
haf-decent Jan 30, 2024
ae244b4
update build dir
haf-decent Jan 30, 2024
afaab40
update test imports, do not index wallet utils to avoid issues
haf-decent Jan 30, 2024
7429904
prettier
haf-decent Jan 30, 2024
99a259d
update vercel config
haf-decent Jan 30, 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
Prev Previous commit
Next Next commit
no default exports for hooks, type designations, clean up imports usi…
…ng root alias (~)

- adding explicit type designations on imports helps optimize bundling (https://stackoverflow.com/questions/61412000/do-i-need-to-use-the-import-type-feature-of-typescript-3-8-if-all-of-my-import)
- all hooks should not use default exports (open to argument for keeping them, but I don't see it currently)
  • Loading branch information
haf-decent committed Oct 25, 2023
commit 1bacf27529acb08b7bfa89d6093aed88133e523f
2 changes: 1 addition & 1 deletion src/components/ApproveToken.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useAccount } from 'wagmi'

import { useTokenContract, useTransactionAdder, useGeb } from '~/hooks'
import { useStoreActions, useStoreState } from '~/store'
import { AuctionEventType, IAuctionBidder } from '~/types'
import type { AuctionEventType, IAuctionBidder } from '~/types'
import { timeout } from '~/utils'
import Button from './Button'
import Loader from './Loader'
Expand Down
2 changes: 1 addition & 1 deletion src/components/AuctionBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { useAccount, useNetwork } from 'wagmi'

import { COIN_TICKER, formatNumber, getEtherscanLink, returnWalletAddress, ChainId, parseRad } from '~/utils'
import { useStoreActions, useStoreState } from '~/store'
import { IAuction, IAuctionBidder } from '~/types'
import type { IAuction, IAuctionBidder } from '~/types'
import { ExternalLinkArrow } from '~/styles'
import AlertLabel from './AlertLabel'
import Button from './Button'
Expand Down
10 changes: 5 additions & 5 deletions src/components/AuctionsFAQ.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { useState } from 'react'
import styled from 'styled-components'
import { useTranslation } from 'react-i18next'
import { AuctionEventType } from '~/types'
import mine from '../assets/mine.svg'
import bid from '../assets/bid.svg'
import claim from '../assets/claim.svg'
import sellHai from '../assets/sell-hai.svg'
import type { AuctionEventType } from '~/types'
import mine from '~/assets/mine.svg'
import bid from '~/assets/bid.svg'
import claim from '~/assets/claim.svg'
import sellHai from '~/assets/sell-hai.svg'

interface Props {
type: AuctionEventType
Expand Down
4 changes: 2 additions & 2 deletions src/components/AuctionsOperations/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import { useRef } from 'react'
import { CSSTransition, SwitchTransition } from 'react-transition-group'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
Expand All @@ -12,7 +12,7 @@ import _ from '~/utils/lodash'

const AuctionsOperations = () => {
const { t } = useTranslation()
const nodeRef = React.useRef(null)
const nodeRef = useRef(null)
const { auctionModel: auctionsActions } = useStoreActions((state) => state)
const {
auctionModel: auctionsState,
Expand Down
9 changes: 4 additions & 5 deletions src/components/Brand.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from 'styled-components'
import Logo from '../assets/hai-logo.png'
import Logo from '~/assets/hai-logo.png'

interface Props {
height?: number
Expand Down Expand Up @@ -28,10 +28,9 @@ const Container = styled.div`
height: 50px;
}
${({ theme }) => theme.mediaWidth.upToSmall`
width: 50px;
height: 50px;
}
`}
width: 50px;
height: 50px;
`}
}
}
`
4 changes: 2 additions & 2 deletions src/components/Button.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { ReactNode } from 'react'
import React, { type ReactNode } from 'react'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
import classNames from 'classnames'
import darkArrow from '../assets/dark-arrow.svg'
import darkArrow from '~/assets/dark-arrow.svg'
import Arrow from './Icons/Arrow'
import Loader from './Loader'

Expand Down
2 changes: 1 addition & 1 deletion src/components/Confetti/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ReactConfetti from 'react-confetti'
import useWindowSize from '../../hooks/useWindowSize'
import { useWindowSize } from '~/hooks'

// eslint-disable-next-line react/prop-types
export default function Confetti({ start, variant }: { start: boolean; variant?: string }) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/DecimalInput.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ChangeEvent, useState } from 'react'
import { type ChangeEvent, useState } from 'react'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'

Expand Down
4 changes: 2 additions & 2 deletions src/components/GridContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react'
import { type ReactNode } from 'react'
import styled from 'styled-components'

interface Props {
children: React.ReactNode
children: ReactNode
}

const GridContainer = ({ children }: Props) => {
Expand Down
32 changes: 16 additions & 16 deletions src/components/ImagePreloader.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import brandWhite from '../assets/brand-white.svg'
import darkArrow from '../assets/dark-arrow.svg'
import walletConnectIcon from '../assets/connectors/walletConnectIcon.svg'
import coinbaseWalletIcon from '../assets/connectors/coinbaseWalletIcon.svg'
import cookie from '../assets/cookie.svg'
import caret from '../assets/caret.png'
import caretUp from '../assets/caret-up.svg'
import arrowUp from '../assets/arrow-up.svg'
import logoIcon from '../assets/LogoIcon.png'
import arrow from '../assets/arrow.svg'
import uniswapIcon from '../assets/uniswap-icon.svg'
import logo192 from '../assets/logo192.png'
import metamask from '../assets/connectors/metamask.png'
import accountImg from '../assets/account-img.png'
import walletImg from '../assets/wallet-img.png'
import safeImg from '../assets/safe-img.png'
import brandWhite from '~/assets/brand-white.svg'
import darkArrow from '~/assets/dark-arrow.svg'
import walletConnectIcon from '~/assets/connectors/walletConnectIcon.svg'
import coinbaseWalletIcon from '~/assets/connectors/coinbaseWalletIcon.svg'
import cookie from '~/assets/cookie.svg'
import caret from '~/assets/caret.png'
import caretUp from '~/assets/caret-up.svg'
import arrowUp from '~/assets/arrow-up.svg'
import logoIcon from '~/assets/LogoIcon.png'
import arrow from '~/assets/arrow.svg'
import uniswapIcon from '~/assets/uniswap-icon.svg'
import logo192 from '~/assets/logo192.png'
import metamask from '~/assets/connectors/metamask.png'
import accountImg from '~/assets/account-img.png'
import walletImg from '~/assets/wallet-img.png'
import safeImg from '~/assets/safe-img.png'

const INITIAL_STATE = [
brandWhite,
Expand Down
2 changes: 1 addition & 1 deletion src/components/LinkButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ReactNode } from 'react'
import { type ReactNode } from 'react'
import { ArrowRightCircle } from 'react-feather'
import { Link } from 'react-router-dom'
import styled from 'styled-components'
Expand Down
6 changes: 3 additions & 3 deletions src/components/Modals/LiquidateSafeModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import styled from 'styled-components'
import { handleTransactionError, useGeb } from '~/hooks'
import { liquidateSafe } from '~/services/blockchain'
import { useStoreActions, useStoreState } from '~/store'
import AlertLabel from '../AlertLabel'
import Button from '../Button'
import CheckBox from '../CheckBox'
import AlertLabel from '~/components/AlertLabel'
import Button from '~/components/Button'
import CheckBox from '~/components/CheckBox'
import Modal from './Modal'

const LiquidateSafeModal = () => {
Expand Down
6 changes: 3 additions & 3 deletions src/components/Modals/LoadingModal.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react'
import styled, { keyframes } from 'styled-components'
import { useStoreState } from '../../store'
import { useStoreState } from '~/store'
import Modal from './Modal'
import logo from '../../assets/logo192.png'
import logo from '~/assets/logo192.png'

const LoadingModal = () => {
const { popupsModel: popupsState } = useStoreState((state) => state)

Expand Down
12 changes: 6 additions & 6 deletions src/components/Modals/Modal.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React, { useEffect, useState } from 'react'
import { type ReactNode, useEffect, useState, useRef } from 'react'
import { useTranslation } from 'react-i18next'
import { CSSTransition } from 'react-transition-group'
import styled from 'styled-components'
import { useStoreActions } from '../../store'
import Button from '../Button'
import Confetti from '../Confetti'
import { useStoreActions } from '~/store'
import Button from '~/components/Button'
import Confetti from '~/components/Confetti'

interface Props {
title?: string
children: React.ReactNode
children: ReactNode
submitBtnText?: string
handleSubmit?: () => void
maxWidth?: string
Expand Down Expand Up @@ -42,7 +42,7 @@ const Modal = ({
backDropColor,
}: Props) => {
const { t } = useTranslation()
const nodeRef = React.useRef(null)
const nodeRef = useRef(null)
const { settingsModel: settingsActions } = useStoreActions((state) => state)

const [isOpen, setIsOpen] = useState(false)
Expand Down
5 changes: 2 additions & 3 deletions src/components/Modals/SafeManagerModal.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React from 'react'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
import { useStoreActions, useStoreState } from '../../store'
import SafeManager from '../SafeManager'
import { useStoreActions, useStoreState } from '~/store'
import SafeManager from '~/components/SafeManager'
import Modal from './Modal'

const SafeManagerModal = () => {
Expand Down
3 changes: 1 addition & 2 deletions src/components/Modals/ScreenLoader.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
import { useStoreState, useStoreActions } from '../../store'
import { useStoreState, useStoreActions } from '~/store'
import Loader from '../Loader'
import Modal from './Modal'

Expand Down
2 changes: 1 addition & 1 deletion src/components/Modals/WaitingModal.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect } from 'react'
import { useEffect } from 'react'
import { AlertTriangle, CheckCircle } from 'react-feather'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
Expand Down
5 changes: 2 additions & 3 deletions src/components/NavLinks.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import React from 'react'
import styled, { css } from 'styled-components'
import { useTranslation } from 'react-i18next'
import { useHistory } from 'react-router-dom'
import { NavLink } from 'react-router-dom'
import { useHistory, NavLink } from 'react-router-dom'

import { useStoreActions } from '../store'
import { useStoreActions } from '~/store'
import SafeIcon from './Icons/SafeIcon'

const NavLinks = () => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/NotificationPopup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { useEffect, useRef, useState } from 'react'
import Scrollbars from 'react-custom-scrollbars'
import styled from 'styled-components'
import BellIcon from './Icons/BellIcon'
import caretUp from '../assets/caret-up.svg'
import arrowUp from '../assets/arrow-up.svg'
import caretUp from '~/assets/caret-up.svg'
import arrowUp from '~/assets/arrow-up.svg'

const NotificationPopup = () => {
const wrapperRef = useRef(null)
Expand Down
2 changes: 1 addition & 1 deletion src/components/Pagination.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from 'react'
import ReactPaginate from 'react-paginate'
import styled from 'styled-components'

import { IPaging } from '../utils/interfaces'
import { type IPaging } from '~/utils'

interface Props {
items: Array<any>
Expand Down
2 changes: 1 addition & 1 deletion src/components/SafeManager.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useAccount } from 'wagmi'

import { useStoreActions, useStoreState } from '~/store'
import { fetchUserSafesRaw } from '~/services/safes'
import { timeout, IUserSafeList, isAddress } from '~/utils'
import { timeout, type IUserSafeList, isAddress } from '~/utils'
import { useGeb } from '~/hooks'
import Button from './Button'

Expand Down
4 changes: 2 additions & 2 deletions src/components/SideMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useState } from 'react'
import { useEffect, useRef, useState } from 'react'
import { CSSTransition } from 'react-transition-group'
import styled from 'styled-components'

Expand All @@ -7,7 +7,7 @@ import { ConnectButton } from '@rainbow-me/rainbowkit'
import NavLinks from './NavLinks'

const SideMenu = () => {
const nodeRef = React.useRef(null)
const nodeRef = useRef(null)

const [isOpen, setIsOpen] = useState(false)
const { popupsModel: popupsActions } = useStoreActions((state) => state)
Expand Down
2 changes: 1 addition & 1 deletion src/components/TokenInput.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { ChangeEvent, useState } from 'react'
import { type ChangeEvent, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { Loader } from 'react-feather'
import styled from 'styled-components'
Expand Down
4 changes: 2 additions & 2 deletions src/components/TransactionOverview.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from 'styled-components'
import ReflexerIcon from './Icons/ReflexerIcon'
import arrow from '../assets/arrow.svg'
import uniswapIcon from '../assets/uniswap-icon.svg'
import arrow from '~/assets/arrow.svg'
import uniswapIcon from '~/assets/uniswap-icon.svg'
interface Props {
title: string
description: string
Expand Down
3 changes: 2 additions & 1 deletion src/containers/Analytics/DataCard.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { type ReactChild, type ReactChildren } from 'react'
import { Info } from 'react-feather'
import styled from 'styled-components'

Expand All @@ -8,7 +9,7 @@ export interface DataCardProps {
title: string
value: string
description?: string
children?: React.ReactChildren | React.ReactChild
children?: ReactChildren | ReactChild
}

const DataCard = ({ title, image, value, description, children }: DataCardProps) => {
Expand Down
4 changes: 2 additions & 2 deletions src/containers/Analytics/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import ReactTooltip from 'react-tooltip'
import styled from 'styled-components'
import { useNetwork } from 'wagmi'

import DataCard, { DataCardProps } from './DataCard'
import { DataTable, TableProps } from './DataTable'
import DataCard, { type DataCardProps } from './DataCard'
import { DataTable, type TableProps } from './DataTable'
import { ContractsTable } from './ContractsTable'
import { AddressLink } from '~/components/AddressLink'
import { fetchAnalyticsData } from '@hai-on-op/sdk'
Expand Down
6 changes: 3 additions & 3 deletions src/containers/Auctions/AuctionsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import { useAuctions } from '~/hooks'
import { useStoreActions, useStoreState } from '~/store'
import AuctionBlock from '~/components/AuctionBlock'
import Pagination from '~/components/Pagination'
import { SideLabel } from '../Safes/CreateSafe'
import { IPaging, TOKEN_LOGOS } from '~/utils'
import { SideLabel } from '~/containers/Safes/CreateSafe'
import { type IPaging, TOKEN_LOGOS } from '~/utils'
import Dropdown from '~/components/Dropdown'
import { AuctionEventType } from '~/types'
import { type AuctionEventType } from '~/types'
import Button from '~/components/Button'
import Loader from '~/components/Loader'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useAccount } from 'wagmi'

import BidLine from '~/components/BidLine'
import { useStoreActions, useStoreState } from '~/store'
import { ICollateralAuction } from '~/types'
import type { ICollateralAuction } from '~/types'
import { COIN_TICKER, formatNumber, parseWad } from '~/utils'
import AlertLabel from '~/components/AlertLabel'
import Button from '~/components/Button'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Loader from '~/components/Loader'
import Pagination from '~/components/Pagination'
import { SideLabel } from '~/containers/Safes/CreateSafe'
import { useCollateralAuctions, usePublicGeb } from '~/hooks'
import { IPaging, TOKEN_LOGOS } from '~/utils'
import { type IPaging, TOKEN_LOGOS } from '~/utils'
import CollateralAuctionBlock from './CollateralAuctionBlock'

export type Item = {
Expand Down
2 changes: 1 addition & 1 deletion src/containers/Auctions/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { handleTransactionError, useStartAuction, useQuery, useGetAuctions, useP
import AuctionsFAQ from '~/components/AuctionsFAQ'
import AlertLabel from '~/components/AlertLabel'
import Modal from '~/components/Modals/Modal'
import { AuctionEventType } from '~/types'
import type { AuctionEventType } from '~/types'
import { useStoreActions, useStoreState } from '~/store'
import AuctionsList from './AuctionsList'
import Button from '~/components/Button'
Expand Down
16 changes: 8 additions & 8 deletions src/containers/Safes/Accounts.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import styled from 'styled-components'
import Lottie from 'react-lottie-player'
import { isMobile } from 'react-device-detect'
import Steps from '../../components/Steps'
import { useStoreState } from '../../store'
import LottieWallet from '../../utils/Lotties/wallet.json'
import LottieRegister from '../../utils/Lotties/register.json'
import LottieSafe from '../../utils/Lotties/vault.json'
import accountImg from '../../assets/account-img.png'
import walletImg from '../../assets/wallet-img.png'
import safeImg from '../../assets/safe-img.png'
import Steps from '~/components/Steps'
import { useStoreState } from '~/store'
import LottieWallet from '~/utils/Lotties/wallet.json'
import LottieRegister from '~/utils/Lotties/register.json'
import LottieSafe from '~/utils/Lotties/vault.json'
import accountImg from '~/assets/account-img.png'
import walletImg from '~/assets/wallet-img.png'
import safeImg from '~/assets/safe-img.png'

const Accounts = () => {
const { connectWalletModel: connectWalletState } = useStoreState((state) => state)
Expand Down
Loading