diff --git a/android/app/build.gradle b/android/app/build.gradle
index 61178867a..9b79c5587 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -222,4 +222,5 @@ task copyDownloadableDepsToLibs(type: Copy) {
}
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
\ No newline at end of file
+apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
+apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 29c899b4f..0f827ce31 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -291,7 +291,7 @@ PODS:
- React
- RNIap (3.4.15):
- React
- - RNImageCropPicker (0.25.3):
+ - RNImageCropPicker (0.26.1):
- QBImagePickerController
- React-Core
- React-RCTImage
@@ -519,7 +519,7 @@ SPEC CHECKSUMS:
rn-fetch-blob: f525a73a78df9ed5d35e67ea65e79d53c15255bc
RNGestureHandler: 4cb47a93019c1a201df2644413a0a1569a51c8aa
RNIap: b4c77c8bc4501203f4b743126a05da23f10f40b4
- RNImageCropPicker: bfb3ea9c8622f290532e2fe63f369e0d5a52f597
+ RNImageCropPicker: e1d8c3381e5b05a1bdcd13ea57a4f1c020a09cef
RNReanimated: 6abbbae2e5e72609d85aabd92a982a94566885f1
RNSVG: be27aa7c58819f97399388ae53d7fa0572f32c7f
RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4
diff --git a/ios/eSteem.xcworkspace/xcuserdata/mistik.xcuserdatad/UserInterfaceState.xcuserstate b/ios/eSteem.xcworkspace/xcuserdata/mistik.xcuserdatad/UserInterfaceState.xcuserstate
index 9c0cea287..5ed533b62 100644
Binary files a/ios/eSteem.xcworkspace/xcuserdata/mistik.xcuserdatad/UserInterfaceState.xcuserstate and b/ios/eSteem.xcworkspace/xcuserdata/mistik.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/src/screens/application/container/applicationContainer.js b/src/screens/application/container/applicationContainer.js
index 181655ce4..8543315fa 100644
--- a/src/screens/application/container/applicationContainer.js
+++ b/src/screens/application/container/applicationContainer.js
@@ -183,8 +183,7 @@ class ApplicationContainer extends Component {
}
if (routeName && (profile || content)) {
- // eslint-disable-next-line no-undef
- NavigationService.navigate({
+ navigate({
routeName,
params,
key: permlink || author,
@@ -330,7 +329,6 @@ class ApplicationContainer extends Component {
markActivityAsRead(username, activity_id).then(result => {
dispatch(updateUnreadActivityCount(result.unread));
});
-
if (!some(params, isEmpty)) {
navigate({
routeName,
diff --git a/src/screens/application/index.js b/src/screens/application/index.js
index 23b0493da..f87f443e7 100644
--- a/src/screens/application/index.js
+++ b/src/screens/application/index.js
@@ -30,10 +30,6 @@ const Application = () => {
isThemeReady,
isPinCodeRequire,
}) => {
- if (showAnimation || !isReady || !isRenderRequire || !isThemeReady) {
- return ;
- }
-
return (
{
isReady={isReady}
isDarkTheme={isDarkTheme}
/>
+ {(showAnimation || !isReady || !isRenderRequire || !isThemeReady) && }
);
}}
diff --git a/src/screens/launch/screen/launchStyles.js b/src/screens/launch/screen/launchStyles.js
index d4ce37b6e..74f97a60b 100644
--- a/src/screens/launch/screen/launchStyles.js
+++ b/src/screens/launch/screen/launchStyles.js
@@ -2,17 +2,21 @@ import EStyleSheet from 'react-native-extended-stylesheet';
export default EStyleSheet.create({
container: {
- flex: 1,
- justifyContent: 'center',
- alignItems: 'center',
+ position: 'absolute',
+ top: 0,
+ bottom: 0,
+ left: 0,
+ right: 0,
backgroundColor: '$pureWhite',
zIndex: 999,
},
darkContainer: {
- flex: 1,
- zIndex: 999,
- justifyContent: 'center',
- alignItems: 'center',
+ position: 'absolute',
+ top: 0,
+ bottom: 0,
+ left: 0,
+ right: 0,
backgroundColor: '#1e2835',
+ zIndex: 999,
},
});