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

Show "Update metadata" button for instance without metadata #2327

Merged
merged 59 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
e2abc9e
simple profile button and auth modal layout
tom2drum Sep 17, 2024
6494697
connect email and code screens to API
tom2drum Sep 17, 2024
39ac339
add screens to modal for wallet authentication
tom2drum Sep 18, 2024
2c28370
migrate to pin input
tom2drum Sep 18, 2024
ec917a0
user profile menu
tom2drum Sep 18, 2024
7b19b08
refactor otp field
tom2drum Sep 18, 2024
c2f67dd
fix passing set-cookie from api response
tom2drum Sep 18, 2024
149a80b
add wallet info into profile menu
tom2drum Sep 18, 2024
658aeed
add mobile menu
tom2drum Sep 18, 2024
4eb5a26
show connected wallet address in button
tom2drum Sep 18, 2024
6e26942
my profile page re-design
tom2drum Sep 19, 2024
8018001
custom behaviour of connect button on dapp page
tom2drum Sep 19, 2024
b407273
style pin input
tom2drum Sep 19, 2024
9cc3d53
add logout
tom2drum Sep 19, 2024
1878c18
handle case when account is disabled
tom2drum Sep 19, 2024
4b18a65
handle case when wc is disabled
tom2drum Sep 19, 2024
5b91364
remove old components
tom2drum Sep 19, 2024
12e07e0
refactoring
tom2drum Sep 19, 2024
1970de1
workflow to link wallet or email to account
tom2drum Sep 20, 2024
ee71acd
link wallet from profile
tom2drum Sep 20, 2024
da42e08
show better OTP code errors
tom2drum Sep 20, 2024
e2f7ab6
add email alert on watchlist and verified addresses pages
tom2drum Sep 20, 2024
bccb157
deprecate env and remove old code
tom2drum Sep 20, 2024
b98271b
remove code for unverified email page
tom2drum Sep 20, 2024
9837acc
add auth guard to address action items
tom2drum Sep 20, 2024
d75b4b4
move useRedirectForInvalidAuthToken hook
tom2drum Sep 20, 2024
8ef6779
add mixpanel events
tom2drum Sep 20, 2024
ba2000a
refetch csrf token after login and fix connect wallet from contract page
tom2drum Sep 23, 2024
2f496cf
Add NEXT_PUBLIC_RE_CAPTCHA_V3_APP_SITE_KEY env
alik-agaev Sep 24, 2024
b883f4c
migrate to reCAPTCHA v3
tom2drum Sep 24, 2024
d5cf789
resend code and change email from profile page
tom2drum Sep 24, 2024
f54c693
better wallet sign-in message error
tom2drum Sep 24, 2024
632cd0f
fix demo envs
tom2drum Sep 24, 2024
eec8562
update some screenshots
tom2drum Sep 25, 2024
45aac83
profile button design fixes
tom2drum Sep 26, 2024
261724c
fix behaviour "connect wallet" button on contract page
tom2drum Sep 26, 2024
000bf0d
Merge branch 'main' of github.com:blockscout/frontend into tom2drum/i…
tom2drum Oct 8, 2024
f363957
fix linking email and wallet to existing account
tom2drum Oct 14, 2024
cc89fcf
bug fixes
tom2drum Oct 14, 2024
1517d8d
restore the login page
tom2drum Oct 14, 2024
b8adbff
update screenshots
tom2drum Oct 14, 2024
11467f3
tests for auth modal and user profile
tom2drum Oct 14, 2024
a3f9cc1
add name field to profile page and write some tests
tom2drum Oct 14, 2024
db115fe
[skip ci] clean up and more tests
tom2drum Oct 14, 2024
0defa03
update texts
tom2drum Oct 15, 2024
3eefec5
change text once more
tom2drum Oct 16, 2024
d268288
fix verified email checkmark behaviour
tom2drum Oct 18, 2024
a67f071
pass api error to the toast while signing in with wallet
tom2drum Oct 18, 2024
7141aa3
Merge branch 'main' of github.com:blockscout/frontend into tom2drum/i…
tom2drum Oct 18, 2024
4546db7
[skip ci] disable email field on profile page
tom2drum Oct 21, 2024
f9e590b
bug fixes
tom2drum Oct 22, 2024
bcc3cb7
Merge branch 'main' of github.com:blockscout/frontend into tom2drum/i…
tom2drum Oct 22, 2024
10b4c5e
update screenshot
tom2drum Oct 22, 2024
fed42c9
Blockscout account V2
tom2drum Oct 22, 2024
5552cd6
Merge branch 'main' of github.com:blockscout/frontend into tom2drum/i…
tom2drum Oct 23, 2024
6949b80
fix texts and button paddings
tom2drum Oct 25, 2024
02a341d
Show "Update metadata" button for instance without metadata
tom2drum Oct 28, 2024
b15dbee
Merge branch 'main' of github.com:blockscout/frontend into tom2drum/i…
tom2drum Oct 30, 2024
3ddc266
remove unused components
tom2drum Oct 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
10 changes: 3 additions & 7 deletions ui/shared/AccountActionsMenu/AccountActionsMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ const AccountActionsMenu = ({ isLoading, className, showUpdateMetadataItem }: Pr
mixpanel.logEvent(mixpanel.EventTypes.PAGE_WIDGET, { Type: 'Address actions (more button)' });
}, []);

if (!config.features.account.isEnabled) {
return null;
}

const userWithoutEmail = profileQuery.data && !profileQuery.data.email;

const items = [
Expand All @@ -49,15 +45,15 @@ const AccountActionsMenu = ({ isLoading, className, showUpdateMetadataItem }: Pr
},
{
render: (props: ItemProps) => <TokenInfoMenuItem { ...props }/>,
enabled: isTokenPage && config.features.addressVerification.isEnabled && !userWithoutEmail,
enabled: config.features.account.isEnabled && isTokenPage && config.features.addressVerification.isEnabled && !userWithoutEmail,
},
{
render: (props: ItemProps) => <PrivateTagMenuItem { ...props } entityType={ isTxPage ? 'tx' : 'address' }/>,
enabled: true,
enabled: config.features.account.isEnabled,
},
{
render: (props: ItemProps) => <PublicTagMenuItem { ...props }/>,
enabled: !isTxPage && config.features.publicTagsSubmission.isEnabled,
enabled: config.features.account.isEnabled && !isTxPage && config.features.publicTagsSubmission.isEnabled,
},
].filter(({ enabled }) => enabled);

Expand Down
2 changes: 1 addition & 1 deletion ui/shared/AccountActionsMenu/parts/ButtonItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ interface Props {

const ButtonItem = ({ className, label, onClick, icon, isDisabled }: Props) => {
return (
<Tooltip label={ label }>
<Tooltip label={ label } isDisabled={ isDisabled }>
<IconButton
aria-label={ label }
className={ className }
Expand Down
2 changes: 1 addition & 1 deletion ui/tokenInstance/TokenInstancePageTitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ const TokenInstancePageTitle = ({ isLoading, token, instance, hash }: Props) =>
) }
{ !isLoading && <AddressAddToWallet token={ token } variant="button"/> }
<AddressQrCode address={ address } isLoading={ isLoading }/>
<AccountActionsMenu isLoading={ isLoading } showUpdateMetadataItem={ Boolean(instance?.metadata) }/>
<AccountActionsMenu isLoading={ isLoading } showUpdateMetadataItem/>
{ appLink }
</Flex>
);
Expand Down
Loading