From 59c76d39563599299797ccdc3d037e2f591194e4 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Thu, 2 Feb 2023 16:51:16 -0300 Subject: [PATCH 01/12] Bump version to 4.36.0 (#4884) --- android/app/build.gradle | 2 +- ios/RocketChatRN.xcodeproj/project.pbxproj | 4 ++-- ios/RocketChatRN/Info.plist | 2 +- ios/ShareRocketChatRN/Info.plist | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index d257c176a..5f4d450c3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -147,7 +147,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode VERSIONCODE as Integer - versionName "4.35.1" + versionName "4.36.0" vectorDrawables.useSupportLibrary = true if (!isFoss) { manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String] diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj index b13107763..095c89a44 100644 --- a/ios/RocketChatRN.xcodeproj/project.pbxproj +++ b/ios/RocketChatRN.xcodeproj/project.pbxproj @@ -1772,7 +1772,7 @@ INFOPLIST_FILE = NotificationService/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 4.35.1; + MARKETING_VERSION = 4.36.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -1812,7 +1812,7 @@ INFOPLIST_FILE = NotificationService/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 4.35.1; + MARKETING_VERSION = 4.36.0; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService; diff --git a/ios/RocketChatRN/Info.plist b/ios/RocketChatRN/Info.plist index dd39cceb5..82d5169ea 100644 --- a/ios/RocketChatRN/Info.plist +++ b/ios/RocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.35.1 + 4.36.0 CFBundleSignature ???? CFBundleURLTypes diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist index e428d3be9..1619677fd 100644 --- a/ios/ShareRocketChatRN/Info.plist +++ b/ios/ShareRocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 4.35.1 + 4.36.0 CFBundleVersion 1 KeychainGroup diff --git a/package.json b/package.json index ea6116fa7..aae9bf09a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket-chat-reactnative", - "version": "4.35.1", + "version": "4.36.0", "private": true, "scripts": { "start": "react-native start", From 68f6eb40de34f1705dfe3503c152128fd06f408e Mon Sep 17 00:00:00 2001 From: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com> Date: Thu, 2 Feb 2023 18:41:32 -0300 Subject: [PATCH 02/12] Chore: Hooks app/views/InviteUsersEditView (#4670) * Chore: Hooks app/views/InviteUsersEditView * minor tweak * switch value name --- app/stacks/InsideStack.tsx | 6 +- app/stacks/MasterDetailStack/index.tsx | 6 +- app/views/InviteUsersEditView/Picker.tsx | 92 ++++++++++++ app/views/InviteUsersEditView/index.tsx | 169 +++++------------------ 4 files changed, 131 insertions(+), 142 deletions(-) create mode 100644 app/views/InviteUsersEditView/Picker.tsx diff --git a/app/stacks/InsideStack.tsx b/app/stacks/InsideStack.tsx index 9d9899393..2d8b2c6ae 100644 --- a/app/stacks/InsideStack.tsx +++ b/app/stacks/InsideStack.tsx @@ -105,11 +105,7 @@ const ChatsStackNavigator = () => { /> - + diff --git a/app/stacks/MasterDetailStack/index.tsx b/app/stacks/MasterDetailStack/index.tsx index 0b315a284..dd7cc4d1a 100644 --- a/app/stacks/MasterDetailStack/index.tsx +++ b/app/stacks/MasterDetailStack/index.tsx @@ -142,11 +142,7 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => { component={AddExistingChannelView} options={AddExistingChannelView.navigationOptions} /> - + { + const { colors } = useTheme(); + const inviteLinkParam = useAppSelector(state => state.inviteLinks[param]); + const dispatch = useDispatch(); + + const onValueChangePicker = (value: number) => { + logEvent(events.IU_EDIT_SET_LINK_PARAM); + const params = { + [param]: value + }; + dispatch(inviteLinksSetParams(params)); + }; + + const textInputStyle: TextInputProps = { style: { ...styles.pickerText, color: colors.actionTintColor } }; + const firstEl = [ + { + label: I18n.t(first), + value: 0 + } + ]; + return ( + onValueChangePicker(value)} + items={firstEl.concat(OPTIONS[param])} + /> + ); +}; + +export default Picker; diff --git a/app/views/InviteUsersEditView/index.tsx b/app/views/InviteUsersEditView/index.tsx index 4ee14a9a3..5fc2f3b99 100644 --- a/app/views/InviteUsersEditView/index.tsx +++ b/app/views/InviteUsersEditView/index.tsx @@ -1,149 +1,54 @@ -import { StackNavigationOptions } from '@react-navigation/stack'; -import React from 'react'; -import { TextInputProps, View } from 'react-native'; -import RNPickerSelect from 'react-native-picker-select'; -import { connect } from 'react-redux'; +import { StackNavigationProp } from '@react-navigation/stack'; +import React, { useLayoutEffect } from 'react'; +import { View } from 'react-native'; +import { useDispatch } from 'react-redux'; +import { RouteProp, useNavigation, useRoute } from '@react-navigation/native'; -import { inviteLinksCreate, inviteLinksSetParams } from '../../actions/inviteLinks'; -import { themes } from '../../lib/constants'; +import { inviteLinksCreate } from '../../actions/inviteLinks'; import Button from '../../containers/Button'; import * as List from '../../containers/List'; import SafeAreaView from '../../containers/SafeAreaView'; import StatusBar from '../../containers/StatusBar'; -import { IApplicationState, IBaseScreen } from '../../definitions'; import I18n from '../../i18n'; import { ChatsStackParamList } from '../../stacks/types'; -import { withTheme } from '../../theme'; import { events, logEvent } from '../../lib/methods/helpers/log'; import styles from './styles'; +import Picker from './Picker'; -const OPTIONS = { - days: [ - { - label: '1', - value: 1 - }, - { - label: '7', - value: 7 - }, - { - label: '15', - value: 15 - }, - { - label: '30', - value: 30 - } - ], - maxUses: [ - { - label: '1', - value: 1 - }, - { - label: '5', - value: 5 - }, - { - label: '10', - value: 10 - }, - { - label: '25', - value: 25 - }, - { - label: '50', - value: 50 - }, - { - label: '100', - value: 100 - } - ] -}; +const InviteUsersEditView = () => { + const navigation = useNavigation>(); + const { rid } = useRoute>().params; + const dispatch = useDispatch(); -interface IInviteUsersEditViewProps extends IBaseScreen { - days: number; - maxUses: number; -} + useLayoutEffect(() => { + navigation.setOptions({ + title: I18n.t('Invite_users') + }); + }, [navigation]); -class InviteUsersEditView extends React.Component { - static navigationOptions = (): StackNavigationOptions => ({ - title: I18n.t('Invite_users') - }); - - private rid: string; - - constructor(props: IInviteUsersEditViewProps) { - super(props); - this.rid = props.route.params?.rid; - } - - onValueChangePicker = (key: string, value: number) => { - const { dispatch } = this.props; - logEvent(events.IU_EDIT_SET_LINK_PARAM); - const params = { - [key]: value - }; - dispatch(inviteLinksSetParams(params)); - }; - - createInviteLink = () => { - const { dispatch, navigation } = this.props; + const createInviteLink = () => { logEvent(events.IU_EDIT_CREATE_LINK); - dispatch(inviteLinksCreate(this.rid)); + dispatch(inviteLinksCreate(rid)); navigation.pop(); }; - renderPicker = (key: 'days' | 'maxUses', first: string) => { - const { props } = this; - const { theme } = props; - const textInputStyle: TextInputProps = { style: { ...styles.pickerText, color: themes[theme].actionTintColor } }; - const firstEl = [ - { - label: I18n.t(first), - value: 0 - } - ]; - return ( - this.onValueChangePicker(key, value)} - items={firstEl.concat(OPTIONS[key])} - /> - ); - }; + return ( + + + + + + } /> + + } /> + + + +