diff --git a/package.json b/package.json index 77ecc41d2..76ac232d1 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "@esteemapp/esteem-render-helpers": "^1.2.2", "@esteemapp/react-native-autocomplete-input": "^4.2.1", "@esteemapp/react-native-multi-slider": "^1.1.0", + "@esteemapp/react-native-render-html": "^4.1.5", "@react-native-community/cameraroll": "^1.3.0", "@react-native-community/netinfo": "^4.1.3", "appcenter": "^2.6.0", @@ -59,7 +60,7 @@ "react-native-fast-image": "^4.0.14", "react-native-gesture-handler": "^1.4.1", "react-native-iap": "3.4.15", - "react-native-image-crop-picker": "^0.25.2", + "react-native-image-crop-picker": "^0.26.1", "react-native-image-zoom-viewer": "^2.2.27", "react-native-keyboard-aware-scroll-view": "^0.9.1", "react-native-linear-gradient": "^2.4.2", @@ -67,7 +68,6 @@ "react-native-modal-popover": "0.0.12", "react-native-navigation-bar-color": "^0.1.0", "react-native-reanimated": "^1.3.0", - "react-native-render-html": "^4.1.2", "react-native-scrollable-tab-view": "esteemapp/react-native-scrollable-tab-view", "react-native-slider": "^0.11.0", "react-native-snap-carousel": "^3.8.0", diff --git a/src/components/comment/view/commentStyles.js b/src/components/comment/view/commentStyles.js index b0ce55d82..8fcfae3e4 100644 --- a/src/components/comment/view/commentStyles.js +++ b/src/components/comment/view/commentStyles.js @@ -9,6 +9,8 @@ export default EStyleSheet.create({ }, leftButton: { marginLeft: 10, + alignItems: 'center', + alignSelf: 'center', }, rightButton: { backgroundColor: '$iconColor', diff --git a/src/components/comment/view/commentView.js b/src/components/comment/view/commentView.js index ebdd82666..4e9a951cd 100644 --- a/src/components/comment/view/commentView.js +++ b/src/components/comment/view/commentView.js @@ -74,10 +74,10 @@ const CommentView = ({ handleOnVotersPress && @@ -91,9 +91,9 @@ const CommentView = ({ size={20} iconStyle={styles.leftIcon} style={styles.leftButton} - name="reply" + name="comment-outline" onPress={() => handleOnReplyPress && handleOnReplyPress(comment)} - iconType="MaterialIcons" + iconType="MaterialCommunityIcons" /> {currentAccountUsername === comment.author && ( diff --git a/src/components/commentsDisplay/view/commentsDisplayView.js b/src/components/commentsDisplay/view/commentsDisplayView.js index f92bf1c58..fb61b6191 100644 --- a/src/components/commentsDisplay/view/commentsDisplayView.js +++ b/src/components/commentsDisplay/view/commentsDisplayView.js @@ -19,7 +19,7 @@ const CommentsDisplayView = ({ mainAuthor, handleOnVotersPress, }) => { - const [selectedFilter, setSelectedFilter] = useState(null); + const [selectedFilter, setSelectedFilter] = useState('trending'); const [selectedOptionIndex, setSelectedOptionIndex] = useState(0); const _handleOnDropdownSelect = (option, index) => { diff --git a/src/components/postElements/body/view/commentBodyView.js b/src/components/postElements/body/view/commentBodyView.js index 0b43bb3ee..c7ebcdacf 100644 --- a/src/components/postElements/body/view/commentBodyView.js +++ b/src/components/postElements/body/view/commentBodyView.js @@ -1,8 +1,8 @@ import React from 'react'; import { Dimensions, Linking, Alert, TouchableOpacity, Text } from 'react-native'; import { useIntl } from 'react-intl'; -import HTML from 'react-native-render-html'; -import { getParentsTagsRecursively } from 'react-native-render-html/src/HTMLUtils'; +import HTML from '@esteemapp/react-native-render-html'; +import { getParentsTagsRecursively } from '@esteemapp/react-native-render-html/src/HTMLUtils'; import { navigate } from '../../../../navigation/service'; // Constants diff --git a/yarn.lock b/yarn.lock index d1c760e95..712d93482 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1120,6 +1120,19 @@ resolved "https://registry.yarnpkg.com/@esteemapp/react-native-multi-slider/-/react-native-multi-slider-1.1.0.tgz#16ac1df8518147daa4977cec2503caba1fbd96b5" integrity sha512-NSqnLuyrkO23oTpA2WiL9LrxR84eKYKxBp8OogsjLSmThfyaHJvG87J3GLoy+l/9xXA+BeHS4DF360brZ/lrUA== +"@esteemapp/react-native-render-html@^4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@esteemapp/react-native-render-html/-/react-native-render-html-4.1.5.tgz#91b52ac67d6890cb07fcebc25352e7b228340e41" + integrity sha512-C3C/VswCX+59hyenMjfKmbsz5GzX7VLrFUN6Az3W9NXd/iN8I+1P8S18EAmAHbX4hXCRLbDqqOMxxM7CayHcqQ== + dependencies: + buffer "^4.5.1" + events "^1.1.0" + html-entities "^1.2.0" + htmlparser2 "^3.10.1" + react-native-autoheight-webview "^1.3.4" + react-native-lightbox "git+https://github.com/oblador/react-native-lightbox.git" + stream "0.0.2" + "@formatjs/intl-relativetimeformat@^4.1.1": version "4.2.0" resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-4.2.0.tgz#dc403699eb5755dd19307c93a6541232b14dd721" @@ -3312,6 +3325,11 @@ elliptic@^6.4.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" +emitter-component@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/emitter-component/-/emitter-component-1.1.1.tgz#065e2dbed6959bf470679edabeaf7981d1003ab6" + integrity sha1-Bl4tvtaVm/RwZ57avq95gdEAOrY= + emoji-regex@^7.0.1, emoji-regex@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -7578,6 +7596,13 @@ react-native-autoheight-webview@^1.2.2: dependencies: prop-types "^15.7.2" +react-native-autoheight-webview@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/react-native-autoheight-webview/-/react-native-autoheight-webview-1.3.4.tgz#3fe1060186ce5c7c81a550cb31890da1a8c3dcdc" + integrity sha512-swBeCWi0pMckTtlbwkjZTPGjiJgrWweEoH5sjbafEUKbudVNdO2jfdu5OZuEPXOhSlO4iYrRhY0rfzXFh4aXaw== + dependencies: + prop-types "^15.7.2" + react-native-code-push@esteemapp/react-native-code-push: version "1000.0.0-beta" resolved "https://codeload.github.com/esteemapp/react-native-code-push/tar.gz/c07b7023c1212dc5d9231a0526a869d2501cb221" @@ -7644,10 +7669,10 @@ react-native-iap@3.4.15: dependencies: dooboolab-welcome "^1.1.1" -react-native-image-crop-picker@^0.25.2: - version "0.25.3" - resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.25.3.tgz#46ee28b4a0a187240e388bd28a44cf8c274caec6" - integrity sha512-jQ416WXEiEQ3w057QOYU++8/mDqYb2A/AGZY/NwR5eKda/z8a4wncWKj7oF9KBAHNKE1TmPrl9Rm0GZ0Jrzp6A== +react-native-image-crop-picker@^0.26.1: + version "0.26.1" + resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.26.1.tgz#3499ff5d4a09c9a9e927eb4f6ff936015ff594f1" + integrity sha512-5JdOjQS2V5L/vfb8+jPTUYx4VZPLvhZTyCUjiG0BZCbh+N1L24Kj2C+8EOuWS7xXXHrz5Bpe/eq5lQO1Efc+Yw== react-native-image-pan-zoom@^2.1.9: version "2.1.11" @@ -7674,6 +7699,12 @@ react-native-keyboard-aware-scroll-view@^0.9.1: prop-types "^15.6.2" react-native-iphone-x-helper "^1.0.3" +"react-native-lightbox@git+https://github.com/oblador/react-native-lightbox.git": + version "0.8.1" + resolved "git+https://github.com/oblador/react-native-lightbox.git#8db37fda32bfe2f4537b992550bd8d0c27f7ca57" + dependencies: + prop-types "^15.7.2" + react-native-linear-gradient@^2.4.2: version "2.5.6" resolved "https://registry.yarnpkg.com/react-native-linear-gradient/-/react-native-linear-gradient-2.5.6.tgz#96215cbc5ec7a01247a20890888aa75b834d44a0" @@ -7706,16 +7737,6 @@ react-native-reanimated@^1.3.0: resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.3.0.tgz#581cdb0bd1ff05e7304b116af712ded0c7665ede" integrity sha512-KFno6D0q09kx71IDuPa4qeC1t1msALsCMuli3/EN3YDf8XoM2CG53yzhVHMFtmcW0IUCySugHgxQiuT5BzwOPA== -react-native-render-html@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/react-native-render-html/-/react-native-render-html-4.1.2.tgz#dfd06ac7e87ed68b6421750e88dd7895d284935b" - integrity sha512-lIW7GfNCsqOzdv0hxiZms24uC9Hu8hqufMyD4FBjfs8HSc4pUKnvBgOljiqEXmjGhDEJM6oY7QGglAV0hL69bQ== - dependencies: - buffer "^4.5.1" - events "^1.1.0" - html-entities "^1.2.0" - htmlparser2 "^3.10.1" - react-native-safe-area-view@^0.14.1, react-native-safe-area-view@^0.14.6: version "0.14.8" resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.8.tgz#ef33c46ff8164ae77acad48c3039ec9c34873e5b" @@ -8890,6 +8911,13 @@ stream-buffers@~2.2.0: resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4" integrity sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ= +stream@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/stream/-/stream-0.0.2.tgz#7f5363f057f6592c5595f00bc80a27f5cec1f0ef" + integrity sha1-f1Nj8Ff2WSxVlfALyAon9c7B8O8= + dependencies: + emitter-component "^1.1.1" + strict-uri-encode@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"