Browse Source

fix: resolve merge issues

develop
Apostolos Fanakis 4 years ago
parent
commit
8552a9058d
  1. 4
      packages/concordia-app/src/components/PostList/PostListRow/index.jsx
  2. 8
      packages/concordia-app/src/components/PostList/PostVoting/index.jsx
  3. 2
      packages/concordia-app/src/components/TopicList/TopicListRow/index.jsx

4
packages/concordia-app/src/components/PostList/PostListRow/index.jsx

@ -1,7 +1,9 @@
import React, {
memo, useEffect, useMemo, useState, useCallback,
} from 'react';
import { Dimmer, Feed, Placeholder, Ref } from 'semantic-ui-react';
import {
Dimmer, Feed, Placeholder, Ref,
} from 'semantic-ui-react';
import PropTypes from 'prop-types';
import { useTranslation } from 'react-i18next';
import TimeAgo from 'react-timeago';

8
packages/concordia-app/src/components/PostList/PostVoting/index.jsx

@ -3,12 +3,11 @@ import React, {
} from 'react';
import { Button, Popup } from 'semantic-ui-react';
import PropTypes from 'prop-types';
import './styles.css';
import { useSelector } from 'react-redux';
import { POST_VOTING_CONTRACT } from '../../../constants/contracts/ContractNames';
import { POST_VOTING_CONTRACT } from 'concordia-shared/src/constants/contracts/ContractNames';
import { drizzle } from '../../../redux/store';
import { TRANSACTION_ERROR, TRANSACTION_SUCCESS } from '../../../constants/TransactionStatus';
import './styles.css';
const CHOICE_DEFAULT = '0';
const CHOICE_UP = '1';
@ -93,7 +92,8 @@ const PostVoting = (props) => {
useEffect(() => {
if (voting && transactionStack && transactionStack[createVoteCacheSendStackId]
&& transactions[transactionStack[createVoteCacheSendStackId]]) {
if (transactions[transactionStack[createVoteCacheSendStackId]].status === TRANSACTION_SUCCESS || transactions[transactionStack[createVoteCacheSendStackId]].status === TRANSACTION_ERROR) {
if (transactions[transactionStack[createVoteCacheSendStackId]].status === TRANSACTION_SUCCESS
|| transactions[transactionStack[createVoteCacheSendStackId]].status === TRANSACTION_ERROR) {
setVoting(false);
}
}

2
packages/concordia-app/src/components/TopicList/TopicListRow/index.jsx

@ -10,9 +10,9 @@ import TimeAgo from 'react-timeago';
import { useHistory } from 'react-router';
import { useDispatch, useSelector } from 'react-redux';
import { Link } from 'react-router-dom';
import ProfileImage from '../../ProfileImage';
import { FORUM_CONTRACT } from 'concordia-shared/src/constants/contracts/ContractNames';
import { TOPICS_DATABASE, USER_DATABASE } from 'concordia-shared/src/constants/orbit/OrbitDatabases';
import ProfileImage from '../../ProfileImage';
import { FETCH_USER_DATABASE } from '../../../redux/actions/peerDbReplicationActions';
import { breeze } from '../../../redux/store';
import './styles.css';

Loading…
Cancel
Save