Merge pull request #1850 from ecency/development

3.0.14
ecency · Feb 4, 2021 · d5bcb3e · d5bcb3e
2 parents 91afae8 + bff5b97
commit d5bcb3e
Show file tree

Hide file tree

Showing 42 changed files with 553 additions and 797 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -9,5 +9,8 @@
     "**/.project": true,
     "**/.settings": true,
     "**/.factorypath": true
+  },
+  "workbench.colorCustomizations": {
+    "editorUnnecessaryCode.border": "#dd7aab"
   }
 }
diff --git a/android/.project b/android/.project
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1612291976720</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/android/app/.project b/android/app/.project
@@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1612291976724</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -143,7 +143,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch
-        versionName "3.0.13"
+        versionName "3.0.14"
         resValue "string", "build_config_package", "app.esteem.mobile.android"
         multiDexEnabled true
         // react-native-image-crop-picker

diff --git a/ios/Ecency-tvOS/Info.plist b/ios/Ecency-tvOS/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.13</string>
+	<string>3.0.14</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2563</string>
+	<string>2793</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true />
 	<key>NSAppTransportSecurity</key>

diff --git a/ios/Ecency-tvOSTests/Info.plist b/ios/Ecency-tvOSTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.13</string>
+	<string>3.0.14</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2563</string>
+	<string>2793</string>
 </dict>
 </plist>
diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj
@@ -1122,7 +1122,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2792;
+				CURRENT_PROJECT_VERSION = 2793;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = 75B6RXTKGT;
 				HEADER_SEARCH_PATHS = (
@@ -1198,7 +1198,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ecency/Ecency.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2792;
+				CURRENT_PROJECT_VERSION = 2793;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = 75B6RXTKGT;
 				HEADER_SEARCH_PATHS = (

diff --git a/ios/Ecency/Info.plist b/ios/Ecency/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.13</string>
+	<string>3.0.14</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/ios/EcencyTests/Info.plist b/ios/EcencyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.13</string>
+	<string>3.0.14</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2563</string>
+	<string>2793</string>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
@@ -41,6 +41,11 @@ target 'Ecency' do
     # Pods for testing
   end
 
+  post_install do |installer|
+    find_and_replace("../node_modules/react-native/Libraries/Image/RCTUIImageViewAnimated.m",
+    "_currentFrame.CGImage;","_currentFrame.CGImage ;} else { [super displayLayer:layer];")
+  end
+
   use_native_modules!
 end
 
@@ -52,4 +57,17 @@ target 'Ecency-tvOS' do
     # Pods for testing
   end
 
+end
+
+def find_and_replace(dir, findstr, replacestr)
+  Dir[dir].each do |name|
+      text = File.read(name)
+      replace = text.gsub(findstr,replacestr)
+      if text != replace
+          puts "Fix: " + name
+          File.open(name, "w") { |file| file.puts replace }
+          STDOUT.flush
+      end
+  end
+  Dir[dir + '*/'].each(&method(:find_and_replace))
 end
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -331,8 +331,8 @@ PODS:
     - React
   - react-native-version-number (0.3.6):
     - React
-  - react-native-webview (8.2.1):
-    - React
+  - react-native-webview (11.2.1):
+    - React-Core
   - React-RCTActionSheet (0.61.5):
     - React-Core/RCTActionSheetHeaders (= 0.61.5)
   - React-RCTAnimation (0.61.5):
@@ -397,8 +397,8 @@ PODS:
     - Firebase/Messaging (~> 6.28.1)
     - React
     - RNFBApp
-  - RNGestureHandler (1.7.0):
-    - React
+  - RNGestureHandler (1.9.0):
+    - React-Core
   - RNIap (3.4.15):
     - React
   - RNImageCropPicker (0.35.2):
@@ -692,7 +692,7 @@ SPEC CHECKSUMS:
   react-native-safe-area-context: b6e0e284002381d2ff29fa4fff42b4d8282e3c94
   react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
   react-native-version-number: b415bbec6a13f2df62bf978e85bc0d699462f37f
-  react-native-webview: 160ac8d6bb974e2933f2de6bb7464a8e934ff31d
+  react-native-webview: a4751ec8f0a6a397026f22ed54c1efeec4540555
   React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
   React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
   React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72
@@ -712,7 +712,7 @@ SPEC CHECKSUMS:
   RNFBApp: d55b3a69d199cff25ecf4f3bf41a86c47aa37d57
   RNFBDynamicLinks: 25fd455b8f47be4fc7e92bd80db17d448196e9ba
   RNFBMessaging: 3bb7dcf398789ce359a9f6b97b83472a3090f65a
-  RNGestureHandler: b6b359bb800ae399a9c8b27032bdbf7c18f08a08
+  RNGestureHandler: 9b7e605a741412e20e13c512738a31bd1611759b
   RNIap: b4c77c8bc4501203f4b743126a05da23f10f40b4
   RNImageCropPicker: 9e0bf18cf4184a846fed55747c8e622208b39947
   RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad
@@ -725,6 +725,6 @@ SPEC CHECKSUMS:
   toolbar-android: 85f3ef4d691469f2d304e7dee4bca013aa1ba1ff
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
 
-PODFILE CHECKSUM: 1f30c7da5061dbc47185442a6ab4a3c95ac48c04
+PODFILE CHECKSUM: fe3729fa5bd9034637b0c0653446c2895b1c839d
 
 COCOAPODS: 1.9.3
diff --git a/ios/eshare/Info.plist b/ios/eshare/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.13</string>
+	<string>3.0.14</string>
 	<key>CFBundleVersion</key>
-	<string>2563</string>
+	<string>2793</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ecency",
-  "version": "3.0.13",
+  "version": "3.0.14",
   "displayName": "Ecency",
   "private": true,
   "rnpm": {
@@ -27,14 +27,13 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@ecency/render-helper": "^2.0.15",
+    "@ecency/render-helper": "^2.0.16",
     "@esteemapp/dhive": "0.15.0",
     "@esteemapp/react-native-autocomplete-input": "^4.2.1",
     "@esteemapp/react-native-modal-popover": "^0.0.15",
     "@esteemapp/react-native-multi-slider": "^1.1.0",
     "@esteemapp/react-native-render-html": "^4.1.5",
     "@esteemapp/react-native-slider": "^0.12.0",
-    "@gorhom/bottom-sheet": "^2",
     "@hiveio/dhive": "^0.14.12",
     "@react-native-community/async-storage": "^1.11.0",
     "@react-native-community/cameraroll": "^1.3.0",
@@ -49,7 +48,7 @@
     "appcenter": "^3.1.0",
     "appcenter-analytics": "^3.1.0",
     "appcenter-crashes": "^3.1.0",
-    "axios": "^0.18.0",
+    "axios": "^0.21.1",
     "buffer": "^5.4.3",
     "bugsnag-react-native": "^2.23.10",
     "core-js": "3.6.4",
@@ -66,14 +65,15 @@
     "react": "16.9.0",
     "react-intl": "^3.9.2",
     "react-native": "0.61.5",
+    "react-native-actions-sheet": "^0.4.2",
     "react-native-actionsheet": "ecency/react-native-actionsheet",
-    "react-native-autoheight-webview": "^1.5.2",
+    "react-native-autoheight-webview": "^1.5.7",
     "react-native-config": "luggit/react-native-config#master",
     "react-native-dark-mode": "^0.2.2",
     "react-native-date-picker": "^3.2.7",
     "react-native-extended-stylesheet": "^0.10.0",
     "react-native-fast-image": "^8.3.2",
-    "react-native-gesture-handler": "^1.4.1",
+    "react-native-gesture-handler": "^1.9.0",
     "react-native-highlight-words": "^1.0.1",
     "react-native-iap": "3.4.15",
     "react-native-image-crop-picker": "^0.35.2",
@@ -88,7 +88,7 @@
     "react-native-navigation-bar-color": "^1.0.0",
     "react-native-push-notification": "^3.5.1",
     "react-native-qrcode-svg": "^6.0.3",
-    "react-native-reanimated": "^1.3.0",
+    "react-native-reanimated": "^1",
     "react-native-receive-sharing-intent": "ecency/react-native-receive-sharing-intent",
     "react-native-restart": "0.0.17",
     "react-native-safe-area-context": "^3.1.9",
@@ -102,7 +102,7 @@
     "react-native-vector-icons": "^6.6.0",
     "react-native-version": "^4.0.0",
     "react-native-version-number": "^0.3.5",
-    "react-native-webview": "^8.0.4",
+    "react-native-webview": "^11.2.1",
     "react-navigation": "^4.0.10",
     "react-navigation-drawer": "^2.3.3",
     "react-navigation-redux-helpers": "^4.0.1",

diff --git a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js
@@ -29,29 +29,26 @@ const AccountsBottomSheetContainer = ({ navigation }) => {
   }, [isVisibleAccountsBottomSheet]);
 
   const _navigateToRoute = (routeName = null) => {
+    dispatch(toggleAccountsBottomSheet(false));
+    accountsBottomSheetViewRef.current?.closeAccountsBottomSheet();
     if (routeName) {
-      accountsBottomSheetViewRef.current?.closeAccountsBottomSheet();
-      setTimeout(() => {
-        navigate({ routeName });
-      }, 500);
+      navigate({ routeName });
     }
   };
 
+  const _onClose = () => {
+    dispatch(toggleAccountsBottomSheet(false));
+  };
+
   const _switchAccount = async (account = {}) => {
-    if (account.username !== currentAccount.name) {
+    dispatch(toggleAccountsBottomSheet(false));
+    accountsBottomSheetViewRef.current?.closeAccountsBottomSheet();
+    if (currentAccount && account && account.username !== currentAccount.name) {
       _handleSwitch(account);
-    } else {
-      accountsBottomSheetViewRef.current?.closeAccountsBottomSheet();
     }
   };
 
   const _handleSwitch = async (switchingAccount = {}) => {
-    // Call this dispatch because when we make request, onDismiss is not working
-    // =========================================================================
-    accountsBottomSheetViewRef.current?.closeAccountsBottomSheet();
-    dispatch(toggleAccountsBottomSheet());
-    // =========================================================================
-
     const accountData = accounts.filter(
       (account) => account.username === switchingAccount.username,
     )[0];
@@ -61,7 +58,7 @@ const AccountsBottomSheetContainer = ({ navigation }) => {
       accountData.username = accountData.name;
 
       dispatch(updateCurrentAccount(accountData));
-      dispatch(isRenderRequired(true));
+      //dispatch(isRenderRequired(true));
 
       const upToDateCurrentAccount = await switchAccount(accountData.name);
       const realmData = await getUserDataWithUsername(accountData.name);
@@ -78,7 +75,7 @@ const AccountsBottomSheetContainer = ({ navigation }) => {
       _currentAccount.local = realmData[0];
 
       dispatch(updateCurrentAccount(_currentAccount));
-      dispatch(isRenderRequired(true));
+      //dispatch(isRenderRequired(true));
     }
   };
 
@@ -89,6 +86,7 @@ const AccountsBottomSheetContainer = ({ navigation }) => {
       currentAccount={currentAccount}
       navigateToRoute={_navigateToRoute}
       switchAccount={_switchAccount}
+      onClose={_onClose}
     />
   );
 };

diff --git a/src/components/accountsBottomSheet/index.js b/src/components/accountsBottomSheet/index.js
@@ -1,5 +1,5 @@
-import AccountsBottomSheetContainer from './container/accountsBottomSheetContainer';
-import AccountsBottomSheet from './view/accountsBottomSheetView';
+import AccountsBottomSheet from './container/accountsBottomSheetContainer';
+import AccountsBottomSheetView from './view/accountsBottomSheetView';
 
-export { AccountsBottomSheet, AccountsBottomSheetContainer };
-export default AccountsBottomSheetContainer;
+export { AccountsBottomSheetView, AccountsBottomSheet };
+export default AccountsBottomSheet;