Merge pull request #141 from syscoin/dev

Dev

Author: ThalesBMC

app/android/app/build.gradle

@@ -52,8 +52,8 @@ android {
 		applicationId "io.paliwallet"
 		minSdkVersion rootProject.ext.minSdkVersion
 		targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 32
-		versionName "1.2.0"
+		versionCode 33
+		versionName "1.2.1"
 		multiDexEnabled true
 		missingDimensionStrategy "minReactNative", "minReactNative46"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/app/components/UI/AssetView/index.js

@@ -20,6 +20,7 @@ import {
 	getChainIdByType,
 	onlyAddCurrencySymbol,
 	renderCoinValue,
+	appendTickerSuffix,
 	extractTicker
 } from '../../../util/number';
 import { WebView } from 'react-native-webview';
@@ -52,6 +53,7 @@ import { toggleShowHint } from '../../../actions/hint';
 import HTMLView from 'react-native-htmlview';
 import ImageCapInset from '../ImageCapInset';
 import rolluxIntro from '../../../util/rolluxIntro';
+import { now } from 'lodash';
 
 //const chart = createChart(document.getElementById("chart1"));
 
@@ -267,6 +269,7 @@ class AssetView extends PureComponent {
 		},
 		ticker: null,
 		tvHtmlContent: null,
+		hideChart: false,
 		xAxis: {},
 		yAxis: {},
 		timeArray: [],
@@ -329,6 +332,7 @@ class AssetView extends PureComponent {
 	updateCoinGeckoData = (queryId, datas) => {
 		if (!datas || datas.length <= 0) {
 			console.info("CoinGecko doesn't have " + queryId + ' OHLC.');
+			this.setState({ hideChart: true });
 			return;
 		}
 		datas = datas.map(info => ({
@@ -385,6 +389,7 @@ class AssetView extends PureComponent {
 				}
 			}
 		});
+		this.setState({ hideChart: false });
 		console.info('CoinGecko OHLC ' + queryId + ' fetched.');
 	};
 
@@ -405,16 +410,38 @@ class AssetView extends PureComponent {
 		const { asset } = this.props;
 		const { TokenRatesController } = Engine.context;
 		const { ticker, load } = await TokenRatesController.getTvSymbol(asset.symbol);
+
 		if (ticker) {
 			const newTicker = extractTicker(ticker);
 			this.setState({ ticker: newTicker });
 			return true;
 		} else if (load) {
-			const nowTicker = await TokenRatesController.loadTvSymbol(asset.symbol);
-			const extractedTicker = extractTicker(nowTicker);
+			let nowTicker;
+			try {
+				const response = await fetch(`https://www.tradingview.com/symbols/${asset.symbol}USDT/`, {
+					method: 'HEAD'
+				});
+				if (response.status === 200) {
+					console.log('Successful fetch for TradingView symbol.', asset.symbol);
+					nowTicker = asset.symbol;
+				} else if (response.status === 404) {
+					console.log('TradingView symbol fetch resulted in 404 error.');
+					return false;
+				} else {
+					console.log(`Unhandled response status: ${response.status}`);
+					return false;
+				}
+			} catch (error) {
+				console.error('Error fetching TradingView symbol:', error);
+				return false;
+			}
+
 			if (nowTicker) {
+				const extractedTicker = appendTickerSuffix(nowTicker);
+
 				this.setState({ ticker: extractedTicker });
 			}
+
 			return !!nowTicker;
 		}
 		return false;
@@ -739,11 +766,11 @@ class AssetView extends PureComponent {
 	};
 
 	renderAsset = () => {
-		const { timeArray, data, coinGeckoId, ticker, tvHtmlContent } = this.state;
+		const { timeArray, data, coinGeckoId, ticker, tvHtmlContent, hideChart } = this.state;
 		const { isDarkMode } = this.context;
 		return (
 			<>
-				{(!!coinGeckoId || !!ticker) && (
+				{!hideChart && (!!coinGeckoId || !!ticker) && (
 					<ImageCapInset
 						style={[styles.cardWrapper, styles.bodyMargin]}
 						source={

app/app/components/UI/SecurityView/SecurityTop.js

@@ -50,6 +50,7 @@ const styles = StyleSheet.create({
 	},
 	btnText: {
 		fontSize: 16,
+		color: colors.$514570,
 		...fontStyles.bold
 	},
 	animation: {

app/app/components/UI/TxItem/index.js

@@ -133,15 +133,18 @@ const TxItemHeader = ({ style, ...props }) => (
 	</View>
 );
 // eslint-disable-next-line react/prop-types
-const TxItemHeaderAndSymbol = ({ style, ...props }) => (
-	<View style={[styles.header2, style]}>
-		<TxItemAmount2 {...props} />
-		{/* eslint-disable-next-line react/prop-types */}
-		{props.symbol && <Text style={styles.symbol}>{props.symbol}</Text>}
-		<View style={baseStyles.flexGrow} />
-		<TxItemStatus {...props} />
-	</View>
-);
+const TxItemHeaderAndSymbol = ({ style, ...props }) => {
+	const { isDarkMode } = useTheme();
+	return (
+		<View style={[styles.header2, style]}>
+			<TxItemAmount2 {...props} />
+			{/* eslint-disable-next-line react/prop-types */}
+			{props.symbol && <Text style={[styles.symbol, isDarkMode && baseStyles.textDark]}>{props.symbol}</Text>}
+			<View style={baseStyles.flexGrow} />
+			<TxItemStatus {...props} />
+		</View>
+	);
+};
 const TxItemAmount = ({ style, ...props }) => {
 	const { isToken, tx, selectedAddress, decimalValue, isETHClaim, gasValue } = props;
 	const incoming = isETHClaim || safeToChecksumAddress(isToken ? tx.to : tx.transaction.to) === selectedAddress;
@@ -293,14 +296,17 @@ TxItemStatus.propTypes = {
 const TxItemDateTime = ({ style, ...props }) => <Text style={[styles.datetime, style]} {...props} />;
 
 const TxItemTo = ({ style, ...props }) => {
+	const { isDarkMode } = useTheme();
 	const onPress = () => {
 		Clipboard.setString(props.originAddr);
 		props.showAlert();
 	};
 
 	return (
 		<TouchableOpacity onPress={onPress} activeOpacity={activeOpacity} hitSlop={styles.hitSlop}>
-			<Text style={styles.dirTitle}>{props.title || strings('other.to_to')}</Text>
+			<Text style={[styles.dirTitle, isDarkMode && baseStyles.textDark]}>
+				{props.title || strings('other.to_to')}
+			</Text>
 			<View style={styles.txTo}>
 				<Text style={[styles.to, style]} {...props}>
 					{props.toAddr}
@@ -317,13 +323,16 @@ TxItemTo.propTypes = {
 	title: PropTypes.string
 };
 const TxItemHash = ({ style, ...props }) => {
+	const { isDarkMode } = useTheme();
 	const onPress = () => {
 		props.navToBrowser();
 	};
 
 	return (
 		<TouchableOpacity onPress={onPress} activeOpacity={activeOpacity} hitSlop={styles.hitSlop}>
-			<Text style={styles.dirTitle}>{strings('other.transaction_hash')}</Text>
+			<Text style={[styles.dirTitle, isDarkMode && baseStyles.textDark]}>
+				{strings('other.transaction_hash')}
+			</Text>
 			<View style={styles.txHash}>
 				<Text style={[styles.hash, style]} {...props}>
 					{props.txHash}

app/app/components/Views/DeveloperOptions/index.js

@@ -163,7 +163,17 @@ class DeveloperOptions extends PureComponent {
 			ChainType.Bsc,
 			ChainType.Polygon,
 			ChainType.Optimism,
-			ChainType.Avax
+			ChainType.Avax,
+			ChainType.Base,
+			ChainType.Blast,
+			ChainType.Fantom,
+			ChainType.Mantle,
+			ChainType.Aurora,
+			ChainType.Manta,
+			ChainType.Era,
+			ChainType.Gnosis,
+			ChainType.Linea,
+			ChainType.Scroll
 		];
 
 		for (const type of chainOrder) {

app/app/components/Views/Onboarding/index.js

@@ -101,8 +101,8 @@ const styles = StyleSheet.create({
 	footerLogo: {
 		marginTop: 6,
 		marginBottom: 23,
-		width: 270,
-		height: 25
+		width: 312,
+		height: 84
 	},
 	importKeyWrapper: {
 		borderRadius: 10,

app/app/components/Views/Wallet/index.js

@@ -531,8 +531,10 @@ class Wallet extends PureComponent {
 						onSnapToItem={index => {
 							this.firstItem = index;
 							this.setSelectedAddress(contactEntrys[index].address);
-							ReactNativeHapticFeedback.trigger('impactMedium', options);
+							ReactNativeHapticFeedback.trigger('impactLight', options);
 						}}
+						decelerationRate={Device.isAndroid() ? 0.7 : undefined}
+						enableMomentum={Device.isAndroid() ? false : undefined}
 						scrollEnabled={!chainEditing && !searchEditing}
 					/>
 				</View>