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

Merge pull request #268 from esteemapp/bugfix/186

Browse Source 
Bugfix/186
This commit is contained in:
uğur erdal 2018-12-19 14:57:18 +03:00 committed by GitHub
commit ab0fb9e158
15 changed files with 300 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/basicUIElements/view/grayWrapper/grayWrapperView.js
View File

@ -2,6 +2,6 @@ import React from 'react';
import { View } from 'react-native';
import styles from './grayWrapperStyles';
const GrayWrapper = ({ children }) => <View style={styles.wrapper}>{children}</View>;
const GrayWrapper = ({ children, isGray }) => (isGray ? <View style={styles.wrapper}>{children}</View> : children);
export default GrayWrapper;

2
src/components/basicUIElements/view/walletLineItem/walletLineItemStyles.js
View File

@ -55,6 +55,8 @@ export default EStyleSheet.create({
color: '$primaryBlue',
fontSize: 14,
fontWeight: '600',
maxWidth: '$deviceWidth / 2.5',
textAlign: 'center',
},
thinText: {
fontSize: 14,

39
src/components/basicUIElements/view/walletLineItem/walletLineItemView.js
View File

@ -1,24 +1,29 @@
import React from 'react';
import { View, Text } from 'react-native';
import { GrayWrapper } from '../..';
import IconComp from '../../../icon';
import { Icon } from '../../../icon';
import { CollapsibleCard } from '../../../collapsibleCard';
import styles from './walletLineItemStyles';
const WalletLineItem = ({
text,
textColor,
iconName,
iconType,
rightText,
rightTextColor,
isBoldText,
isThin,
isCircleIcon,
circleIconColor,
description,
fitContent,
iconName,
iconType,
isBlackText,
isBoldText,
isCircleIcon,
isThin,
rightText,
rightTextColor,
text,
textColor,
index,
}) => (
<GrayWrapper isGray={index % 2 === 0}>
<View style={[styles.container, fitContent && styles.fitContent]}>
<View style={styles.iconTextWrapper}>
{iconName && (
@ -29,15 +34,18 @@ const WalletLineItem = ({
circleIconColor && { backgroundColor: circleIconColor },
]}
>
<IconComp style={styles.icon} name={iconName} iconType={iconType} />
<Icon style={styles.icon} name={iconName} iconType={iconType} />
</View>
)}
<View>
{text && (
<View>
<Text
style={[
styles.text,
!iconName && styles.onlyText,
rightText && styles.longText,
isBlackText && styles.blackText,
textColor && { color: textColor },
isBoldText && { fontWeight: 'bold' },
isThin && styles.thinText,
@ -45,9 +53,14 @@ const WalletLineItem = ({
>
{text}
</Text>
{description && <Text style={styles.description}>{description}</Text>}
</View>
)}
{description && (
<Text style={[styles.description, !iconName && styles.onlyText]}>{description}</Text>
)}
</View>
</View>
{rightText && (
<View style={styles.rightTextWrapper}>
<Text
style={[
@ -58,7 +71,9 @@ const WalletLineItem = ({
{rightText}
</Text>
</View>
)}
</View>
</GrayWrapper>
);
export default WalletLineItem;

3
src/components/collapsibleCard/view/collapsibleCardView.js
View File

@ -70,6 +70,7 @@ class CollapsibleCardView extends Component {
fitContent,
isTitleCenter,
style,
noContainer,
} = this.props;
const { expanded } = this.state;
@ -96,7 +97,7 @@ class CollapsibleCardView extends Component {
style={[styles.content, { height: this.anime.height }]}
onLayout={e => this._initContentHeight(e)}
>
<View style={[!fitContent && styles.contentBody]}>{children}</View>
<View style={[!fitContent && !noContainer && styles.contentBody]}>{children}</View>
</Animated.View>
</View>
);

23
src/components/transaction/container/transactionContainer.js
View File

@ -1,20 +1,12 @@
import React, { Component } from 'react';
// import { connect } from 'react-redux';
// Services and Actions
// Middleware
// Constants
// Utilities
// Component
import { TransactionView } from '..';
/*
/**
* Props Name Description Value
*@props --> props name here description here Value Type Here
* @props --> intl Function for language support function
* @props --> walletData User wallet data object
*
*/
@ -29,15 +21,10 @@ class TransactionContainer extends Component {
// Component Functions
render() {
// eslint-disable-next-line
//const {} = this.props;
const { intl, walletData } = this.props;
return <TransactionView {...this.props} />;
return <TransactionView intl={intl} walletData={walletData} />;
}
}
// const mapStateToProps = state => ({
// user: state.user.user,
// });
export default TransactionContainer;

152
src/components/transaction/view/transactionView.js
View File

@ -1,15 +1,13 @@
import React, { Component } from 'react';
import { View } from 'react-native';
import React, { Component, Fragment } from 'react';
import { injectIntl } from 'react-intl';
// Utilities
import parseToken from '../../../utils/parseToken';
import parseDate from '../../../utils/parseDate';
import { vestsToSp } from '../../../utils/conversions';
import { getTransactionData } from '../../../utils/wallet';
// Components
import { FilterBar } from '../../filterBar';
import { GrayWrapper, WalletLineItem, Card } from '../../basicUIElements';
// import { FilterBar } from '../../filterBar';
import { WalletLineItem, Card } from '../../basicUIElements';
import { CollapsibleCard } from '../../collapsibleCard';
class TransactionView extends Component {
/* Props
@ -27,100 +25,16 @@ class TransactionView extends Component {
// Component Functions
_handleOnDropdownSelect = () => {};
_getTransactionData = (transaction) => {
const { walletData, intl: { formatNumber } } = this.props;
const result = {};
// eslint-disable-next-line
result.opName = transaction[1].op[0];
const opData = transaction[1].op[1];
const { timestamp } = transaction[1];
result.transDate = parseDate(timestamp);
result.icon = 'local-activity';
switch (result.opName) {
case 'curation_reward':
const { reward } = opData;
const { comment_author: commentAuthor, comment_permlink: commentPermlink } = opData;
result.value = `${formatNumber(vestsToSp(parseToken(reward), walletData.steemPerMVests), { minimumFractionDigits: 3 })} SP`;
result.details = `@${commentAuthor}/${commentPermlink}`;
break;
case 'author_reward':
case 'comment_benefactor_reward':
let {
sbd_payout: sbdPayout,
steem_payout: steemPayout,
vesting_payout: vestingPayout,
} = opData;
const { author, permlink } = opData;
sbdPayout = formatNumber(parseToken(sbdPayout), { minimumFractionDigits: 3 });
steemPayout = formatNumber(parseToken(steemPayout), { minimumFractionDigits: 3 });
vestingPayout = formatNumber(vestsToSp(parseToken(vestingPayout), walletData.steemPerMVests), { minimumFractionDigits: 3 });
result.value = `${sbdPayout > 0 ? `${sbdPayout} SBD` : ''} ${
steemPayout > 0 ? `${steemPayout} steemPayout` : ''
} ${vestingPayout > 0 ? `${vestingPayout} SP` : ''}`;
result.details = `@${author}/${permlink}`;
if (result.opName === 'comment_benefactor_reward') {
result.icon = 'comment';
}
break;
case 'claim_reward_balance':
let {
reward_sbd: rewardSdb,
reward_steem: rewardSteem,
reward_vests: rewardVests,
} = opData;
rewardSdb = formatNumber(parseToken(rewardSdb), { minimumFractionDigits: 3 });
rewardSteem = formatNumber(parseToken(rewardSteem), { minimumFractionDigits: 3 });
rewardVests = formatNumber(vestsToSp(parseToken(rewardVests), walletData.steemPerMVests), { minimumFractionDigits: 3 });
result.value = `${rewardSdb > 0 ? `${rewardSdb} SBD` : ''} ${
rewardSteem > 0 ? `${rewardSteem} STEEM` : ''
} ${rewardVests > 0 ? `${rewardVests} SP` : ''}`;
break;
case 'transfer':
case 'transfer_to_vesting':
const {
amount, memo, from, to,
} = opData;
result.value = `${amount}`;
result.icon = 'compare-arrows';
// details = <span>{memo} <br/><br/> <strong>@{from}</strong> -&gt; <strong>@{to}</strong></span>;
break;
case 'withdraw_vesting':
const { acc } = opData;
let { vesting_shares: opVestingShares } = opData;
opVestingShares = parseToken(opVestingShares);
result.value = `${formatNumber(vestsToSp(opVestingShares, walletData.steemPerMVests), { minimumFractionDigits: 3 })} SP`;
result.icon = 'money';
// details = <span><strong>@{acc}</strong></span>;
break;
case 'fill_order':
const { current_pays: currentPays, open_pays: openPays } = opData;
result.value = `${currentPays} = ${openPays}`;
result.icon = 'reorder';
break;
default:
break;
}
return result;
};
render() {
const { walletData: { transactions }, intl } = this.props;
const {
walletData: { transactions },
intl,
intl: { formatNumber },
walletData,
} = this.props;
return (
<View>
<Fragment>
{/* this feature not implemented yet */}
{/* <FilterBar
dropdownIconName="md-arrow-dropdown"
@ -129,14 +43,22 @@ class TransactionView extends Component {
onDropdownSelect={() => this._handleOnDropdownSelect()}
rightIconName="ios-lock"
iconSize={16}
if (index % 2 === 0) {
/> */}
<Card>
{transactions
&& transactions.map((item, index) => {
const transactionData = this._getTransactionData(item);
if (index % 2 === 0) {
const transactionData = getTransactionData(item, walletData, formatNumber);
return (
<CollapsibleCard
noBorder
noContainer
key={index}
titleComponent={(
<WalletLineItem
key={index}
index={index}
text={intl.formatMessage({
id: `wallet.${transactionData.opName}`,
})}
@ -144,35 +66,27 @@ class TransactionView extends Component {
isCircleIcon
isThin
circleIconColor="white"
textColor="#3c4449"
isBlackText
iconName={transactionData.icon}
iconType="MaterialIcons"
rightText={transactionData.value}
tightTextColor="red"
/>
);
}
return (
<GrayWrapper>
)}
>
{(!!transactionData.details || !!transactionData.memo) && (
<WalletLineItem
text={intl.formatMessage({
id: `wallet.${transactionData.opName}`,
})}
description={intl.formatRelative(transactionData.transDate)}
isCircleIcon
key={index}
text={!!transactionData.details && transactionData.details}
isBlackText
isThin
circleIconColor="white"
textColor="#3c4449"
iconName={transactionData.icon}
iconType="MaterialIcons"
rightText={transactionData.value}
tightTextColor="red"
description={!!transactionData.memo && transactionData.memo}
/>
</GrayWrapper>
)}
</CollapsibleCard>
);
})}
</Card>
</View>
</Fragment>
);
}
}

3
src/components/wallet/view/walletStyles.js
View File

@ -1,9 +1,6 @@
import EStyleSheet from 'react-native-extended-stylesheet';
export default EStyleSheet.create({
container: {
paddingBottom: 20,
},
// First collabsible component
mainButton: {
marginBottom: 12,

8
src/components/wallet/view/walletView.js
View File

@ -9,7 +9,7 @@ import { MainButton } from '../../mainButton';
import { CollapsibleCard } from '../../collapsibleCard';
import { WalletDetails } from '../../walletDetails';
import { Transaction } from '../../transaction';
import { WalletDetailsPlaceHolder, WalletUnclaimedPlaceHolder } from '../../basicUIElements';
import { WalletDetailsPlaceHolder } from '../../basicUIElements';
// Styles
import styles from './walletStyles';
@ -45,15 +45,13 @@ class WalletView extends Component {
render() {
const {
walletData, intl, selectedUsername, currentAccountUsername,
currentAccountUsername, intl, selectedUsername, walletData,
} = this.props;
return (
<View style={styles.container}>
<ScrollView style={styles.scrollView}>
{!walletData ? (
<Fragment>
<WalletUnclaimedPlaceHolder />
<WalletDetailsPlaceHolder />
</Fragment>
) : (
@ -66,7 +64,6 @@ class WalletView extends Component {
id: 'profile.unclaimed_rewards',
})}
expanded
style={{ marginBottom: 0 }}
>
{currentAccountUsername === selectedUsername ? (
<MainButton
@ -99,7 +96,6 @@ class WalletView extends Component {
</Fragment>
)}
</ScrollView>
</View>
);
}
}

22
src/components/walletDetails/container/walletDetailsContainer.js
View File

@ -1,20 +1,12 @@
import React, { Component } from 'react';
import { connect } from 'react-redux';
// Services and Actions
// Middleware
// Constants
// Utilities
// Component
import { WalletDetailsView } from '..';
/*
/**
* Props Name Description Value
*@props --> props name here description here Value Type Here
* @props --> intl Function for language support function
* @props --> walletData User wallet data object
*
*/
@ -29,14 +21,10 @@ class WalletContainer extends Component {
// Component Functions
render() {
// const {} = this.props;
const { intl, walletData } = this.props;
return <WalletDetailsView {...this.props} />;
return <WalletDetailsView intl={intl} walletData={walletData} />;
}
}
// const mapStateToProps = state => ({
// // user: state.user.user,
// });
export default WalletContainer;

3
src/components/walletDetails/view/walletDetailsStyles.js
View File

@ -4,4 +4,7 @@ export default EStyleSheet.create({
container: {
paddingBottom: 8,
},
blackText: {
color: '$primaryBlack',
},
});

14
src/components/walletDetails/view/walletDetailsView.js
View File

@ -34,7 +34,7 @@ class WalletDetailsView extends Component {
<View style={styles.container}>
<WalletLineItem
text="Steem"
textColor="#3c4449"
isBlackText
iconName="ios-information-circle-outline"
rightText={`${Math.round(walletData.balance * 1000) / 1000} STEEM`}
isBoldText
@ -44,7 +44,7 @@ class WalletDetailsView extends Component {
text={intl.formatMessage({
id: 'profile.steem_power',
})}
textColor="#3c4449"
isBlackText
iconName="ios-information-circle-outline"
rightText={`${Math.round(
vestsToSp(walletData.vestingShares, walletData.steemPerMVests) * 1000,
@ -80,7 +80,7 @@ class WalletDetailsView extends Component {
text={intl.formatMessage({
id: 'profile.steem_dollars',
})}
textColor="#3c4449"
isBlackText
iconName="ios-information-circle-outline"
rightText={`$${Math.round(walletData.sbdBalance * 1000) / 1000}`}
isBoldText
@ -90,7 +90,7 @@ class WalletDetailsView extends Component {
text={intl.formatMessage({
id: 'profile.savings',
})}
textColor="#3c4449"
isBlackText
iconName="ios-information-circle-outline"
rightText={`${Math.round(walletData.savingBalance * 1000) / 1000} STEEM`}
isBoldText
@ -99,7 +99,11 @@ class WalletDetailsView extends Component {
</GrayWrapper>
{walletData.showPowerDown && (
<WalletLineItem
text={`Next power down is in ${walletData.nextVestingWithdrawal} day`}
text={`${intl.formatMessage({
id: 'profile.next_power_text',
})} ${walletData.nextVestingWithdrawal} ${intl.formatMessage({
id: 'profile.day',
})}`}
textColor="#788187"
iconName="ios-information-circle-outline"
/>

1
src/config/locales/en-US.json
View File

@ -49,6 +49,7 @@
"steem_power": "Steem Power",
"next_power_text": "Next power down is in",
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
},

3
src/config/locales/tr-TR.json
View File

@ -48,7 +48,8 @@
"voting_power": "Oylama güçü",
"steem_power": "Steem Güçü",
"next_power_text": "İleriki güç",
"days": "days içinde düşecek",
"days": "gün içinde düşecek",
"day": "gün içinde düşecek",
"steem_dollars": "Steem Dolar",
"savings": "Biriktir"
},

2
src/screens/pinCode/container/pinCodeContainer.js
View File

@ -110,7 +110,7 @@ class PinCodeContainer extends Component {
};
setUserDataWithPinCode(pinData).then((response) => {
const _currentAccount = currentAccount;
_currentAccount.local = response[0];
_currentAccount.local = response;
dispatch(updateCurrentAccount({ ..._currentAccount }));

101
src/utils/wallet.js Normal file
View File

@ -0,0 +1,101 @@
import parseToken from './parseToken';
import parseDate from './parseDate';
import { vestsToSp } from './conversions';
export const getTransactionData = (transaction, walletData, formatNumber) => {
if (!transaction || !walletData) {
return [];
}
const result = {};
// eslint-disable-next-line
result.opName = transaction[1].op[0];
const opData = transaction[1].op[1];
const { timestamp } = transaction[1];
result.transDate = parseDate(timestamp);
result.icon = 'local-activity';
switch (result.opName) {
case 'curation_reward':
const { reward } = opData;
const { comment_author: commentAuthor, comment_permlink: commentPermlink } = opData;
result.value = `${formatNumber(vestsToSp(parseToken(reward), walletData.steemPerMVests), {
minimumFractionDigits: 3,
})} SP`;
result.details = `@${commentAuthor}/${commentPermlink}`;
break;
case 'author_reward':
case 'comment_benefactor_reward':
let {
sbd_payout: sbdPayout,
steem_payout: steemPayout,
vesting_payout: vestingPayout,
} = opData;
const { author, permlink } = opData;
sbdPayout = formatNumber(parseToken(sbdPayout), { minimumFractionDigits: 3 });
steemPayout = formatNumber(parseToken(steemPayout), { minimumFractionDigits: 3 });
vestingPayout = formatNumber(
vestsToSp(parseToken(vestingPayout), walletData.steemPerMVests),
{ minimumFractionDigits: 3 },
);
result.value = `${sbdPayout > 0 ? `${sbdPayout} SBD` : ''} ${
steemPayout > 0 ? `${steemPayout} steemPayout` : ''
} ${vestingPayout > 0 ? `${vestingPayout} SP` : ''}`;
result.details = `@${author}/${permlink}`;
if (result.opName === 'comment_benefactor_reward') {
result.icon = 'comment';
}
break;
case 'claim_reward_balance':
let { reward_sbd: rewardSdb, reward_steem: rewardSteem, reward_vests: rewardVests } = opData;
rewardSdb = formatNumber(parseToken(rewardSdb), { minimumFractionDigits: 3 });
rewardSteem = formatNumber(parseToken(rewardSteem), { minimumFractionDigits: 3 });
rewardVests = formatNumber(vestsToSp(parseToken(rewardVests), walletData.steemPerMVests), {
minimumFractionDigits: 3,
});
result.value = `${rewardSdb > 0 ? `${rewardSdb} SBD` : ''} ${
rewardSteem > 0 ? `${rewardSteem} STEEM` : ''
} ${rewardVests > 0 ? `${rewardVests} SP` : ''}`;
break;
case 'transfer':
case 'transfer_to_vesting':
const {
amount, memo, from, to,
} = opData;
result.value = `${amount}`;
result.icon = 'compare-arrows';
result.details = `@${from} to @${to}`;
result.memo = memo;
break;
case 'withdraw_vesting':
const { acc } = opData;
let { vesting_shares: opVestingShares } = opData;
opVestingShares = parseToken(opVestingShares);
result.value = `${formatNumber(vestsToSp(opVestingShares, walletData.steemPerMVests), {
minimumFractionDigits: 3,
})} SP`;
result.icon = 'money';
result.details = `@${acc}`;
break;
case 'fill_order':
const { current_pays: currentPays, open_pays: openPays } = opData;
result.value = `${currentPays} = ${openPays}`;
result.icon = 'reorder';
break;
default:
break;
}
return result;
};