ecency/ecency-mobile
1
1
Fork 0
mirror of https://github.com/ecency/ecency-mobile.git synced 2024-12-19 11:21:41 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1476 from esteemapp/mmore

Browse Source 
Bug fixes
This commit is contained in:
Feruz M 2020-01-10 15:12:35 +02:00 committed by GitHub
commit b6007f0bbe
6 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/basicUIElements/view/placeHolder/boostPlaceHolderView.js
View File

@ -20,7 +20,7 @@ const BoostPlaceHolder = () => {
{({ isDarkTheme }) => { {({ isDarkTheme }) => {
const color = isDarkTheme ? '#2e3d51' : '#f5f5f5'; const color = isDarkTheme ? '#2e3d51' : '#f5f5f5';
return ( return (
<View style={styles.container} key={i.toString()}> <View style={styles.container} key={'key-' + i.toString()}>
<View style={styles.line}> <View style={styles.line}>
<Placeholder.Box color={color} width={90} height={40} animate="fade" /> <Placeholder.Box color={color} width={90} height={40} animate="fade" />
<View style={styles.paragraphWrapper}> <View style={styles.paragraphWrapper}>

4
src/components/editorElements/tagArea/view/tagAreaView.js
View File

@ -131,8 +131,8 @@ export default class TagAreaView extends Component {
}} }}
isPin={i === 0 && chips[1]} isPin={i === 0 && chips[1]}
placeholderTextColor="#fff" placeholderTextColor="#fff"
removeButton //removeButton
handleOnRemoveButtonPress={() => this._handleTagRemove(i)} //handleOnRemoveButtonPress={() => this._handleTagRemove(i)}
editable={!isPreviewActive} editable={!isPreviewActive}
maxLength={50} maxLength={50}
placeholder="tags" placeholder="tags"

2
src/components/postElements/body/view/commentBodyView.js
View File

@ -216,7 +216,7 @@ const CommentBody = ({
a { a {
color: ${EStyleSheet.value('$primaryBlue')}; color: ${EStyleSheet.value('$primaryBlue')};
cursor: pointer; cursor: pointer;
text-decoration: underline; margin-right: 5;
} }
img { img {
align-self: 'center'; align-self: 'center';

2
src/components/postElements/body/view/postBodyView.js
View File

@ -213,7 +213,7 @@ const PostBody = ({
a { a {
color: ${EStyleSheet.value('$primaryBlue')}; color: ${EStyleSheet.value('$primaryBlue')};
cursor: pointer; cursor: pointer;
text-decoration: underline; margin-right: 5;
} }
img { img {
align-self: 'center'; align-self: 'center';

5
src/screens/boost/screen/boostScreen.js
View File

@ -19,9 +19,8 @@ const ITEM_SKUS = Platform.select({
const _getTitle = title => { const _getTitle = title => {
let _title = title.toUpperCase(); let _title = title.toUpperCase();
if (_title !== 'FREE ESTM') {
if (_title.includes('(ESTEEM)')) { _title = _title.replace(/[^0-9]+/g, '') + ' ESTM';
_title = _title.replace('(ESTEEM)', '');
} }
return _title; return _title;

18
src/screens/editor/screen/editorScreen.js
View File

@ -228,7 +228,7 @@ class EditorScreen extends Component {
{!isReply && ( {!isReply && (
<TitleArea value={fields.title} componentID="title" intl={intl} autoFocus={true} /> <TitleArea value={fields.title} componentID="title" intl={intl} autoFocus={true} />
)} )}
{!isReply && ( {!isReply && !isPreviewActive && (
<TagInput <TagInput
value={fields.tags} value={fields.tags}
componentID="tag-area" componentID="tag-area"
@ -236,6 +236,13 @@ class EditorScreen extends Component {
handleTagChanged={this._handleOnTagAdded} handleTagChanged={this._handleOnTagAdded}
/> />
)} )}
{!isReply && isPreviewActive && (
<TagArea
draftChips={fields.tags.length > 0 ? fields.tags : null}
componentID="tag-area"
intl={intl}
/>
)}
<MarkdownEditor <MarkdownEditor
componentID="body" componentID="body"
draftBody={fields && fields.body} draftBody={fields && fields.body}
@ -257,12 +264,3 @@ class EditorScreen extends Component {
} }
export default injectIntl(EditorScreen); export default injectIntl(EditorScreen);
/*
<TagArea
draftChips={fields.tags.length > 0 ? fields.tags : null}
isRemoveTag={isRemoveTag}
componentID="tag-area"
handleTagChanged={this._handleOnTagAdded}
intl={intl}
/>
*/