diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-03-26 15:33:37 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-03-26 15:33:37 -0400 |
| commit | 9be7248ba54eeb2ad4d19edd4c01ee736b58bfcd (patch) | |
| tree | 6f66b86bbe9adaffb7d866b22a89e0e3f78f26a3 /src/utils/friends.ts | |
| parent | 883a6c51d4c3e442df5e6c0f3dc6fada2f370f8e (diff) | |
| parent | 99de9c8402f470ead242a81510dc2764ae7d9e66 (diff) | |
Merge branch 'master' into tma728-select-school-onboarding
# Conflicts:
# src/services/UserProfileService.ts
# src/types/types.ts
Diffstat (limited to 'src/utils/friends.ts')
| -rw-r--r-- | src/utils/friends.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/utils/friends.ts b/src/utils/friends.ts index 55d65170..5b0ded8f 100644 --- a/src/utils/friends.ts +++ b/src/utils/friends.ts @@ -1,7 +1,7 @@ // Handles click on friend/requested/unfriend button import {RootState} from '../store/rootReducer'; -import {ProfilePreviewType, ProfileType, ScreenType, UserType} from '../types'; +import {ProfilePreviewType, ProfileInfoType, ScreenType, UserType} from '../types'; import {AppDispatch} from '../store/configureStore'; import { addFriend, @@ -25,7 +25,7 @@ import {getUserAsProfilePreviewType} from './users'; export const handleFriendUnfriend = async ( screenType: ScreenType, user: UserType, - profile: ProfileType, + profile: ProfileInfoType, dispatch: AppDispatch, state: RootState, loggedInUser: UserType, |