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

break: rename functions in UserMenu props #542

Merged
merged 5 commits into from
May 21, 2024
Merged

break: rename functions in UserMenu props #542

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b477358
break: UserMenu change functions naming in props
braianj May 21, 2024
7229032
fix: UserMenu storybook
braianj May 21, 2024
4f0d8bf
feat: remove duplicated account in UserMenuI18N
braianj May 21, 2024
3d3116f
feat: sort UserMenuI18N
braianj May 21, 2024
2d25e73
feat: naming
braianj May 21, 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
5 changes: 2 additions & 3 deletions src/components/UserMenu/UserMenu.i18n.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@ import { UserMenuI18N } from './UserMenu.types'
export const i18n = {
activity: 'Activity',
myAssets: 'My Assets',
settings: 'Account Settings',
myLists: 'My Lists',
account: 'Account',
account: 'Account Settings',
profile: 'Profile',
viewProfile: 'View Profile',
signIn: 'Sign In',
signOut: 'Log Out',
guest: 'Guest',
wallet: 'Manage Wallet',
marketplaceAuthorizations: 'Marketplace Authorizations',
jumpIn: 'Jump In'
} as UserMenuI18N
6 changes: 3 additions & 3 deletions src/components/UserMenu/UserMenu.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ storiesOf('UserMenu', module)
i18n={i18n}
isSignedIn
avatar={avatar}
onClickAccountSettings={() => undefined}
onClickMarketplaceAuthorization={() => undefined}
onClickActivity={() => undefined}
manaBalances={{ [Network.ETHEREUM]: 1000, [Network.MATIC]: 2500 }}
hasActivity
Expand All @@ -90,7 +90,7 @@ storiesOf('UserMenu', module)
i18n={i18n}
isSignedIn
avatar={avatar}
onClickAccountSettings={() => undefined}
onClickMarketplaceAuthorization={() => undefined}
onClickActivity={() => undefined}
manaBalances={{ [Network.ETHEREUM]: 1000, [Network.MATIC]: 2500 }}
hasActivity
Expand All @@ -115,7 +115,7 @@ storiesOf('UserMenu', module)
i18n={i18n}
isSignedIn
avatar={avatar}
onClickAccountSettings={() => undefined}
onClickMarketplaceAuthorization={() => undefined}
onClickActivity={() => undefined}
manaBalances={{ [Network.ETHEREUM]: 1000, [Network.MATIC]: 2500 }}
hasActivity
Expand Down
8 changes: 4 additions & 4 deletions src/components/UserMenu/UserMenu.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,26 @@ export type UserMenuProps = Omit<

export type UserMenuI18N = Record<
| 'myAssets'
| 'settings'
| 'account'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure you want to duplicate account?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, and thanks for the duplication catch.

| 'account'
| 'viewProfile'
| 'signIn'
| 'signOut'
| 'guest'
| 'wallet'
| 'marketplaceAuthorizations'
| 'jumpIn',
string
>

export enum UserMenuEventId {
ACTIVITY = 'activity',
ACCOUNT = 'account',
MY_ASSETS = 'my_assets',
SETTINGS = 'settings',
PROFILE = 'profile',
SIGN_IN = 'sign_in',
SIGN_OUT = 'sign_out',
GUEST = 'guest',
WALLET = 'wallet',
MARKETPLACE_AUTHORIZATION = 'marketplace_authorization',
braianj marked this conversation as resolved.
Show resolved Hide resolved
JUMP_IN = 'jump_in',
BALANCE = 'balance'
}
16 changes: 8 additions & 8 deletions src/components/UserMenu/UserMenuSignedIn/UserMenuSignedIn.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ storiesOf('UserMenuSignedIn', module)
avatar={{ ...avatar, hasClaimedName: false }}
trackingId=""
isOpen
onClickAccountSettings={console.log}
onClickMarketplaceAuthorization={console.log}
onClickActivity={console.log}
onClickMyAssets={console.log}
onClickProfile={console.log}
onClickSignOut={console.log}
onClickToggle={console.log}
onClickWallet={console.log}
onClickAccount={console.log}
i18n={i18n}
/>
</div>
Expand All @@ -36,13 +36,13 @@ storiesOf('UserMenuSignedIn', module)
trackingId=""
address={avatar.ethAddress}
isOpen
onClickAccountSettings={console.log}
onClickMarketplaceAuthorization={console.log}
onClickActivity={console.log}
onClickMyAssets={console.log}
onClickProfile={console.log}
onClickSignOut={console.log}
onClickToggle={console.log}
onClickWallet={console.log}
onClickAccount={console.log}
i18n={i18n}
/>
</div>
Expand All @@ -54,13 +54,13 @@ storiesOf('UserMenuSignedIn', module)
manaBalances={{ [Network.ETHEREUM]: 1000, [Network.MATIC]: 2500 }}
trackingId=""
isOpen
onClickAccountSettings={console.log}
onClickMarketplaceAuthorization={console.log}
onClickActivity={console.log}
onClickMyAssets={console.log}
onClickProfile={console.log}
onClickSignOut={console.log}
onClickToggle={console.log}
onClickWallet={console.log}
onClickAccount={console.log}
i18n={i18n}
/>
</div>
Expand Down Expand Up @@ -105,13 +105,13 @@ storiesOf('UserMenuSignedIn', module)
onClick: console.log,
onClose: console.log
}}
onClickAccountSettings={console.log}
onClickMarketplaceAuthorization={console.log}
onClickActivity={console.log}
onClickMyAssets={console.log}
onClickProfile={console.log}
onClickSignOut={console.log}
onClickToggle={console.log}
onClickWallet={console.log}
onClickAccount={console.log}
i18n={i18n}
/>
</div>
Expand Down
32 changes: 16 additions & 16 deletions src/components/UserMenu/UserMenuSignedIn/UserMenuSignedIn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const UserMenuSignedIn = (props: UserMenuSignedInProps) => {
trackingId,
notifications,
i18n,
onClickAccountSettings,
onClickMarketplaceAuthorization,
onClickActivity,
onClickBalance,
onClickClose,
Expand All @@ -35,7 +35,7 @@ export const UserMenuSignedIn = (props: UserMenuSignedInProps) => {
onClickProfile,
onClickSignOut,
onClickToggle,
onClickWallet
onClickAccount
} = props

const isTabletAndBelow = useTabletAndBelowMediaQuery()
Expand Down Expand Up @@ -89,18 +89,18 @@ export const UserMenuSignedIn = (props: UserMenuSignedInProps) => {
[onClickMyAssets, onClickUserMenuItem, trackingId]
)

const handleClickAccountSettings = useCallback(
const handleClickMarketplaceAuthorization = useCallback(
(event: React.MouseEvent<HTMLElement, MouseEvent>) => {
onClickUserMenuItem &&
onClickUserMenuItem(event, {
eventTrackingName: UserMenuEventId.SETTINGS,
eventTrackingName: UserMenuEventId.MARKETPLACE_AUTHORIZATION,
trackingId,
url: config.get('MARKETPLACE_SETTINGS_URL')
})
setTimeout(
() => {
onClickAccountSettings
? onClickAccountSettings(event)
onClickMarketplaceAuthorization
? onClickMarketplaceAuthorization(event)
: window.open(
`${config.get('MARKETPLACE_SETTINGS_URL')}`,
'_blank',
Expand All @@ -110,7 +110,7 @@ export const UserMenuSignedIn = (props: UserMenuSignedInProps) => {
onClickUserMenuItem ? 300 : 0
)
},
[onClickAccountSettings, onClickUserMenuItem, trackingId]
[onClickMarketplaceAuthorization, onClickUserMenuItem, trackingId]
)

const handleClickProfile = useCallback(
Expand All @@ -134,25 +134,25 @@ export const UserMenuSignedIn = (props: UserMenuSignedInProps) => {
[onClickProfile, onClickUserMenuItem, trackingId]
)

const handleClickWallet = useCallback(
const handleClickAccount = useCallback(
(event: React.MouseEvent<HTMLElement, MouseEvent>) => {
onClickUserMenuItem &&
onClickUserMenuItem(event, {
eventTrackingName: UserMenuEventId.WALLET,
eventTrackingName: UserMenuEventId.ACCOUNT,
trackingId,
url: config.get('ACCOUNT_URL')
})

setTimeout(
() => {
onClickWallet
? onClickWallet(event)
onClickAccount
? onClickAccount(event)
: window.open(config.get('ACCOUNT_URL'), '_blank', 'noopener')
},
onClickUserMenuItem ? 300 : 0
)
},
[onClickWallet, onClickUserMenuItem, trackingId]
[onClickAccount, onClickUserMenuItem, trackingId]
)

const handleClickSignOut = useCallback(
Expand Down Expand Up @@ -238,14 +238,14 @@ export const UserMenuSignedIn = (props: UserMenuSignedInProps) => {
</div>
</li>
<li>
<div onClick={handleClickWallet}>
{i18n.wallet}
<div onClick={handleClickAccount}>
{i18n.account}
<ArrowIcon />
</div>
</li>
<li>
<div onClick={handleClickAccountSettings}>
{i18n.settings}
<div onClick={handleClickMarketplaceAuthorization}>
{i18n.marketplaceAuthorizations}
<ArrowIcon />
</div>
</li>
Expand Down
4 changes: 2 additions & 2 deletions src/components/UserMenu/UserMenuSignedIn/UserMenuSignedIn.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export type UserMenuSignedInProps = ManaBalancesProps & {
hasActivity?: boolean
notifications?: NotificationsProps
i18n: UserMenuI18N
onClickAccountSettings?: (
onClickMarketplaceAuthorization?: (
event: React.MouseEvent<HTMLElement, MouseEvent>
) => void
onClickActivity?: (event: React.MouseEvent<HTMLElement, MouseEvent>) => void
Expand All @@ -23,7 +23,7 @@ export type UserMenuSignedInProps = ManaBalancesProps & {
trackingId: string
) => void
onClickToggle?: (event: React.MouseEvent<HTMLElement, MouseEvent>) => void
onClickWallet?: (event: React.MouseEvent<HTMLElement, MouseEvent>) => void
onClickAccount?: (event: React.MouseEvent<HTMLElement, MouseEvent>) => void
onClickUserMenuItem?: (
event: React.MouseEvent<HTMLElement, MouseEvent>,
options: { eventTrackingName: string; url?: string; trackingId?: string }
Expand Down
Loading