Merge branch 'development' of github.com:esteemapp/esteem-mobile into refactor/components-str

This commit is contained in:
Mustafa Buyukcelebi 2019-09-25 11:26:46 +03:00
commit 341f4dd7f3
90 changed files with 648 additions and 217 deletions

View File

@ -114,7 +114,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch
versionName "2.2.1"
versionName "2.2.2"
vectorDrawables.useSupportLibrary = true
resValue "string", "build_config_package", "app.esteem.mobile.android"
}

View File

@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.2.1</string>
<string>2.2.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>6</string>
<string>7</string>
<key>LSRequiresIPhoneOS</key>
<true />
<key>UILaunchStoryboardName</key>

View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>2.2.1</string>
<string>2.2.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>6</string>
<string>7</string>
</dict>
</plist>

View File

@ -1965,7 +1965,7 @@
CODE_SIGN_ENTITLEMENTS = eSteem/eSteem.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = 75B6RXTKGT;
GCC_NO_COMMON_BLOCKS = NO;
@ -2008,7 +2008,7 @@
CODE_SIGN_ENTITLEMENTS = eSteem/eSteem.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = 75B6RXTKGT;
GCC_NO_COMMON_BLOCKS = NO;
HEADER_SEARCH_PATHS = (

View File

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.2.1</string>
<string>2.2.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@ -31,7 +31,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1672</string>
<string>1674</string>
<key>CodePushDeploymentKey</key>
<string>13ThFZsgwk6UZp6mIe95IDbnfw8iHy1jfsn-E</string>
<key>LSRequiresIPhoneOS</key>

View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>2.2.1</string>
<string>2.2.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>6</string>
<string>7</string>
</dict>
</plist>

View File

@ -1,6 +1,6 @@
{
"name": "eSteem",
"version": "2.2.1",
"version": "2.2.2",
"private": true,
"rnpm": {
"assets": [

View File

@ -1,6 +1,6 @@
import React from 'react';
import { withNavigation } from 'react-navigation';
import { View, Text } from 'react-native';
import { View, Text, SafeAreaView } from 'react-native';
import LinearGradient from 'react-native-linear-gradient';
import { UserAvatar } from '../userAvatar';
@ -23,36 +23,38 @@ const AvatarHeader = ({
colors={['#357ce6', '#2d5aa0']}
style={styles.headerView}
>
<View style={styles.headerContainer}>
<IconButton
iconStyle={styles.backIcon}
iconType="MaterialIcons"
name="arrow-back"
onPress={navigation.goBack}
size={25}
/>
<View style={styles.wrapper}>
<UserAvatar
key={avatarUrl || username}
noAction
size="xl"
username={username}
avatarUrl={avatarUrl}
/>
<SafeAreaView>
<View style={styles.headerContainer}>
<IconButton
iconStyle={styles.addIcon}
style={styles.addButton}
iconType="MaterialCommunityIcons"
name="plus"
onPress={showImageUploadActions}
size={15}
iconStyle={styles.backIcon}
iconType="MaterialIcons"
name="arrow-back"
onPress={navigation.goBack}
size={25}
/>
<View style={styles.textWrapper}>
{!!name && <Text style={styles.name}>{name}</Text>}
<Text style={styles.username}>{`@${username} (${reputation})`}</Text>
<View style={styles.wrapper}>
<UserAvatar
key={avatarUrl || username}
noAction
size="xl"
username={username}
avatarUrl={avatarUrl}
/>
<IconButton
iconStyle={styles.addIcon}
style={styles.addButton}
iconType="MaterialCommunityIcons"
name="plus"
onPress={showImageUploadActions}
size={15}
/>
<View style={styles.textWrapper}>
{!!name && <Text style={styles.name}>{name}</Text>}
<Text style={styles.username}>{`@${username} (${reputation})`}</Text>
</View>
</View>
</View>
</View>
</SafeAreaView>
</LinearGradient>
);

View File

@ -199,7 +199,7 @@ class CommentsContainer extends Component {
const { dispatch, intl, navigation, isOwnProfile } = this.props;
if (index === 0) {
writeToClipboard(`https://steemit.com${get(selectedComment, 'url')}`).then(() => {
writeToClipboard(`https://esteem.app${get(selectedComment, 'url')}`).then(() => {
dispatch(
toastNotification(
intl.formatMessage({

View File

@ -63,9 +63,9 @@ export default class MarkdownEditorView extends Component {
componentDidUpdate(prevProps, prevState) {
const { text } = this.state;
const { isFormValid, handleIsFormValid } = this.props;
const { handleIsFormValid } = this.props;
if (prevState.text !== text && !isFormValid) {
if (prevState.text !== text) {
const nextText = text.replace(prevState.text, '');
if (nextText && nextText.length > 0) {
@ -81,14 +81,6 @@ export default class MarkdownEditorView extends Component {
// Component functions
_changeText = input => {
const { onChange, handleOnTextChange, handleIsValid, componentID } = this.props;
const { textUpdated } = this.state;
if (textUpdated) {
this.setState({
textUpdated: false,
});
return;
}
this.setState({ text: input });

View File

@ -93,9 +93,9 @@ class ProfileSummaryView extends PureComponent {
const location = get(about, 'location', '');
const ABOUT_DATA = [
{ text: date, icon: 'calendar' },
{ text: link, icon: 'earth', onPress: () => this._handleOnPressLink(link) },
{ text: location, icon: 'near-me' },
{ id: 1, text: date, icon: 'calendar' },
{ id: 2, text: link, icon: 'earth', onPress: () => this._handleOnPressLink(link) },
{ id: 3, text: location, icon: 'near-me' },
];
const rowLength =
@ -115,6 +115,7 @@ class ProfileSummaryView extends PureComponent {
<TextWithIcon
isClickable={get(item, 'onPress')}
onPress={get(item, 'onPress')}
key={get(item, 'id')}
text={item.text}
iconSize={14}
iconName={item.icon}

View File

@ -97,7 +97,13 @@
"days": "uroë-uroë",
"day": "uroë",
"steem_dollars": "Steem Dollars",
"savings": "Keunëubah"
"savings": "Keunëubah",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Peungaturan",

View File

@ -97,7 +97,13 @@
"days": "أيام",
"day": "يوم",
"steem_dollars": "ستيم دولار",
"savings": "مدخرات"
"savings": "مدخرات",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "إعدادات",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "gün",
"day": "gün",
"steem_dollars": "Steem Dollar",
"savings": "Yığımlar"
"savings": "Yığımlar",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Tənzimləmələr",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "Tagen",
"day": "Tag",
"steem_dollars": "Steem-Dollar",
"savings": "Gesichert"
"savings": "Gesichert",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Einstellungen",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "días",
"day": "día",
"steem_dollars": "Steem Dólares",
"savings": "Ahorros"
"savings": "Ahorros",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Ajustes",

View File

@ -97,7 +97,13 @@
"days": "päeva",
"day": "päev",
"steem_dollars": "Steem Dollar",
"savings": "Säästud"
"savings": "Säästud",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Seaded",

View File

@ -97,7 +97,13 @@
"days": "روزها",
"day": "روز",
"steem_dollars": "دلار استیم",
"savings": "پس انداز"
"savings": "پس انداز",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "تنظیمات",

View File

@ -97,7 +97,13 @@
"days": "päivää",
"day": "päivä",
"steem_dollars": "Steem dollarit",
"savings": "Säästöt"
"savings": "Säästöt",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Asetukset",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "jours",
"day": "jour",
"steem_dollars": "Steem Dollars",
"savings": "Économies"
"savings": "Économies",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Réglages",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "dagos",
"day": "dags",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Lageinos",

View File

@ -97,7 +97,13 @@
"days": "ימים",
"day": "יום",
"steem_dollars": "דולר Steem",
"savings": "חסכונות"
"savings": "חסכונות",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "הגדרות",

View File

@ -97,7 +97,13 @@
"days": "दिनों",
"day": "दिन",
"steem_dollars": "स्टीम डॉलर्स",
"savings": "बचत"
"savings": "बचत",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "समायोजन",

View File

@ -97,7 +97,13 @@
"days": "dani",
"day": "dan",
"steem_dollars": "Steem Dolari",
"savings": "Štednja"
"savings": "Štednja",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Postavke",

View File

@ -55,7 +55,7 @@
"vote_title": "Szavazási pontok",
"reblog_title": "Megosztási pontok",
"login_title": "Bejelentkezés pontok",
"checkin_title": "Points for heartbeat",
"checkin_title": "Életjel pontok",
"checkin_extra_title": "Használati bónusz",
"no_activity": "Itt nincs tevékenység!",
"outgoing_transfer_description": "",
@ -97,7 +97,13 @@
"days": "napok",
"day": "nap",
"steem_dollars": "Steem Dollár",
"savings": "Megtakarítások"
"savings": "Megtakarítások",
"edit": {
"display_name": "Megjelenítendő név",
"about": "Rólunk",
"location": "Tartózkodási hely",
"website": "Weboldal"
}
},
"settings": {
"settings": "Beállítások",
@ -223,7 +229,7 @@
"connection_fail": "Sikertelen kapcsolat!",
"connection_success": "A kapcsolat sikerült!",
"checking": "Ellenőrzés...",
"not_existing_post": "The post does not exist! Please check permlink and author."
"not_existing_post": "A bejegyzés nem létezik! Kérjük ellenőrizd a linket és a szerzőt."
},
"post": {
"reblog_alert": "Biztos, hogy megosztod?",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "hari",
"day": "hari",
"steem_dollars": "Steem Dollars",
"savings": "Tabungan"
"savings": "Tabungan",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Pengaturan",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "giorni",
"day": "giorno",
"steem_dollars": "Steem Dollars",
"savings": "Risparmi"
"savings": "Risparmi",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Impostazioni",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "일",
"day": "일",
"steem_dollars": "스팀 달러",
"savings": "안전 금고"
"savings": "안전 금고",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "설정",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "d.",
"day": "d.",
"steem_dollars": "Steem Dollars",
"savings": "Santaupos"
"savings": "Santaupos",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Nustatymai",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "hari",
"day": "hari",
"steem_dollars": "Steem Dollars",
"savings": "Simpanan"
"savings": "Simpanan",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Tetapan",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "dagen",
"day": "dag",
"steem_dollars": "Steem Dollars",
"savings": "Spaarrekening"
"savings": "Spaarrekening",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Instellingen",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "dias",
"day": "dia",
"steem_dollars": "Steem Dólares",
"savings": "Poupanças"
"savings": "Poupanças",
"edit": {
"display_name": "Nome a Exibir",
"about": "Sobre",
"location": "Localização",
"website": "Website"
}
},
"settings": {
"settings": "Configurações",

View File

@ -97,7 +97,13 @@
"days": "zile",
"day": "zi",
"steem_dollars": "Steem Dolari",
"savings": "Economii"
"savings": "Economii",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Setări",

View File

@ -97,7 +97,13 @@
"days": "д",
"day": "д",
"steem_dollars": "Доллары Steem",
"savings": "Сейф"
"savings": "Сейф",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Настройки",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "dana",
"day": "dan",
"steem_dollars": "Steem dolari",
"savings": "Ušteđevina"
"savings": "Ušteđevina",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Podešavanja",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "gün içinde düşecek",
"day": "gün içinde düşecek",
"steem_dollars": "Steem Dolar",
"savings": "Biriktir"
"savings": "Biriktir",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Ayarlar",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "days",
"day": "day",
"steem_dollars": "Steem Dollars",
"savings": "Savings"
"savings": "Savings",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Settings",

View File

@ -97,7 +97,13 @@
"days": "ngày",
"day": "ngày",
"steem_dollars": "Steem Dollars",
"savings": "Tiết kiệm"
"savings": "Tiết kiệm",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Cài đặt",

View File

@ -97,7 +97,13 @@
"days": "awon ojo",
"day": "ojo",
"steem_dollars": "Dollar ti steem",
"savings": "Ipamo"
"savings": "Ipamo",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "Eto",

View File

@ -97,7 +97,13 @@
"days": "天",
"day": "天",
"steem_dollars": "Steem Dollars",
"savings": "储蓄"
"savings": "储蓄",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "设置",

View File

@ -97,7 +97,13 @@
"days": "天",
"day": "天",
"steem_dollars": "Steem Dollars",
"savings": "儲蓄"
"savings": "儲蓄",
"edit": {
"display_name": "Display Name",
"about": "About",
"location": "Location",
"website": "Website"
}
},
"settings": {
"settings": "設定",

View File

@ -90,7 +90,7 @@ export const prepareBeneficiaries = post => {
beneficiaries: [
{
account: 'esteemapp',
weight: 1000, // 10%
weight: 300, // 3%
},
],
},

View File

@ -3,6 +3,7 @@ import { Alert, Linking, Platform } from 'react-native';
import { connect } from 'react-redux';
import { injectIntl } from 'react-intl';
import AppCenter from 'appcenter';
import Config from 'react-native-config';
// Services and Actions
import { login } from '../../../providers/steem/auth';
@ -13,9 +14,14 @@ import {
addOtherAccount,
updateCurrentAccount,
} from '../../../redux/actions/accountAction';
import { login as loginAction, openPinCodeModal } from '../../../redux/actions/applicationActions';
import {
login as loginAction,
openPinCodeModal,
setPinCode,
} from '../../../redux/actions/applicationActions';
import { setPushTokenSaved } from '../../../realm/realm';
import { setPushToken } from '../../../providers/esteem/esteem';
import { encryptKey } from '../../../utils/crypto';
// Middleware
@ -62,6 +68,8 @@ class LoginContainer extends PureComponent {
if (isPinCodeOpen) {
dispatch(openPinCodeModal({ navigateTo: ROUTES.DRAWER.MAIN }));
} else {
const encryptedPin = encryptKey(Config.DEFAULT_PIN, Config.PIN_KEY);
dispatch(setPinCode(encryptedPin));
navigation.navigate({
routeName: ROUTES.DRAWER.MAIN,
});

View File

@ -1,90 +1,80 @@
import React, { PureComponent } from 'react';
import { injectIntl } from 'react-intl';
import React from 'react';
import { Profile } from '../../../components';
import { ProfileContainer } from '../../../containers';
class ProfileScreen extends PureComponent {
constructor(props) {
super(props);
this.state = {};
}
const ProfileScreen = () => (
<ProfileContainer>
{({
about,
activePage,
avatar,
changeForceLoadPostState,
comments,
currency,
currencyRate,
currencySymbol,
error,
follows,
forceLoadPost,
getReplies,
handleFollowUnfollowUser,
handleMuteUnmuteUser,
handleOnBackPress,
handleOnFavoritePress,
handleOnFollowsPress,
handleOnPressProfileEdit,
isDarkTheme,
isFavorite,
isFollowing,
isLoggedIn,
isMuted,
isOwnProfile,
isProfileLoading,
isReady,
quickProfile,
resourceCredits,
selectedUser,
setEstimatedWalletValue,
username,
votingPower,
}) => (
<Profile
about={about}
activePage={activePage}
avatar={avatar}
changeForceLoadPostState={changeForceLoadPostState}
comments={comments}
currency={currency}
currencyRate={currencyRate}
currencySymbol={currencySymbol}
error={error}
follows={follows}
forceLoadPost={forceLoadPost}
getReplies={getReplies}
handleFollowUnfollowUser={handleFollowUnfollowUser}
handleMuteUnmuteUser={handleMuteUnmuteUser}
handleOnBackPress={handleOnBackPress}
handleOnFavoritePress={handleOnFavoritePress}
handleOnFollowsPress={handleOnFollowsPress}
handleOnPressProfileEdit={handleOnPressProfileEdit}
isDarkTheme={isDarkTheme}
isFavorite={isFavorite}
isFollowing={isFollowing}
isLoggedIn={isLoggedIn}
isMuted={isMuted}
isOwnProfile={isOwnProfile}
isProfileLoading={isProfileLoading}
isReady={isReady}
quickProfile={quickProfile}
resourceCredits={resourceCredits}
selectedUser={selectedUser}
setEstimatedWalletValue={setEstimatedWalletValue}
username={username}
votingPower={votingPower}
/>
)}
</ProfileContainer>
);
render() {
return (
<ProfileContainer>
{({
about,
activePage,
avatar,
changeForceLoadPostState,
comments,
currency,
currencyRate,
currencySymbol,
error,
follows,
forceLoadPost,
getReplies,
handleFollowUnfollowUser,
handleMuteUnmuteUser,
handleOnBackPress,
handleOnFavoritePress,
handleOnFollowsPress,
handleOnPressProfileEdit,
isDarkTheme,
isFavorite,
isFollowing,
isLoggedIn,
isMuted,
isOwnProfile,
isProfileLoading,
isReady,
quickProfile,
resourceCredits,
selectedUser,
setEstimatedWalletValue,
username,
votingPower,
}) => (
<Profile
about={about}
activePage={activePage}
avatar={avatar}
changeForceLoadPostState={changeForceLoadPostState}
comments={comments}
currency={currency}
currencyRate={currencyRate}
currencySymbol={currencySymbol}
error={error}
follows={follows}
forceLoadPost={forceLoadPost}
getReplies={getReplies}
handleFollowUnfollowUser={handleFollowUnfollowUser}
handleMuteUnmuteUser={handleMuteUnmuteUser}
handleOnBackPress={handleOnBackPress}
handleOnFavoritePress={handleOnFavoritePress}
handleOnFollowsPress={handleOnFollowsPress}
handleOnPressProfileEdit={handleOnPressProfileEdit}
isDarkTheme={isDarkTheme}
isFavorite={isFavorite}
isFollowing={isFollowing}
isLoggedIn={isLoggedIn}
isMuted={isMuted}
isOwnProfile={isOwnProfile}
isProfileLoading={isProfileLoading}
isReady={isReady}
quickProfile={quickProfile}
resourceCredits={resourceCredits}
selectedUser={selectedUser}
setEstimatedWalletValue={setEstimatedWalletValue}
username={username}
votingPower={votingPower}
/>
)}
</ProfileContainer>
);
}
}
export default injectIntl(ProfileScreen);
export default ProfileScreen;

View File

@ -65,7 +65,7 @@ export const makeOptions = (author, permlink, operationType) => {
permlink,
max_accepted_payout: '1000000.000 SBD',
percent_steem_dollars: 10000,
extensions: [[0, { beneficiaries: [{ account: 'esteemapp', weight: 1000 }] }]],
extensions: [[0, { beneficiaries: [{ account: 'esteemapp', weight: 300 }] }]],
};
switch (operationType) {

View File

@ -1,5 +1,5 @@
export const getPostUrl = url => {
const BASE_URL = 'https://steemit.com';
const BASE_URL = 'https://esteem.app';
return BASE_URL + url;
};