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

Fix: add loading icon to Sign/Execute buttons #2805

Closed
wants to merge 18 commits into from
Closed

Fix: add loading icon to Sign/Execute buttons #2805

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fc0da40
Adding loading icon to buttons
francovenica Nov 13, 2023
01774c6
changed status for isSumittable
francovenica Nov 14, 2023
a061c3a
solve conflicts
francovenica Nov 14, 2023
0533d50
Add loader to bulk execution + removal submitBtn
francovenica Nov 14, 2023
675e49f
commit with a signature
francovenica Nov 20, 2023
e205b60
Reverting the previous dummy change
francovenica Nov 20, 2023
06e6112
changed status for isSumittable
francovenica Nov 14, 2023
711a24a
fix: different configs for staging and prod
schmanu Nov 13, 2023
3cea069
Fix: prefix switch for receive QR (#2795)
katspaugh Nov 13, 2023
bac2e5b
fix: allow execution of web assembly (#2797)
schmanu Nov 13, 2023
196e6c1
1.22.1
katspaugh Nov 13, 2023
774991d
Fix: revert relaying message (#2799)
katspaugh Nov 13, 2023
b47b9f7
Tests: Add test IDs and modify NFT tests (#2804)
mike10ca Nov 14, 2023
e9da499
chore: Analyze NextJS bundle size action (#2803)
usame-algan Nov 14, 2023
247b6fc
Add loader to bulk execution + removal submitBtn
francovenica Nov 14, 2023
40e5fc2
commit with a signature
francovenica Nov 20, 2023
7013c80
Reverting the previous dummy change
francovenica Nov 20, 2023
ee552fd
Merge branch 'loading-icon' of https://github.com/safe-global/safe-wa…
francovenica Nov 21, 2023
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 src/components/tx/SignOrExecuteForm/ExecuteForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { type ReactElement, type SyntheticEvent, useContext, useState } from 'react'
import { Box, Button, CardActions, Divider } from '@mui/material'
import { CircularProgress, Box, Button, CardActions, Divider } from '@mui/material'
import classNames from 'classnames'

import ErrorMessage from '@/components/tx/ErrorMessage'
Expand Down Expand Up @@ -159,8 +159,8 @@ const ExecuteForm = ({
{/* Submit button */}
<CheckWallet allowNonOwner={onlyExecute}>
{(isOk) => (
<Button variant="contained" type="submit" disabled={!isOk || submitDisabled}>
Execute
<Button variant="contained" type="submit" disabled={!isOk || submitDisabled} sx={{ minWidth: '112px' }}>
{!isSubmittable ? <CircularProgress size={20} /> : 'Execute'}
</Button>
)}
</CheckWallet>
Expand Down
6 changes: 3 additions & 3 deletions src/components/tx/SignOrExecuteForm/SignForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { type ReactElement, type SyntheticEvent, useContext, useState } from 'react'
import { Box, Button, CardActions, Divider } from '@mui/material'
import { CircularProgress, Box, Button, CardActions, Divider } from '@mui/material'

import ErrorMessage from '@/components/tx/ErrorMessage'
import { trackError, Errors } from '@/services/exceptions'
Expand Down Expand Up @@ -103,8 +103,8 @@ const SignForm = ({
{/* Submit button */}
<CheckWallet>
{(isOk) => (
<Button variant="contained" type="submit" disabled={!isOk || submitDisabled}>
Sign
<Button variant="contained" type="submit" disabled={!isOk || submitDisabled} sx={{ minWidth: '82px' }}>
{!isSubmittable ? <CircularProgress size={20} /> : 'Sign'}
</Button>
)}
</CheckWallet>
Expand Down
Loading