-
Notifications
You must be signed in to change notification settings - Fork 3.7k
[TS migration] Migrate ProfileAvatarWithIndicator.js component to TypeScript #40090
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
Merged
roryabraham
merged 6 commits into
Expensify:main
from
kubabutkiewicz:ts-migration/ProfileAvatarWithIndicator
Apr 12, 2024
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e6082c2
feat: migrate ProfileAvatar to TS
kubabutkiewicz 21d7f6f
fix: formatting
kubabutkiewicz 5707e34
fix: resolve comments
kubabutkiewicz c38e38c
feat: use useOnyx instead of withOnyx
kubabutkiewicz 5a12209
Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into t…
kubabutkiewicz b9e32ab
fix: mock useOnyx hook
kubabutkiewicz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import React from 'react'; | ||
| import {View} from 'react-native'; | ||
| import {useOnyx} from 'react-native-onyx'; | ||
| import AvatarWithIndicator from '@components/AvatarWithIndicator'; | ||
| import OfflineWithFeedback from '@components/OfflineWithFeedback'; | ||
| import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import * as UserUtils from '@libs/UserUtils'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
|
|
||
| type ProfileAvatarWithIndicatorProps = { | ||
| /** Whether the avatar is selected */ | ||
| isSelected?: boolean; | ||
| }; | ||
|
|
||
| function ProfileAvatarWithIndicator({isSelected = false}: ProfileAvatarWithIndicatorProps) { | ||
| const styles = useThemeStyles(); | ||
| const currentUserPersonalDetails = useCurrentUserPersonalDetails(); | ||
| const [isLoadingOnyxValue] = useOnyx(ONYXKEYS.IS_LOADING_APP); | ||
| const isLoading = isLoadingOnyxValue ?? true; | ||
|
|
||
| return ( | ||
| <OfflineWithFeedback pendingAction={currentUserPersonalDetails.pendingFields?.avatar}> | ||
| <View style={[isSelected && styles.selectedAvatarBorder]}> | ||
| <AvatarWithIndicator | ||
| source={UserUtils.getAvatar(currentUserPersonalDetails.avatar, currentUserPersonalDetails.accountID)} | ||
| fallbackIcon={currentUserPersonalDetails.fallbackIcon} | ||
| isLoading={isLoading && !currentUserPersonalDetails.avatar} | ||
| /> | ||
| </View> | ||
| </OfflineWithFeedback> | ||
| ); | ||
| } | ||
|
|
||
| ProfileAvatarWithIndicator.displayName = 'ProfileAvatarWithIndicator'; | ||
|
|
||
| export default ProfileAvatarWithIndicator; | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note: This piece of code mimics the old behavior (
withOnyx+ default value assigment toisLoadingprop).