diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-06-23 17:21:40 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-06-23 17:21:40 -0400 |
| commit | 57280e8e2a7d1c5c88dba9f74c2f1e8b5e1ef9b8 (patch) | |
| tree | d6e569985cb9b66e6e6c01edc1aae6aff955c7b3 | |
| parent | bb7f99474f9c4ba6407301ddea4b7a8c48eff609 (diff) | |
| parent | 8c2b915678b852f597c38ab00d18c22bf62d2051 (diff) | |
Merge branch 'poc-video' into tma944-video-moment-userflow
# Conflicts:
# src/components/moments/Moment.tsx
# src/components/moments/MomentPostContent.tsx
# yarn.lock
| -rw-r--r-- | src/components/moments/MomentPostContent.tsx | 2 | ||||
| -rw-r--r-- | yarn.lock | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/components/moments/MomentPostContent.tsx b/src/components/moments/MomentPostContent.tsx index 4d2554d8..8615a332 100644 --- a/src/components/moments/MomentPostContent.tsx +++ b/src/components/moments/MomentPostContent.tsx @@ -124,7 +124,7 @@ const MomentPostContent: React.FC<MomentPostContentProps> = ({ /> )} </TouchableWithoutFeedback> - {visible && ( + {visible && !isVideo && ( <Animated.View style={[styles.tapTag, {opacity: fadeValue}]}> <MomentTags editing={false} @@ -1380,14 +1380,6 @@ "@types/react" "*" "@types/react-native" "*" -"@types/react-native-video@^5.0.6": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@types/react-native-video/-/react-native-video-5.0.6.tgz#1a84eff00820b8d3136dd6d6333ce471738293a6" - integrity sha512-elf7Y7qornIySK5yR9yOINtQcqXScSQoe9yz5Kuisq/IV5Kf3BprsNGHloRXT+WYVQflii6+EJwyAUs1R4izAw== - dependencies: - "@types/react" "*" - "@types/react-native" "*" - "@types/react-native@*": version "0.64.10" resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.64.10.tgz#5eb6a72c77ce0f7e6e14b19c61a6bc585975eef5" @@ -2842,11 +2834,6 @@ eme-encryption-scheme-polyfill@^2.0.1: resolved "https://registry.yarnpkg.com/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.0.3.tgz#2ca6e06480e06cceb5e50efd27943ac46c959878" integrity sha512-44CNFMsqzHdKHrzWxlS7xZ8KUHn5XutBqpmCuWzNIynmAyFInHrrD3ozv/RvK9ZhgV6QY6Easx8EWAmxteNodg== -eme-encryption-scheme-polyfill@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.0.3.tgz#2ca6e06480e06cceb5e50efd27943ac46c959878" - integrity sha512-44CNFMsqzHdKHrzWxlS7xZ8KUHn5XutBqpmCuWzNIynmAyFInHrrD3ozv/RvK9ZhgV6QY6Easx8EWAmxteNodg== - emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" |