[email protected] && changed certificate && fix payment

_docs/access.txt

@@ -4,7 +4,5 @@ Keystore password: qaLXN95%n6
 Key password: eMnp*hJF41
 
 ------
-P12 password: B1pdYILkyB9Y
-
-------
-DPS P12 password: &MZ5YdtOSy2w
+P12 PROD password: nZVEH66FKlbm
+P12 DEV password: 79y56XZ5Bp1d

index.js

@@ -1,5 +1,5 @@
 /** @format */
-
+import 'react-native-gesture-handler';
 import {AppRegistry} from 'react-native';
 import App from './App';
 import {name as appName} from './app.json';

ios/diagnosticcenter.xcodeproj/project.pbxproj

@@ -489,15 +489,15 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = diagnosticcenter/diagnosticcenter.entitlements;
-				CURRENT_PROJECT_VERSION = 1.0.22;
+				CURRENT_PROJECT_VERSION = 1.0.23;
 				DEVELOPMENT_TEAM = AV2A6Q25TV;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = diagnosticcenter/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.22;
+				MARKETING_VERSION = 1.0.23;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -520,14 +520,14 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = diagnosticcenter/diagnosticcenter.entitlements;
-				CURRENT_PROJECT_VERSION = 1.0.22;
+				CURRENT_PROJECT_VERSION = 1.0.23;
 				DEVELOPMENT_TEAM = AV2A6Q25TV;
 				INFOPLIST_FILE = diagnosticcenter/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.22;
+				MARKETING_VERSION = 1.0.23;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -673,7 +673,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.22;
+				CURRENT_PROJECT_VERSION = 1.0.23;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = AV2A6Q25TV;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -684,7 +684,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.22;
+				MARKETING_VERSION = 1.0.23;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.izzisoftware.diagnosticcenter.OneSignalNotificationServiceExtension;
@@ -708,7 +708,7 @@
 				CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.0.22;
+				CURRENT_PROJECT_VERSION = 1.0.23;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = AV2A6Q25TV;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -719,7 +719,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.22;
+				MARKETING_VERSION = 1.0.23;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.izzisoftware.diagnosticcenter.OneSignalNotificationServiceExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";

src/containers/authorization/index.js

@@ -26,10 +26,10 @@ class AuthorizationScreen extends Component {
 			message: '',
 			smsCode: '',
 			loading: false,
-			showPopup: false,
+			// showPopup: false,
 			showSms: false,
 			user: {},
-			timer: 120
+			timer: 60
 		};
 	}
 
@@ -107,9 +107,9 @@ class AuthorizationScreen extends Component {
     }
 	};
 
-	clickOnPopup = () => {
-		this.setState({ showPopup: false });
-	};
+	// clickOnPopup = () => {
+	// 	this.setState({ showPopup: false });
+	// };
 
 	checkValid = (number, personalId) => {
 		let { t } = this.props;
@@ -150,7 +150,7 @@ class AuthorizationScreen extends Component {
 				})
 				.catch((e) => {
 					this.setState({
-						showPopup: e.code === 403 ? true : false,
+						// showPopup: e.code === 403 ? true : false,
 						message: e.error ? e.error : t('common:errors.server_not_available'),
 						loading: false
 					});
@@ -290,13 +290,13 @@ class AuthorizationScreen extends Component {
 					{!token && !showSms && this.renderAuthView()}
 					{!token && showSms && this.renderSmsCode()}
 				</KeyboardAwareScrollView>
-				<Popup
+				{/* <Popup
 					show={showPopup}
 					firstText={t('authorization:phone_not_register')}
 					email={'info@diagnostika.kz'}
 					laberButton={t('common:actions.ok')}
 					actionButton={this.clickOnPopup}
-				/>
+				/> */}
 			</Container>
 		);
 	}

src/containers/payment/index.js

@@ -6,7 +6,7 @@ import { bindActionCreators, compose } from 'redux';
 import { connect } from 'react-redux';
 import { withNavigationFocus } from 'react-navigation';
 
-import { getSavedCards } from '../../actions/content';
+import { getSavedCards, getListTalonInfo } from '../../actions/content';
 
 import Header from '../../components/common/Header';
 import { ACCENT_BLUE } from '../../styles/constants';
@@ -29,7 +29,7 @@ class Payment extends Component {
 	}
 
 	onNavigationStateChange = ({ url }) => {
-		const { navigation, getSavedCards } = this.props;
+		const { navigation, getSavedCards, getListTalonInfo, infoListTalonInfo } = this.props;
 
 		if (url.includes('process')) {
 			this.senderResp = true;
@@ -60,8 +60,14 @@ class Payment extends Component {
 			}, 4000);
 		}
 
-		if (url.includes('api/epay_success')) {
-			navigation.goBack();
+		if (url.includes('epay_success') || url.includes('epay_failure')) {
+			if (this.senderResp && infoListTalonInfo?.rnumb_id) {
+				setTimeout(() => {
+					getListTalonInfo(infoListTalonInfo?.rnumb_id);
+					navigation.navigate('recordingItem');
+				}, 4000);
+				this.senderResp = false;
+			}
 		}
 	};
 
@@ -99,9 +105,10 @@ const styles = StyleSheet.create({
 });
 
 const mapStateToProps = (state) => ({
+	infoListTalonInfo: state.content.infoListTalonInfo,
 	payLink: state.content.payLink
 });
 
-const mapDispatchToProps = (dispatch) => bindActionCreators({	getSavedCards }, dispatch);
+const mapDispatchToProps = (dispatch) => bindActionCreators({	getSavedCards, getListTalonInfo }, dispatch);
 
 export default withNamespaces(['payment'])(compose(withNavigationFocus, connect(mapStateToProps, mapDispatchToProps))(Payment));

src/containers/recording/item.js

@@ -54,10 +54,14 @@ class ReceptionInfoItemScreen extends Component {
 	componentDidUpdate(prevProps) {
 		const { payLink, isFocused, navigation } = this.props;
 
-		if (prevProps.orderCreated !== this.props.orderCreated && this.props.orderCreated)
+		if (prevProps.orderCreated !== this.props.orderCreated && this.props.orderCreated) {
 			this.setState({ modalVisible: true });
-		if (prevProps.orderDeleted !== this.props.orderDeleted && this.props.orderDeleted)
+		}
+
+		if (prevProps.orderDeleted !== this.props.orderDeleted && this.props.orderDeleted) {
 			this.props.navigation.navigate('recordingList');
+		}
+
 		if (prevProps.payLink !== payLink && payLink && isFocused) {
 			navigation.navigate('payment');
 		}