Merge branch 'master' of github.com:esteemapp/esteem-mobile into bugfix/comment-votes

This commit is contained in:
Mustafa Buyukcelebi 2019-08-28 11:43:43 +03:00
commit ade56f204a
6 changed files with 14 additions and 8 deletions

View File

@ -1,8 +1,7 @@
import EStyleSheet from 'react-native-extended-stylesheet'; import EStyleSheet from 'react-native-extended-stylesheet';
export default EStyleSheet.create({ export default EStyleSheet.create({
text: { list: {
color: '$primaryBlack', marginBottom: 20,
fontSize: 10,
}, },
}); });

View File

@ -9,7 +9,7 @@ import { injectIntl } from 'react-intl';
import { Comment } from '../../comment'; import { Comment } from '../../comment';
// Styles // Styles
// import styles from './commentStyles'; import styles from './commentStyles';
class CommentsView extends PureComponent { class CommentsView extends PureComponent {
/* Props /* Props
@ -61,6 +61,7 @@ class CommentsView extends PureComponent {
return ( return (
<Fragment> <Fragment>
<FlatList <FlatList
style={styles.list}
data={comments} data={comments}
keyExtractor={this._keyExtractor} keyExtractor={this._keyExtractor}
renderItem={({ item }) => ( renderItem={({ item }) => (

View File

@ -78,7 +78,7 @@ class TransactionView extends PureComponent {
isBlackText isBlackText
iconName={transactionData.icon} iconName={transactionData.icon}
iconType="MaterialIcons" iconType="MaterialIcons"
rightText={`${Math.round(value[0] * 1000) / 1000} ${value[1]}`} rightText={transactionData.value.trim()}
/> />
} }
> >

View File

@ -1,5 +1,10 @@
import { Client } from 'bugsnag-react-native'; import { Client, Configuration } from 'bugsnag-react-native';
import Config from 'react-native-config'; import Config from 'react-native-config';
const client = new Client(Config.BUGSNAG_API_KEY); const configuration = new Configuration();
configuration.apiKey = Config.BUGSNAG_API_KEY;
configuration.consoleBreadcrumbsEnabled = true;
configuration.notifyReleaseStages = ['beta', 'production'];
const client = new Client(configuration);
export default client; export default client;

View File

@ -134,6 +134,7 @@ class NotificationContainer extends Component {
intl.formatMessage({ id: 'alert.error' }), intl.formatMessage({ id: 'alert.error' }),
intl.formatMessage({ d: 'alert.unknow_error' }), intl.formatMessage({ d: 'alert.unknow_error' }),
); );
this.setState({ isNotificationRefreshing: false });
}); });
}; };

View File

@ -51,7 +51,7 @@ export const groomingTransactionData = (transaction, steemPerMVests, formatNumbe
}).replace(',', '.'); }).replace(',', '.');
result.value = `${sbdPayout > 0 ? `${sbdPayout} SBD` : ''} ${ result.value = `${sbdPayout > 0 ? `${sbdPayout} SBD` : ''} ${
steemPayout > 0 ? `${steemPayout} steemPayout` : '' steemPayout > 0 ? `${steemPayout} STEEM` : ''
} ${vestingPayout > 0 ? `${vestingPayout} SP` : ''}`; } ${vestingPayout > 0 ? `${vestingPayout} SP` : ''}`;
result.details = author && permlink ? `@${author}/${permlink}` : null; result.details = author && permlink ? `@${author}/${permlink}` : null;