diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-04-09 19:55:26 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-04-09 19:55:26 -0400 |
| commit | 0a480048b41a80e8569ce57064d1b9716c3d25e3 (patch) | |
| tree | 4f1118560c10dcdfa32e99d2b73c3d7814d7904d /src/components/suggestedPeople | |
| parent | 17de7d8312b10f84af2178f769ff92bf96ab47f5 (diff) | |
| parent | 9d5ad9bea36c0b2abffd04b25126d18158017137 (diff) | |
Merge branch 'master' into tma784-style-message-input
# Conflicts:
# src/screens/chat/ChatListScreen.tsx
# src/screens/chat/ChatScreen.tsx
Diffstat (limited to 'src/components/suggestedPeople')
| -rw-r--r-- | src/components/suggestedPeople/SPTaggsBar.tsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/suggestedPeople/SPTaggsBar.tsx b/src/components/suggestedPeople/SPTaggsBar.tsx index adac6dcf..29c58cce 100644 --- a/src/components/suggestedPeople/SPTaggsBar.tsx +++ b/src/components/suggestedPeople/SPTaggsBar.tsx @@ -70,7 +70,7 @@ const TaggsBar: React.FC<TaggsBarProps> = ({ setTaggsNeedUpdate={setTaggsNeedUpdate} setSocialDataNeedUpdate={handleSocialUpdate} whiteRing={true} - allowNavigation={allowTaggsNavigation} + screenType={screenType} />, ); i++; @@ -88,7 +88,7 @@ const TaggsBar: React.FC<TaggsBarProps> = ({ userXId={userXId} user={user} whiteRing={true} - allowNavigation={allowTaggsNavigation} + screenType={screenType} />, ); i++; |