Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
RocketChat
Rocket.Chat.ReactNative
Commits
60cc4cdd
Unverified
Commit
60cc4cdd
authored
May 05, 2022
by
Diego Mello
Committed by
GitHub
May 05, 2022
Browse files
Merge 4.27.1 into master (#4164)
parent
601d9444
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
android/app/build.gradle
View file @
60cc4cdd
...
...
@@ -144,7 +144,7 @@ android {
minSdkVersion
rootProject
.
ext
.
minSdkVersion
targetSdkVersion
rootProject
.
ext
.
targetSdkVersion
versionCode
VERSIONCODE
as
Integer
versionName
"4.27.
0
"
versionName
"4.27.
1
"
vectorDrawables
.
useSupportLibrary
=
true
if
(!
isFoss
)
{
manifestPlaceholders
=
[
BugsnagAPIKey:
BugsnagAPIKey
as
String
]
...
...
app/containers/RoomItem/TypeIcon.tsx
View file @
60cc4cdd
...
...
@@ -3,7 +3,7 @@ import React from 'react';
import
RoomTypeIcon
from
'
../RoomTypeIcon
'
;
import
{
ITypeIconProps
}
from
'
./interfaces
'
;
const
TypeIcon
=
React
.
memo
(({
type
,
prid
,
status
,
isGroupChat
,
teamMain
,
size
,
style
}:
ITypeIconProps
)
=>
(
const
TypeIcon
=
React
.
memo
(({
type
,
prid
,
status
,
isGroupChat
,
teamMain
,
size
,
style
,
sourceType
}:
ITypeIconProps
)
=>
(
<
RoomTypeIcon
type
=
{
prid
?
'
discussion
'
:
type
}
isGroupChat
=
{
isGroupChat
}
...
...
@@ -11,6 +11,7 @@ const TypeIcon = React.memo(({ type, prid, status, isGroupChat, teamMain, size,
teamMain
=
{
teamMain
}
size
=
{
size
}
style
=
{
style
}
sourceType
=
{
sourceType
}
/>
));
...
...
app/lib/notifications/push.ts
View file @
60cc4cdd
...
...
@@ -73,8 +73,8 @@ class PushNotification {
return
this
.
deviceToken
;
}
setBadgeCount
=
(
count
?:
number
)
=>
{
if
(
isIOS
&&
count
)
{
setBadgeCount
=
(
count
=
0
)
=>
{
if
(
isIOS
)
{
Notifications
.
ios
.
setBadgeCount
(
count
);
}
};
...
...
app/presentation/RoomItem/TypeIcon.tsx
deleted
100644 → 0
View file @
601d9444
import
React
from
'
react
'
;
import
{
TUserStatus
,
IOmnichannelSource
}
from
'
../../definitions
'
;
import
RoomTypeIcon
from
'
../../containers/RoomTypeIcon
'
;
interface
ITypeIcon
{
type
:
string
;
status
:
TUserStatus
;
prid
:
string
;
isGroupChat
:
boolean
;
teamMain
:
boolean
;
size
?:
number
;
style
?:
object
;
sourceType
?:
IOmnichannelSource
;
}
const
TypeIcon
=
React
.
memo
(({
type
,
prid
,
status
,
isGroupChat
,
teamMain
,
size
,
style
,
sourceType
}:
ITypeIcon
)
=>
(
<
RoomTypeIcon
type
=
{
prid
?
'
discussion
'
:
type
}
isGroupChat
=
{
isGroupChat
}
status
=
{
status
}
teamMain
=
{
teamMain
}
size
=
{
size
}
style
=
{
style
}
sourceType
=
{
sourceType
}
/>
));
export
default
TypeIcon
;
ios/RocketChatRN.xcodeproj/project.pbxproj
View file @
60cc4cdd
...
...
@@ -1683,7 +1683,7 @@
INFOPLIST_FILE
=
NotificationService/Info.plist
;
IPHONEOS_DEPLOYMENT_TARGET
=
11.0
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"
;
MARKETING_VERSION
=
4.27.
0
;
MARKETING_VERSION
=
4.27.
1
;
MTL_ENABLE_DEBUG_INFO
=
INCLUDE_SOURCE
;
MTL_FAST_MATH
=
YES
;
PRODUCT_BUNDLE_IDENTIFIER
=
chat.rocket.reactnative.NotificationService
;
...
...
@@ -1720,7 +1720,7 @@
INFOPLIST_FILE
=
NotificationService/Info.plist
;
IPHONEOS_DEPLOYMENT_TARGET
=
11.0
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"
;
MARKETING_VERSION
=
4.27.
0
;
MARKETING_VERSION
=
4.27.
1
;
MTL_FAST_MATH
=
YES
;
PRODUCT_BUNDLE_IDENTIFIER
=
chat.rocket.reactnative.NotificationService
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
...
...
ios/RocketChatRN/Info.plist
View file @
60cc4cdd
...
...
@@ -26,7 +26,7 @@
<key>
CFBundlePackageType
</key>
<string>
APPL
</string>
<key>
CFBundleShortVersionString
</key>
<string>
4.27.
0
</string>
<string>
4.27.
1
</string>
<key>
CFBundleSignature
</key>
<string>
????
</string>
<key>
CFBundleURLTypes
</key>
...
...
ios/ShareRocketChatRN/Info.plist
View file @
60cc4cdd
...
...
@@ -26,7 +26,7 @@
<key>
CFBundlePackageType
</key>
<string>
XPC!
</string>
<key>
CFBundleShortVersionString
</key>
<string>
4.27.
0
</string>
<string>
4.27.
1
</string>
<key>
CFBundleVersion
</key>
<string>
1
</string>
<key>
KeychainGroup
</key>
...
...
package.json
View file @
60cc4cdd
{
"name"
:
"rocket-chat-reactnative"
,
"version"
:
"4.27.
0
"
,
"version"
:
"4.27.
1
"
,
"private"
:
true
,
"scripts"
:
{
"start"
:
"react-native start"
,
...
...
storybook/stories/__snapshots__/RoomItem.storyshot
View file @
60cc4cdd
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment