Fixed conflict

android/app/src/main/java/app/esteem/mobile/android/MainActivity.java

@@ -1,7 +1,5 @@
 package app.esteem.mobile.android;
 
-import android.os.Bundle;
-import org.devio.rn.splashscreen.SplashScreen;
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.ReactRootView;
@@ -9,11 +7,6 @@ import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 import android.content.Intent;
 
 public class MainActivity extends ReactActivity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        SplashScreen.show(this, R.style.SplashScreenTheme);
-        super.onCreate(savedInstanceState);
-    }
   /**
    * Returns the name of the main component registered from JavaScript. This is
    * used to schedule rendering of the component.

android/app/src/main/res/layout/launch_screen.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <ImageView android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/launch_screen" android:scaleType="centerCrop" />
-</RelativeLayout>

android/app/src/main/res/values/colors-splash.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="splashprimary">#FFFFFF</color>
-</resources>

android/app/src/main/res/values/styles.xml

@@ -1,7 +1,4 @@
 <resources>
-    <style name="SplashScreenTheme" parent="SplashScreen_SplashTheme">
-        <item name="colorPrimaryDark">@color/splashprimary</item>
-    </style>
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowExitAnimation">@android:anim/fade_out</item>
         <item name="android:editTextBackground">@android:color/transparent</item>

ios/Podfile.lock

@@ -126,9 +126,9 @@ PODS:
   - libwebp/mux (1.1.0):
     - libwebp/demux
   - libwebp/webp (1.1.0)
-  - lottie-ios (3.1.3)
-  - lottie-react-native (3.4.0):
-    - lottie-ios (~> 3.1.3)
+  - lottie-ios (3.1.8)
+  - lottie-react-native (3.5.0):
+    - lottie-ios (~> 3.1.8)
     - React
   - nanopb (1.30905.0):
     - nanopb/decode (= 1.30905.0)
@@ -623,8 +623,8 @@ SPEC CHECKSUMS:
   GoogleDataTransport: 8a40cb194ad242b6f6dfe72c14fe40fc67c4dcd7
   GoogleUtilities: e121a3867449ce16b0e35ddf1797ea7a389ffdf2
   libwebp: 946cb3063cea9236285f7e9a8505d806d30e07f3
-  lottie-ios: 496ac5cea1bbf1a7bd1f1f472f3232eb1b8d744b
-  lottie-react-native: a664f59f1f298c2696dd0ae07b15cbdfc433cb02
+  lottie-ios: 48fac6be217c76937e36e340e2d09cf7b10b7f5f
+  lottie-react-native: 1fb4ce21d6ad37dab8343eaff8719df76035bd93
   nanopb: c43f40fadfe79e8b8db116583945847910cbabc9
   PromisesObjC: b48e0338dbbac2207e611750777895f7a5811b75
   Protobuf: 2793fcd0622a00b546c60e7cbbcc493e043e9bb9

package.json

@@ -25,7 +25,7 @@
   "dependencies": {
     "@babel/runtime": "^7.5.5",
     "@esteemapp/dhive": "0.12.1",
-    "@esteemapp/esteem-render-helpers": "^1.3.8",
+    "@esteemapp/esteem-render-helpers": "^1.4.6",
     "@esteemapp/react-native-autocomplete-input": "^4.2.1",
     "@esteemapp/react-native-modal-popover": "^0.0.15",
     "@esteemapp/react-native-multi-slider": "^1.1.0",
@@ -54,8 +54,8 @@
     "intl": "^1.2.5",
     "jsc-android": "^241213.1.0",
     "lodash": "^4.17.13",
-    "lottie-ios": "3.1.3",
-    "lottie-react-native": "^3.2.1",
+    "lottie-ios": "3.1.8",
+    "lottie-react-native": "^3.5.0",
     "moment": "^2.22.2",
     "react": "16.9.0",
     "react-intl": "^3.9.2",

src/components/animations/boostIndicator/boostIndicatorAnimation.js

@@ -35,7 +35,7 @@ const BoostIndicatorAnimation = ({ isSpinning }) => {
       />
       <Image
         style={{ width: 80, height: 80 }}
-        source={require('../../../assets/ecency_logo_transparent.png')}
+        source={require('../../../assets/ecency-logo-round.png')}
       />
     </View>
   );

src/components/postBoost/postBoostView.js

@@ -212,7 +212,7 @@ class BoostPostScreen extends PureComponent {
 
                 <MainButton
                   style={styles.quickButtons}
-                  isDisable={!((balance || _balance) / 50 > factor + 4)}
+                  isDisable={!((balance || _balance) / 50 > factor + 4) || !(factor + 4 <= 10)}
                   onPress={() =>
                     this.setState({
                       factor: (balance || _balance) / 50 > factor + 4 ? factor + 1 : factor,

src/components/spinGame/spinGameStyles.js

@@ -32,7 +32,7 @@ export default EStyleSheet.create({
   backgroundTags: {
     position: 'absolute',
     width: '$deviceWidth',
-    height: 320,
+    height: 360,
     left: 0,
     top: 16,
     right: 0,
@@ -71,7 +71,7 @@ export default EStyleSheet.create({
     left: -22,
   },
   productWrapper: {
-    flex: 0.8,
+    flex: 0.7,
     zIndex: 998,
     alignItems: 'center',
   },

src/screens/application/index.js

@@ -17,7 +17,7 @@ const Application = () => {
     if (showAnimation) {
       setTimeout(() => {
         setShowAnimation(false);
-      }, 2833);
+      }, 3550);
     }
   }, [showAnimation]);
 

src/screens/application/screen/welcomeScreen.js

@@ -10,11 +10,8 @@ const WelcomeScreen = ({ handleButtonPress }) => {
   return (
     <SafeAreaView style={styles.safeAreaView}>
       <View style={styles.container}>
-        <Image
-          style={{ width: 205, height: 200, alignSelf: 'center' }}
-          source={require('../../../assets/ecency-logo.png')}
-        />
-        <View>
+        <Image style={styles.mascot} source={require('../../../assets/love_mascot.png')} />
+        <View style={styles.topText}>
           <Text style={styles.welcomeText}>Welcome to</Text>
           <Text style={styles.ecencyText}>Ecency</Text>
         </View>

src/screens/application/screen/welcomeStyles.js

@@ -17,6 +17,16 @@ export default EStyleSheet.create({
     fontSize: 34,
     color: '$primaryBlue',
   },
+  mascot: {
+    position: 'absolute',
+    width: 160,
+    height: 227,
+    marginTop: 40,
+    right: 0,
+  },
+  topText: {
+    marginTop: 150,
+  },
   sectionRow: {
     flexDirection: 'row',
   },

src/screens/launch/screen/launchScreen.js

@@ -6,7 +6,12 @@ import styles from './launchStyles';
 
 const LaunchScreen = () => (
   <View style={nativeThemeInitialMode !== 'dark' ? styles.container : styles.darkContainer}>
-    <LottieView source={require('./animation.json')} autoPlay loop={false} />
+    <LottieView
+      style={{ width: 150, height: 150 }}
+      source={require('./animation.json')}
+      autoPlay
+      loop={false}
+    />
   </View>
 );
 

src/screens/launch/screen/launchStyles.js

@@ -9,6 +9,10 @@ export default EStyleSheet.create({
     right: 0,
     backgroundColor: '$pureWhite',
     zIndex: 999,
+    justifyContent: 'center',
+    alignItems: 'center',
+    alignSelf: 'center',
+    flex: 1,
   },
   darkContainer: {
     position: 'absolute',
@@ -18,5 +22,9 @@ export default EStyleSheet.create({
     right: 0,
     backgroundColor: '#1e2835',
     zIndex: 999,
+    justifyContent: 'center',
+    alignItems: 'center',
+    alignSelf: 'center',
+    flex: 1,
   },
 });

src/screens/transfer/screen/transferScreen.js

@@ -232,7 +232,7 @@ class TransferView extends Component {
                     {this._renderDescription(
                       `${intl.formatMessage({
                         id: 'transfer.amount_desc',
-                      })} ${balance} ${fundType}`,
+                      })} ${balance} ${fundType === 'ESTM' ? 'Points' : fundType}`,
                     )}
                   </TouchableOpacity>
                 )}

yarn.lock

@@ -709,10 +709,10 @@
     verror "^1.10.0"
     whatwg-fetch "^2.0.3"
 
-"@esteemapp/esteem-render-helpers@^1.3.8":
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/@esteemapp/esteem-render-helpers/-/esteem-render-helpers-1.4.4.tgz#02360a8be20188009e4157d4956a7b74d473933f"
-  integrity sha512-j84qK7KDtywvCqco2JyDzn0EN8V88ml4meWwjQPBaqutwC9U7ZjQDR4IxCgJs5PRo1jmT9ZD8uWbQb7tBRLerA==
+"@esteemapp/esteem-render-helpers@^1.4.6":
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/@esteemapp/esteem-render-helpers/-/esteem-render-helpers-1.4.6.tgz#efcceb9c73cc65a2c1d5dbb442711136d702eb3f"
+  integrity sha512-zzfVUg7hENu9rJmZ8sYUoL0n+u28z0UUX4R+GC/m9LzZy1Gp9CVilWkIUN9TXrBdC2WFw6kJWb0s9YWJtdn08g==
   dependencies:
     he "^1.2.0"
     lru-cache "^5.1.1"
@@ -5876,23 +5876,18 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-lottie-ios@3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/lottie-ios/-/lottie-ios-3.1.3.tgz#dfa18a3a7e66e5d4a6665bf0a2392d143d15661a"
-  integrity sha512-FKSx9l5Ekwm1Wt/ncoCwvsq8NAb1nylzMFlxrHixLYNBtO2eCQet+vwQag+74Nc/E9Lp3DKkBUCyBfz+zjtmAw==
-
-lottie-ios@^3.1.3:
+lottie-ios@3.1.8, lottie-ios@^3.1.8:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/lottie-ios/-/lottie-ios-3.1.8.tgz#2e9b1f4eae0dfc10bf4c0b3ab6b402c1d590d0fa"
   integrity sha512-9bgiVn1n+zqWjDPTk4MVWXA+DgVa91payxV2jz8B2dsDFqWtjEqTZaaVo5IqNUExsaC5XkRbziExtTOtzd39tQ==
 
-lottie-react-native@^3.2.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/lottie-react-native/-/lottie-react-native-3.4.0.tgz#df0887cfd2788d30c383c1e4bb0bd7bbd6fb969f"
-  integrity sha512-ErQJiuptd9koH3NppcNbWAOQXTYUS0ZPpcTM1y+A5jqrTSsZviOLt45nl8aQGpKLpmF21/HmJZuInfoKqvYkRg==
+lottie-react-native@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/lottie-react-native/-/lottie-react-native-3.5.0.tgz#749fed964bdc9fabfae24ef81696f90f4d758f59"
+  integrity sha512-yKYj58xynDAG/BqJUhg9LTATBqwD4ATGXJKL2Ho6g4BTmPexOjDBNnPSeRBwjlpBxQ1nP4Qw//0zbuFsTFD1TA==
   dependencies:
     invariant "^2.2.2"
-    lottie-ios "^3.1.3"
+    lottie-ios "^3.1.8"
     prop-types "^15.5.10"
     react-native-safe-modules "^1.0.0"