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

Fix inconsistent indentation #1566

Merged
merged 1 commit into from
May 28, 2024
Merged

Fix inconsistent indentation #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@
"react/jsx-first-prop-new-line": "error",
"react/jsx-max-props-per-line": ["error", { "maximum": 1, "when": "multiline" }],
"react/jsx-indent-props": ["error", "first"],
"react/jsx-closing-bracket-location": "error"
"react/jsx-closing-bracket-location": "error",
"indent": ["error", 2]
}
}
]
Expand Down
14 changes: 7 additions & 7 deletions renderer/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ const App = ():JSX.Element => {
<Route
path="*"
element={
<>
<Sentry />
<Plausible />
<Routes>
<Route path="/dashboard" element={<Dashboard />} />
</Routes>
</>
<>
<Sentry />
<Plausible />
<Routes>
<Route path="/dashboard" element={<Dashboard />} />
</Routes>
</>
}
>
</Route>
Expand Down
12 changes: 6 additions & 6 deletions renderer/src/components/FilAddressForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ const FilAddressForm: FC<FilAddressFormProps> = ({
className={`
absolute text-body-2xs text-white mt-3 ease-[cubic-bezier(0.85,0,0.15,1)] duration-500
${(internalEditMode && addressIsValid && inputAddr.startsWith('f1'))
? 'visible'
: 'invisible opacity-0'
}
? 'visible'
: 'invisible opacity-0'
}
`}
>
Warning: Sending rewards to an f1 address incurs a higher gas fee than sending to an f4 address because
Expand All @@ -128,9 +128,9 @@ const FilAddressForm: FC<FilAddressFormProps> = ({
className={`
absolute text-body-2xs text-white mt-3 ease-[cubic-bezier(0.85,0,0.15,1)] duration-500
${(internalEditMode && addressIsValid && !inputAddr.startsWith('f1'))
? 'visible'
: 'invisible opacity-0'
}
? 'visible'
: 'invisible opacity-0'
}
`}
>
Enter a destination address for the transfer
Expand Down
30 changes: 15 additions & 15 deletions renderer/src/components/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ interface ModalProps {
const Modal : FC<ModalProps> = ({ isOpen, setIsOpen }) => {
return (
<>
<div
className={`
modal-bg fixed h-full w-full bg-primary duration-700 ease-[cubic-bezier(0.45,0,0.55,1)]
${isOpen ? 'z-30 opacity-20 visible' : 'opacity-0 z-[25] invisible'}
`}
onClick={setIsOpen}
/>
<div
className={`
modal-content fixed z-30 w-[744px] h-full bg-white duration-700 ease-[cubic-bezier(0.45,0,0.55,1)]
${isOpen ? 'right-0' : '-right-[744px] invisible'}
`}
>
<WalletModule isOpen={isOpen} />
</div>
<div
className={`
modal-bg fixed h-full w-full bg-primary duration-700 ease-[cubic-bezier(0.45,0,0.55,1)]
${isOpen ? 'z-30 opacity-20 visible' : 'opacity-0 z-[25] invisible'}
`}
onClick={setIsOpen}
/>
<div
className={`
modal-content fixed z-30 w-[744px] h-full bg-white duration-700 ease-[cubic-bezier(0.45,0,0.55,1)]
${isOpen ? 'right-0' : '-right-[744px] invisible'}
`}
>
<WalletModule isOpen={isOpen} />
</div>
</>
)
}
Expand Down
2 changes: 1 addition & 1 deletion renderer/src/components/TransferFunds.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ const TransferFundsButtons: FC<TransferFundsButtonsProps> = ({
`}
onClick={reset}
>
<span className="text-2xs px-4 text-body-s">Cancel</span>
<span className="text-2xs px-4 text-body-s">Cancel</span>
</button>
</div>
</div>
Expand Down
74 changes: 37 additions & 37 deletions renderer/src/components/WalletOnboarding.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,44 @@ import WalletIcon from '../assets/img/icons/wallet.svg?react'
const WalletOnboarding = () => {
return (
<div className='flex flex-col gap-3 px-6 pt-12 pb-6'>
<div className='flex flex-row align-middle h-[110px] w-full bg-grayscale-100 rounded'>
<div className='w-[80px] min-w-[80px] bg-primary h-full rounded-l grid place-items-center'>
<WalletIcon width={32} height={32} fill="white" />
</div>
<div className='py-3 px-6 pr-24'>
<p className='text-body-s text-primary font-body uppercase'>YOUR STATION WALLET</p>
<p className='text-body-2xs mt-1'>
Your Station Wallet has a unique address, where all the FIL you earn will be stored. Station
Modules will send FIL to this wallet on a regular basis, based on your contributions.
</p>
</div>
</div>
<div className='flex flex-row align-middle h-[110px] w-full bg-grayscale-100 rounded'>
<div className='w-[80px] min-w-[80px] bg-primary h-full rounded-l grid place-items-center'>
<TransferIcon width={32} height={32} fill="white" />
</div>
<div className='py-3 px-6 pr-24'>
<p className='text-body-s text-primary font-body uppercase'>TRANSFERRING YOUR FIL</p>
<p className='text-body-2xs mt-1'>
In order to transfer FIL out of your Station Wallet, you need to set a destination FIL address to
which to send your FIL. We recommend you regularly transfer the FIL in your Station Wallet to a
more secure wallet.
</p>
</div>
</div>
<div className='flex flex-row align-middle h-[110px] w-full bg-grayscale-100 rounded'>
<div className='w-[80px] min-w-[80px] bg-primary h-full rounded-l grid place-items-center'>
<CafeIcon width={32} height={32} fill="white" />
</div>
<div className='py-3 px-6 pr-24'>
<p className='text-body-s text-primary font-body uppercase'>GAS FEES</p>
<p className='text-body-2xs mt-1'>
All transactions on the blockchain incur a small gas fee, which can vary depending on network
activity. This is deducted from the total amount you are transferring.
</p>
</div>
</div>
<div className='flex flex-row align-middle h-[110px] w-full bg-grayscale-100 rounded'>
<div className='w-[80px] min-w-[80px] bg-primary h-full rounded-l grid place-items-center'>
<WalletIcon width={32} height={32} fill="white" />
</div>
<div className='py-3 px-6 pr-24'>
<p className='text-body-s text-primary font-body uppercase'>YOUR STATION WALLET</p>
<p className='text-body-2xs mt-1'>
Your Station Wallet has a unique address, where all the FIL you earn will be stored. Station
Modules will send FIL to this wallet on a regular basis, based on your contributions.
</p>
</div>
</div>
<div className='flex flex-row align-middle h-[110px] w-full bg-grayscale-100 rounded'>
<div className='w-[80px] min-w-[80px] bg-primary h-full rounded-l grid place-items-center'>
<TransferIcon width={32} height={32} fill="white" />
</div>
<div className='py-3 px-6 pr-24'>
<p className='text-body-s text-primary font-body uppercase'>TRANSFERRING YOUR FIL</p>
<p className='text-body-2xs mt-1'>
In order to transfer FIL out of your Station Wallet, you need to set a destination FIL address to
which to send your FIL. We recommend you regularly transfer the FIL in your Station Wallet to a
more secure wallet.
</p>
</div>
</div>
<div className='flex flex-row align-middle h-[110px] w-full bg-grayscale-100 rounded'>
<div className='w-[80px] min-w-[80px] bg-primary h-full rounded-l grid place-items-center'>
<CafeIcon width={32} height={32} fill="white" />
</div>
<div className='py-3 px-6 pr-24'>
<p className='text-body-s text-primary font-body uppercase'>GAS FEES</p>
<p className='text-body-2xs mt-1'>
All transactions on the blockchain incur a small gas fee, which can vary depending on network
activity. This is deducted from the total amount you are transferring.
</p>
</div>
</div>
</div>
)
}

Expand Down
10 changes: 5 additions & 5 deletions renderer/src/components/WalletTransactionsHistory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const WalletTransactionsHistory: FC<WalletTransactionsHistoryProps> = ({
${processingTransaction ? 'h-[calc(100vh_-_470px)]' : 'h-[calc(100vh_-_305px)]'}
`}
>
<p className="px-8 mb-2 w-fit text-body-3xs text-black opacity-80 uppercase">WALLET HISTORY</p>
<p className="px-8 mb-2 w-fit text-body-3xs text-black opacity-80 uppercase">WALLET HISTORY</p>
{allTransactions.map((transaction, index) => (
<div className='wallet-transaction' key={transaction.hash}>
<Transaction transaction={transaction} />
Expand Down Expand Up @@ -81,10 +81,10 @@ const ProcessingTransaction: FC<ProcessingTransactionProps> = ({ transaction })
pt-8 pb-8 bg-opacity-10 h-[165px] transition-all duration-1000 ease-in-out
${transaction ? 'mt-0' : '-mt-[165px]'}
${displayTransition?.status === 'succeeded'
? 'bg-green-200'
: displayTransition?.status === 'failed'
? 'bg-red-100'
: 'bg-orange-100'}
? 'bg-green-200'
: displayTransition?.status === 'failed'
? 'bg-red-100'
: 'bg-orange-100'}
`}
onTransitionEnd={() => !transaction && setDisplayTransaction(undefined)}
>
Expand Down