Merge github.com:esteemapp/esteem-mobile into feature/share

This commit is contained in:
Mustafa Buyukcelebi 2020-07-26 23:46:51 +03:00
commit 3fdf1da30a
4 changed files with 18 additions and 2 deletions

View File

@ -58,6 +58,12 @@
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" android:host="peakd.com" /> <data android:scheme="https" android:host="peakd.com" />
</intent-filter> </intent-filter>
<intent-filter android:label="Ecency">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" android:host="leofinance.io" />
</intent-filter>
</activity> </activity>
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" /> <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
<meta-data <meta-data

View File

@ -84,6 +84,15 @@ const SideMenuView = ({
const { buildVersion, appVersion } = VersionNumber; const { buildVersion, appVersion } = VersionNumber;
if (currentAccount.display_name && currentAccount.display_name.length > 8) {
currentAccount.display_name = currentAccount.display_name.slice(0, 8);
}
let _username = currentAccount.name;
if (currentAccount.name && currentAccount.name.length > 8) {
_username = currentAccount.name.slice(0, 8);
}
return ( return (
<View style={styles.container}> <View style={styles.container}>
<LinearGradient <LinearGradient
@ -102,7 +111,7 @@ const SideMenuView = ({
{currentAccount.display_name} {currentAccount.display_name}
</Text> </Text>
)} )}
<Text style={styles.usernick}>{`@${currentAccount.name}`}</Text> <Text style={styles.usernick}>{`@${_username}`}</Text>
</View> </View>
<View style={styles.userInfoWrapper}> <View style={styles.userInfoWrapper}>

View File

@ -16,7 +16,7 @@ import globalStyles from '../../globalStyles';
const TransactionView = ({ transactions, type, refreshing, setRefreshing, isLoading }) => { const TransactionView = ({ transactions, type, refreshing, setRefreshing, isLoading }) => {
const intl = useIntl(); const intl = useIntl();
const transaction_types = ['ESTM', 'HIVE', 'HBD', 'HP']; const transaction_types = ['Points', 'HIVE', 'HBD', 'HP'];
const _renderLoading = () => { const _renderLoading = () => {
if (isLoading) { if (isLoading) {

View File

@ -79,6 +79,7 @@ export default (url) => {
'https://esteem.app', 'https://esteem.app',
'https://hive.blog', 'https://hive.blog',
'https://peakd.com', 'https://peakd.com',
'https://leofinance.io',
].some((x) => url.startsWith(x)) ].some((x) => url.startsWith(x))
) { ) {
return parseCatAuthorPermlink(url); return parseCatAuthorPermlink(url);