Skip to content

Commit

Permalink
Merge branch 'develop' into feat-dynamic-text-size-with-custom-header
Browse files Browse the repository at this point in the history
  • Loading branch information
OtavioStasiak authored Mar 7, 2025
2 parents cbc8445 + e4bb1a8 commit c039333
Show file tree
Hide file tree
Showing 112 changed files with 864 additions and 674 deletions.
4 changes: 2 additions & 2 deletions .detoxrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ module.exports = {
type: 'ios.app',
binaryPath: 'ios/build/Build/Products/Debug-iphonesimulator/Rocket.Chat Experimental.app',
build:
'xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Debug -destination \'generic/platform=iphonesimulator\' -derivedDataPath ios/build'
"xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Debug -destination 'generic/platform=iphonesimulator' -derivedDataPath ios/build"
},
'ios.release': {
type: 'ios.app',
binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/Rocket.Chat Experimental.app',
build:
'xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Release -destination \'generic/platform=iphonesimulator\' -derivedDataPath ios/build'
"xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Release -destination 'generic/platform=iphonesimulator' -derivedDataPath ios/build"
},
'android.debug': {
type: 'android.apk',
Expand Down
83 changes: 83 additions & 0 deletions .github/ISSUE_TEMPLATE/1-bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: "Bug Report"
description: "Report a bug to help us improve."
title: "bug: "
labels: ["🐛 bug"]
body:
- type: markdown
attributes:
value: |
## Thank you for taking the time to report this bug!
Before submitting, please check if a similar issue exists.
- type: textarea
id: description
attributes:
label: "Describe the Bug"
description: "A clear and concise description of the issue."
placeholder: "A bug happened!"
validations:
required: true

- type: textarea
id: steps
attributes:
label: "Steps to Reproduce"
description: "List the steps to reproduce the issue."
placeholder: |
1. Go to '...'
2. Click on '...'
3. Observe the issue
validations:
required: true

- type: textarea
id: expected-behavior
attributes:
label: "Expected Behavior"
description: "What should have happened?"
placeholder: "Describe the expected outcome."

- type: textarea
id: actual-behavior
attributes:
label: "Actual Behavior"
description: "What actually happened?"
placeholder: "Describe what actually happens."

- type: input
id: server-version
attributes:
label: "Rocket.Chat Server Version"
placeholder: "Enter the server version"
validations:
required: true

- type: input
id: app-version
attributes:
label: "Rocket.Chat App Version"
placeholder: "Enter the app version"
validations:
required: true

- type: input
id: device-name
attributes:
label: "Device Name"
placeholder: "e.g., iPhone 13, Samsung Galaxy S22"
validations:
required: true

- type: input
id: os-version
attributes:
label: "OS Version"
placeholder: "e.g., iOS 17, Android 14"
validations:
required: true

- type: textarea
id: additional-context
attributes:
label: "Additional Context"
description: "Provide any other relevant information about the problem."
88 changes: 88 additions & 0 deletions .github/ISSUE_TEMPLATE/2-feature-suggestion.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
name: "Feature Suggestion"
description: "Suggest a new feature to improve our mobile application."
title: "feature request: "
labels: ["🎉 feature"]
body:
- type: markdown
attributes:
value: |
## Thank you for suggesting a new feature for our mobile application!
Please provide as much detail as possible below so we can evaluate your idea.
- type: textarea
id: feature-description
attributes:
label: "Feature Description"
description: "A clear and concise description of the proposed feature."
placeholder: "Describe the feature you are proposing..."
validations:
required: true

- type: textarea
id: motivation
attributes:
label: "Motivation and Use Case"
description: "Explain why this feature would improve the mobile experience and describe any specific use cases or issues it addresses."
placeholder: "Explain the benefits and use case for the feature..."
validations:
required: true

- type: textarea
id: implementation-ideas
attributes:
label: "Implementation Ideas"
description: "Share any thoughts on how this feature might be implemented."
placeholder: "Share your ideas or potential solutions..."
validations:
required: false

- type: dropdown
id: existing-feature
attributes:
label: "Is this feature available in the API or web version?"
description: "Select an option if this feature is already present elsewhere."
options:
- "Available in API"
- "Available in Web Version"
- "Not available"
- "Not sure"
validations:
required: true

- type: input
id: server-version
attributes:
label: "Rocket.Chat Server Version"
placeholder: "Enter the server version"
validations:
required: false

- type: input
id: app-version
attributes:
label: "Rocket.Chat App Version"
placeholder: "Enter the app version"
validations:
required: false

- type: input
id: device-name
attributes:
label: "Device Name"
placeholder: "e.g., iPhone 13, Samsung Galaxy S22"
validations:
required: false

- type: input
id: os-version
attributes:
label: "OS Version"
placeholder: "e.g., iOS 17, Android 14"
validations:
required: false

- type: textarea
id: additional-context
attributes:
label: "Additional Context"
description: "Any additional information or context to help us better understand your suggestion."
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: Community Support
url: https://open.rocket.chat/channel/react-native
about: Please ask and answer questions here.
61 changes: 61 additions & 0 deletions .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Format Code with Prettier

on:
push:
branches:
- '*'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
format:
if: ${{ github.repository != 'RocketChat/Rocket.Chat.ReactNative' || (github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop' && github.ref != 'refs/heads/single-server') }}
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: '22'
cache: 'yarn'

- name: Cache node_modules
uses: actions/cache@v4
with:
path: node_modules
key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }}
- name: Install dependencies
run: yarn install

- name: Run Prettier
run: yarn prettier --write .

- name: Check for changes
id: check_changes
run: |
if git diff --quiet; then
echo "No code format changes detected"
echo "changes=false" >> $GITHUB_OUTPUT
else
echo "Code format changes detected"
echo "changes=true" >> $GITHUB_OUTPUT
fi
- name: Commit and push changes
if: env.changes == 'true'
run: |
git config user.name "${{ github.actor }}"
git config user.email "${{ github.actor }}@users.noreply.github.com"
git add .
git commit -m "chore: format code with Prettier [skip ci]"
git push origin ${{ github.ref_name }}
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode VERSIONCODE as Integer
versionName "4.58.0"
versionName "4.59.0"
vectorDrawables.useSupportLibrary = true
if (!isFoss) {
manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
Expand Down
2 changes: 0 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

<!-- android 13 media permission -->
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />

<application
Expand Down
3 changes: 1 addition & 2 deletions app/containers/ActionSheet/BottomSheetContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ const BottomSheetContent = React.memo(({ options, hasCancel, hide, children, onL
<Touch
onPress={hide}
style={[styles.button, { backgroundColor: colors.surfaceHover }]}
accessibilityLabel={I18n.t('Cancel')}
>
accessibilityLabel={I18n.t('Cancel')}>
<Text style={[styles.text, { color: colors.fontDefault }]}>{I18n.t('Cancel')}</Text>
</Touch>
) : null;
Expand Down
6 changes: 5 additions & 1 deletion app/containers/AudioPlayer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,11 @@ const AudioPlayer = ({
}

return (
<View style={[styles.audioContainer, { backgroundColor: colors.surfaceLight, borderColor: colors.strokeExtraLight }]}>
<View
style={[
styles.audioContainer,
{ backgroundColor: colors.surfaceLight, borderColor: colors.strokeExtraLight, marginTop: 4 }
]}>
<PlayButton disabled={disabled} audioState={audioState} onPress={onPress} />
<Seek currentTime={currentTime} duration={duration} loaded={!disabled && isDownloaded} onChangeTime={setPosition} />
{audioState === 'playing' || focused ? <PlaybackSpeed /> : null}
Expand Down
3 changes: 1 addition & 2 deletions app/containers/Chip/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ const Chip = ({ avatar, text, onPress, testID, style }: IChip) => {
onPress={() => onPress?.()}
android_ripple={{
color: colors.surfaceNeutral
}}
>
}}>
<View style={styles.container}>
{avatar ? <Avatar text={avatar} size={28} style={styles.avatar} /> : null}
<View style={styles.textContainer}>
Expand Down
6 changes: 2 additions & 4 deletions app/containers/EmojiPicker/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ const Footer = ({ onSearchPressed, onBackspacePressed }: IFooterProps): React.Re
styles.footerButtonsContainer,
{ backgroundColor: isIOS && pressed ? colors.buttonBackgroundSecondaryPress : 'transparent' }
]}
testID='emoji-picker-search'
>
testID='emoji-picker-search'>
<CustomIcon size={24} name='search' />
</Pressable>

Expand All @@ -30,8 +29,7 @@ const Footer = ({ onSearchPressed, onBackspacePressed }: IFooterProps): React.Re
styles.footerButtonsContainer,
{ backgroundColor: isIOS && pressed ? colors.buttonBackgroundSecondaryPress : 'transparent' }
]}
testID='emoji-picker-backspace'
>
testID='emoji-picker-backspace'>
<CustomIcon size={24} name='backspace' />
</Pressable>
</View>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ const IncomingCallHeader = React.memo(
{
marginTop: insets.top
}
]}
>
]}>
<CallHeader
title={i18n.t('Incoming_call_from')}
cam={cam}
Expand All @@ -69,8 +68,7 @@ const IncomingCallHeader = React.memo(
setAudio(!audio);
hideNotification();
}}
style={styles.closeButton}
>
style={styles.closeButton}>
<CustomIcon name='close' size={20} />
</Touchable>
<Touchable
Expand All @@ -80,8 +78,7 @@ const IncomingCallHeader = React.memo(
hideNotification();
dispatch(cancelCall({ callId }));
}}
style={styles.cancelButton}
>
style={styles.cancelButton}>
<Text style={styles.buttonText}>{i18n.t('decline')}</Text>
</Touchable>
<Touchable
Expand All @@ -91,8 +88,7 @@ const IncomingCallHeader = React.memo(
hideNotification();
dispatch(acceptCall({ callId }));
}}
style={styles.acceptButton}
>
style={styles.acceptButton}>
<Text style={styles.buttonText}>{i18n.t('accept')}</Text>
</Touchable>
</View>
Expand Down
3 changes: 2 additions & 1 deletion app/containers/MessageComposer/components/ComposerInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useDebouncedCallback } from 'use-debounce';
import { useDispatch } from 'react-redux';
import { RouteProp, useFocusEffect, useRoute } from '@react-navigation/native';

import { textInputDebounceTime } from '../../../lib/constants';
import I18n from '../../../i18n';
import { IAutocompleteItemProps, IComposerInput, IComposerInputProps, IInputSelection, TSetInput } from '../interfaces';
import { useAutocompleteParams, useFocused, useMessageComposerApi, useMicOrSend } from '../context';
Expand Down Expand Up @@ -337,7 +338,7 @@ export const ComposerInput = memo(
}

stopAutocomplete();
}, 300);
}, textInputDebounceTime);

const handleTyping = (isTyping: boolean) => {
if (sharing || !rid) return;
Expand Down
Loading

0 comments on commit c039333

Please sign in to comment.