Skip to content

Commit 73080ef

Browse files
authored
Merge pull request #143 from syscoin/feat/rollux-tokens-price
feat: rollux tokens price & faucet
2 parents f6696d8 + d0e8b7f commit 73080ef

File tree

27 files changed

+655
-139
lines changed

27 files changed

+655
-139
lines changed

app/app/actions/hint/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
export function toggleShowHint(hintText) {
1+
export function toggleShowHint(hintText, hintType = 'success') {
22
return {
33
type: 'SHOW_HINT',
4-
hintText
4+
hintText,
5+
hintType
56
};
67
}
78

app/app/components/Main/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ const Main = props => {
726726
</Modal>
727727
);
728728

729-
const renderHintView = () => props.showHintView && <HintView hintText={props.hintText} />;
729+
const renderHintView = () => props.showHintView && <HintView hintText={props.hintText} hintType={props.hintType} />;
730730

731731
const showUpdateModalIfNeeded = async () => {
732732
const latestVersionCode = props.updateConfig?.latest_version_code
@@ -1426,6 +1426,7 @@ Main.propTypes = {
14261426
hideWalletConnectIcon: PropTypes.func,
14271427
showHintView: PropTypes.bool,
14281428
hintText: PropTypes.string,
1429+
hintType: PropTypes.string,
14291430
// eslint-disable-next-line react/no-unused-prop-types
14301431
ongoingTransactionsModalVisible: PropTypes.bool,
14311432
toggleOngoingTransactionsModal: PropTypes.func,
@@ -1446,6 +1447,7 @@ const mapStateToProps = state => ({
14461447
bscNetworkModalVisible: state.modals.bscNetworkModalVisible,
14471448
showHintView: state.hint.showHint,
14481449
hintText: state.hint.hintText,
1450+
hintType: state.hint.hintType,
14491451
ongoingTransactionsModalVisible: state.modals.ongoingTransactionsModalVisible,
14501452
updateConfig: state.settings.updateConfig,
14511453
isLockScreen: state.settings.isLockScreen

app/app/components/UI/AssetOverview/index.js

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ class AssetOverview extends PureComponent {
300300
<View style={styles.originLogo}>{this.renderLogo()}</View>
301301
<View style={styles.symbolBase}>
302302
<View style={styles.symbol}>
303-
<Text style={[styles.symbolText, isDarkMode && baseStyles.textDark]} numberOfLines={1}>
303+
<Text style={[styles.symbolText, baseStyles.textDark]} numberOfLines={1}>
304304
{symbol}
305305
</Text>
306306
{address && (
@@ -318,7 +318,7 @@ class AssetOverview extends PureComponent {
318318
</View>
319319

320320
<View style={styles.assetTrans}>
321-
<Text style={[styles.assetTransTotal, isDarkMode && baseStyles.textDark]}>
321+
<Text style={[styles.assetTransTotal, baseStyles.textDark]}>
322322
{amountSymbol}
323323
{renderAmount(price && price > 10000 ? new BigNumber(price).toFixed(2) : price)}
324324
</Text>
@@ -352,17 +352,13 @@ class AssetOverview extends PureComponent {
352352
</View>
353353
</View>
354354
</View>
355-
<Text style={[styles.balanceTitle, isDarkMode && baseStyles.subTextDark]}>
355+
<Text style={[styles.balanceTitle, baseStyles.subTextDark]}>
356356
{strings('watch_asset_request.balance')}
357357
</Text>
358-
<Text style={[styles.balance, isDarkMode && baseStyles.textDark]}>
359-
{hideAmount ? '***' : renderAmount(balance)}
360-
</Text>
361-
<Text style={[styles.networthTitle, isDarkMode && baseStyles.subTextDark]}>
362-
{strings('other.networth')}
363-
</Text>
358+
<Text style={[styles.balance, baseStyles.textDark]}>{hideAmount ? '***' : renderAmount(balance)}</Text>
359+
<Text style={[styles.networthTitle, baseStyles.subTextDark]}>{strings('other.networth')}</Text>
364360
<View style={styles.networkWrapper}>
365-
<Text style={[styles.balance, isDarkMode && baseStyles.textDark]}>
361+
<Text style={[styles.balance, baseStyles.textDark]}>
366362
{hideAmount ? '***' : renderAmount(secondaryBalance)}
367363
</Text>
368364
{!asset.lockType && (

0 commit comments

Comments
 (0)