Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/mythical-dev' into …
Browse files Browse the repository at this point in the history
…koni/dev/issue-223_v2
  • Loading branch information
dungnguyen-art committed Dec 12, 2024
2 parents a4f632e + c334316 commit ba0b69c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ const Component = ({ className, filterItems, handleCancel, handleReset, onConfir
{!!options[index + 1] && checkboxContent(options[index + 1], optionLabel as FilterOption, index + 1)}
</div>
)
: <></>
: null
))
}
</div>
Expand Down Expand Up @@ -234,7 +234,7 @@ export const ToolFiltersModal = styled(Component)<ThemeProps>(({ theme: { extend
'.ant-checkbox-checked.ant-checkbox-checked': {
backgroundImage: 'url("/images/mythical/check-selected.png")',
backgroundPosition: 'center center',
backgroundSize: '100% 24px',
backgroundSize: '100% 24px'
// filter: 'drop-shadow(0.97px 0.97px 0px #000)'
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,12 @@ export const GameAccountListArea = ({ isLoading, leaderboardPersonItems }: Props
return [];
}

const telegramAccountName = (mineAccount?.info.firstName || mineAccount?.info.lastName)
? `${mineAccount?.info.firstName || ''} ${mineAccount?.info.lastName || ''}`.trim()
: mineAccount.info.telegramUsername;

return [{
name: mineAccount.info.telegramUsername,
name: telegramAccountName,
prefix: '---',
point: 0,
avatarSrc: mineAccount.info.photoUrl,
Expand Down

0 comments on commit ba0b69c

Please sign in to comment.