Merge branch 'master' of https://github.com/esteemapp/esteem-mobile

ecency · May 8, 2019 · 1752da7 · 1752da7
2 parents 97c2220 + 2d12276
commit 1752da7
Show file tree

Hide file tree

Showing 86 changed files with 181 additions and 94 deletions.
diff --git a/ios/Pods/Pods.xcodeproj/xcuserdata/mistik.xcuserdatad/xcschemes/xcschememanagement.plist b/ios/Pods/Pods.xcodeproj/xcuserdata/mistik.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/ios/eSteem.xcworkspace/xcuserdata/mistik.xcuserdatad/UserInterfaceState.xcuserstate b/ios/eSteem.xcworkspace/xcuserdata/mistik.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ios/eSteem/Info.plist b/ios/eSteem/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.9</string>
+	<string>2.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>778</string>
+	<string>779</string>
 	<key>CodePushDeploymentKey</key>
 	<string>13ThFZsgwk6UZp6mIe95IDbnfw8iHy1jfsn-E</string>
 	<key>LSRequiresIPhoneOS</key>
@@ -57,7 +57,7 @@
 	<key>NSCameraUsageDescription</key>
 	<string>To access your photos, eSteem needs your permission to help you share your photos.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string/>
+	<string></string>
 	<key>NSMainNibFile</key>
 	<string>LaunchScreen</string>
 	<key>NSMicrophoneUsageDescription</key>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eSteem",
-  "version": "2.0.9",
+  "version": "2.1.0",
   "private": true,
   "rnpm": {
     "assets": [

diff --git a/src/components/basicUIElements/view/walletLineItem/walletLineItemStyles.js b/src/components/basicUIElements/view/walletLineItem/walletLineItemStyles.js
@@ -77,4 +77,11 @@ export default EStyleSheet.create({
   dropdownWrapper: {
     flex: 1,
   },
+  dropdownRowText: {
+    fontSize: 14,
+    color: '$primaryDarkGray',
+  },
+  dropdownStyle: {
+    minWidth: '$deviceWidth * 0.7',
+  },
 });
diff --git a/src/components/basicUIElements/view/walletLineItem/walletLineItemView.js b/src/components/basicUIElements/view/walletLineItem/walletLineItemView.js
@@ -27,6 +27,7 @@ const WalletLineItem = ({
   isHasdropdown,
   dropdownOptions,
   onDropdownSelect,
+  dropdownStyle,
 }) => (
   <GrayWrapper isGray={index && index % 2 !== 0}>
     <View style={[styles.container, fitContent && styles.fitContent, style]}>
@@ -85,6 +86,8 @@ const WalletLineItem = ({
             options={dropdownOptions}
             noHighlight
             onSelect={onDropdownSelect}
+            rowTextStyle={styles.dropdownRowText}
+            dropdownStyle={styles.dropdownStyle}
           />
         </View>
       )}

diff --git a/src/components/dropdownButton/view/dropdownButtonStyles.js b/src/components/dropdownButton/view/dropdownButtonStyles.js
@@ -56,7 +56,7 @@ export default EStyleSheet.create({
     justifyContent: 'center',
     borderTopRightRadius: 20,
     borderBottomRightRadius: 20,
-    width: '$deviceWidth / 2.5',
+    width: '$deviceWidth / 2',
     padding: 5,
   },
   dropdownRow: {

diff --git a/src/components/points/view/pointsStyles.js b/src/components/points/view/pointsStyles.js
@@ -82,13 +82,13 @@ export default EStyleSheet.create({
     flexDirection: 'row',
   },
   unclaimedText: {
-    color: '$primaryBackgroundColor',
+    color: '$pureWhite',
     fontSize: 14,
     fontWeight: 'bold',
     alignSelf: 'center',
   },
   mainIconWrapper: {
-    backgroundColor: '$primaryBackgroundColor',
+    backgroundColor: '$pureWhite',
     justifyContent: 'center',
     alignSelf: 'center',
     alignItems: 'center',

diff --git a/src/components/settingsItem/view/settingsItemStyles.js b/src/components/settingsItem/view/settingsItemStyles.js
@@ -31,7 +31,8 @@ export default EStyleSheet.create({
     maxHeight: '$deviceHeight - 200',
   },
   dropdownButtonStyle: {
-    backgroundColor: '$primaryGray',
+    borderColor: '$primaryGray',
+    borderWidth: 1,
     height: 44,
     width: 172,
     borderRadius: 8,

diff --git a/src/components/wallet/view/walletStyles.js b/src/components/wallet/view/walletStyles.js
@@ -9,7 +9,7 @@ export default EStyleSheet.create({
   },
   // TODO: merge them / ugur
   unclaimedText: {
-    color: '$primaryBackgroundColor',
+    color: '$pureWhite',
     fontSize: 14,
     fontWeight: 'bold',
     alignSelf: 'center',
@@ -26,7 +26,7 @@ export default EStyleSheet.create({
     flexDirection: 'row',
   },
   mainIconWrapper: {
-    backgroundColor: '$primaryBackgroundColor',
+    backgroundColor: '$pureWhite',
     justifyContent: 'center',
     alignSelf: 'center',
     alignItems: 'center',

diff --git a/src/config/locales/ac-ace.json b/src/config/locales/ac-ace.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Meuhasè!",
+    "successful": "Successful",
     "allRead": "Tanda mandum haba nyang kalhëuh baca",
     "claim_reward_balance_ok": "Gaji kalhëuh klèm",
     "fail": "Gagai!",

diff --git a/src/config/locales/ar-SA.json b/src/config/locales/ar-SA.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "تم بنجاح!",
+    "successful": "Successful",
     "allRead": "وضع جميع الإشعارات كأنها مقروءة",
     "claim_reward_balance_ok": "تم سحب المكافآت",
     "fail": "فشل!",

diff --git a/src/config/locales/as-IN.json b/src/config/locales/as-IN.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Success!",
+    "successful": "Successful",
     "allRead": "Marked all notifications as read",
     "claim_reward_balance_ok": "Reward balance claimed",
     "fail": "Fail!",

diff --git a/src/config/locales/az-AZ.json b/src/config/locales/az-AZ.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Uğurlu!",
+    "successful": "Successful",
     "allRead": "Bütün bildirişləri oxunmuş kimi işarələ",
     "claim_reward_balance_ok": "Mükafat alındı",
     "fail": "Uğursuz!",

diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Success!",
+    "successful": "Successful",
     "allRead": "Marked all notifications as read",
     "claim_reward_balance_ok": "Reward balance claimed",
     "fail": "Fail!",

diff --git a/src/config/locales/bn-BD.json b/src/config/locales/bn-BD.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Success!",
+    "successful": "Successful",
     "allRead": "Marked all notifications as read",
     "claim_reward_balance_ok": "Reward balance claimed",
     "fail": "Fail!",

diff --git a/src/config/locales/bo-BT.json b/src/config/locales/bo-BT.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Success!",
+    "successful": "Successful",
     "allRead": "Marked all notifications as read",
     "claim_reward_balance_ok": "Reward balance claimed",
     "fail": "Fail!",

diff --git a/src/config/locales/bs-BA.json b/src/config/locales/bs-BA.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Success!",
+    "successful": "Successful",
     "allRead": "Marked all notifications as read",
     "claim_reward_balance_ok": "Reward balance claimed",
     "fail": "Fail!",

diff --git a/src/config/locales/ca-ES.json b/src/config/locales/ca-ES.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Success!",
+    "successful": "Successful",
     "allRead": "Marked all notifications as read",
     "claim_reward_balance_ok": "Reward balance claimed",
     "fail": "Fail!",

diff --git a/src/config/locales/ceb-PH.json b/src/config/locales/ceb-PH.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Success!",
+    "successful": "Successful",
     "allRead": "Marked all notifications as read",
     "claim_reward_balance_ok": "Reward balance claimed",
     "fail": "Fail!",

diff --git a/src/config/locales/cs-CZ.json b/src/config/locales/cs-CZ.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Success!",
+    "successful": "Successful",
     "allRead": "Marked all notifications as read",
     "claim_reward_balance_ok": "Reward balance claimed",
     "fail": "Fail!",

diff --git a/src/config/locales/da-DK.json b/src/config/locales/da-DK.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Success!",
+    "successful": "Successful",
     "allRead": "Marked all notifications as read",
     "claim_reward_balance_ok": "Reward balance claimed",
     "fail": "Fail!",

diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Erfolgreich!",
+    "successful": "Successful",
     "allRead": "Alle Benachrichtigungen als gelesen markieren",
     "claim_reward_balance_ok": "Belohnung abgeholt",
     "fail": "Fehlgeschlagen!",

diff --git a/src/config/locales/el-GR.json b/src/config/locales/el-GR.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Success!",
+    "successful": "Successful",
     "allRead": "Marked all notifications as read",
     "claim_reward_balance_ok": "Reward balance claimed",
     "fail": "Fail!",

diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Success!",
+    "successful": "Successful",
     "allRead": "Marked all notifications as read",
     "claim_reward_balance_ok": "Reward balance claimed",
     "fail": "Fail!",

diff --git a/src/config/locales/eo-UY.json b/src/config/locales/eo-UY.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Success!",
+    "successful": "Successful",
     "allRead": "Marked all notifications as read",
     "claim_reward_balance_ok": "Reward balance claimed",
     "fail": "Fail!",

diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Conseguido!",
+    "successful": "Successful",
     "allRead": "Marcar todas las notificaciones como leídas",
     "claim_reward_balance_ok": "Recompensa de balance reclamada",
     "fail": "Falló!",

diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Success!",
+    "successful": "Successful",
     "allRead": "Marked all notifications as read",
     "claim_reward_balance_ok": "Reward balance claimed",
     "fail": "Fail!",

diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "با موفقیت!",
+    "successful": "Successful",
     "allRead": "علامت زدن تمام اعلانات به عنوان خوانده شده",
     "claim_reward_balance_ok": "پاداش دریافت شده",
     "fail": "ناموفق!",

diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Onnistui!",
+    "successful": "Successful",
     "allRead": "Ilmoitukset merkattu luetuiksi",
     "claim_reward_balance_ok": "Reward balance claimed",
     "fail": "Virhe!",

diff --git a/src/config/locales/fil-PH.json b/src/config/locales/fil-PH.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Success!",
+    "successful": "Successful",
     "allRead": "Marked all notifications as read",
     "claim_reward_balance_ok": "Reward balance claimed",
     "fail": "Fail!",

diff --git a/src/config/locales/fr-FR.json b/src/config/locales/fr-FR.json
@@ -172,6 +172,7 @@
   },
   "alert": {
     "success": "Succés!",
+    "successful": "Successful",
     "allRead": "Marquer toutes les notifications comme lues",
     "claim_reward_balance_ok": "Solde de récompense réclamé",
     "fail": "Échec !",