Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: bump #127

Merged
merged 1 commit into from
Jun 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions components/Chat/Message/Message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,9 @@ function ChatMessage({ message, colorScheme, isGroup, isFrame }: Props) {
{message.dateChange && (
<Text style={styles.date}>{getRelativeDate(message.sent)}</Text>
)}
{isGroup && !message.fromMe && <MessageSender message={message} />}
{isGroup && !message.fromMe && !showInBubble && !isGroupUpdated && (
<MessageSender message={message} />
)}
{!showInBubble && messageContent}
{showInBubble && (
<Swipeable
Expand Down Expand Up @@ -248,7 +250,7 @@ function ChatMessage({ message, colorScheme, isGroup, isFrame }: Props) {
<MessageSenderAvatar message={message} />
)}
<View style={{ flex: 1 }}>
{isGroup && !message.fromMe && (
{isGroup && !message.fromMe && showInBubble && (
<MessageSender message={message} />
)}
<View
Expand Down Expand Up @@ -362,7 +364,7 @@ function ChatMessage({ message, colorScheme, isGroup, isFrame }: Props) {
onPress={() => handleUrlPress(message.content)}
style={{ flex: 1 }}
>
<Text style={[styles.linkToFrame]}>
<Text style={styles.linkToFrame}>
{getUrlToRender(message.content)}
</Text>
</TouchableOpacity>
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ install! 'cocoapods',

# Version must match version from XMTP Podspec (matching @xmtp/react-native-sdk from package.json)
# https://github.com/xmtp/xmtp-react-native/blob/v1.34.0-beta.5/ios/XMTPReactNative.podspec#L29
$xmtpVersion = '0.12.1'
$xmtpVersion = '0.12.2'

# Pinning MMKV to 1.3.3 that has included that fix https://github.com/Tencent/MMKV/pull/1222#issuecomment-1905164314
$mmkvVersion = '1.3.3'
Expand Down
26 changes: 13 additions & 13 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ PODS:
- libwebp/sharpyuv (1.3.2)
- libwebp/webp (1.3.2):
- libwebp/sharpyuv
- LibXMTP (0.5.2-beta0)
- LibXMTP (0.5.3-beta0)
- Logging (1.0.0)
- MessagePacker (0.4.7)
- MMKV (1.3.3):
Expand Down Expand Up @@ -1337,16 +1337,16 @@ PODS:
- GenericJSON (~> 2.0)
- Logging (~> 1.0.0)
- secp256k1.swift (~> 0.1)
- XMTP (0.12.1):
- XMTP (0.12.2):
- Connect-Swift (= 0.12.0)
- GzipSwift
- LibXMTP (= 0.5.2-beta0)
- LibXMTP (= 0.5.3-beta0)
- web3.swift
- XMTPReactNative (1.34.0-beta.14):
- XMTPReactNative (1.34.0-beta.15):
- ExpoModulesCore
- MessagePacker
- secp256k1.swift
- XMTP (= 0.12.1)
- XMTP (= 0.12.2)
- Yoga (1.14.0)

DEPENDENCIES:
Expand Down Expand Up @@ -1468,7 +1468,7 @@ DEPENDENCIES:
- Sentry/HybridSDK (= 8.29.1)
- SQLite.swift
- UMAppLoader (from `../node_modules/unimodules-app-loader/ios`)
- XMTP (= 0.12.1)
- XMTP (= 0.12.2)
- "XMTPReactNative (from `../node_modules/@xmtp/react-native-sdk/ios`)"
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)

Expand Down Expand Up @@ -1785,7 +1785,7 @@ SPEC CHECKSUMS:
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
libvmaf: 27f523f1e63c694d14d534cd0fddd2fab0ae8711
libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
LibXMTP: b56bf1afe38e21e967d6b3c8d840a41164ffdb64
LibXMTP: c3d7b5cfa4b8df5c57ef01f09358c87dea299a13
Logging: 9ef4ecb546ad3169398d5a723bc9bea1c46bef26
MessagePacker: ab2fe250e86ea7aedd1a9ee47a37083edd41fd02
MMKV: f902fb6719da13c2ab0965233d8963a59416f911
Expand Down Expand Up @@ -1857,7 +1857,7 @@ SPEC CHECKSUMS:
RNReactNativeSharedGroupPreferences: de0121a4224c267bc7e9fb16c398f3f087c8da81
RNReanimated: 548d4cb6785a032be887c66433082155d12baba0
RNScreens: a4d9ce8f68f833f4e42410140eafd88e38bba163
RNSentry: 906151a5ec2887a48af16d11ad635249d7a5a59b
RNSentry: e9aa15bb2f3e18c822c002eea13bbd3b222ab493
RNSVG: ba3e7232f45e34b7b47e74472386cf4e1a676d0a
SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
SDWebImageAVIFCoder: 8348fef6d0ec69e129c66c9fe4d74fbfbf366112
Expand All @@ -1871,10 +1871,10 @@ SPEC CHECKSUMS:
SwiftProtobuf: 407a385e97fd206c4fbe880cc84123989167e0d1
UMAppLoader: 79d3ee6aa2447a1fe2e8b0d07acf2de106e55b58
web3.swift: 2263d1e12e121b2c42ffb63a5a7beb1acaf33959
XMTP: 5e28d39dd43b9f8b85861b09cce47efce1da2d8e
XMTPReactNative: c577c25169194f6f8a808c1e20f6d3263779779c
Yoga: 805bf71192903b20fc14babe48080582fee65a80
XMTP: 1a25f62cf29a9ba87a879b8c85062c497c9c813f
XMTPReactNative: 7d2fdf28a53292cf7a8491b188d8504ff414377e
Yoga: d17d2cc8105eed528474683b42e2ea310e1daf61

PODFILE CHECKSUM: 29022ef095716f8eaca7371481f2032a2a593386
PODFILE CHECKSUM: cb52bedac815df7739123f1017d51a5993df540c

COCOAPODS: 1.12.1
COCOAPODS: 1.15.2
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"@xmtp/content-type-transaction-reference": "^1.0.3",
"@xmtp/frames-client": "^0.5.0",
"@xmtp/proto": "^3.60.0",
"@xmtp/react-native-sdk": "^1.34.0-beta.14",
"@xmtp/react-native-sdk": "^1.34.0-beta.15",
"@xmtp/xmtp-js": "11.5.0",
"axios": "^1.2.1",
"babel-plugin-transform-remove-console": "^6.9.4",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11171,10 +11171,10 @@
rxjs "^7.8.0"
undici "^5.8.1"

"@xmtp/react-native-sdk@^1.34.0-beta.14":
version "1.34.0-beta.14"
resolved "https://registry.yarnpkg.com/@xmtp/react-native-sdk/-/react-native-sdk-1.34.0-beta.14.tgz#dbd964c68f6df742aa550f139ea2e0a2c2ec5743"
integrity sha512-ph2f8vrEpdy68o+a2iRfk9LuD35PObizZ7TEYu9UfPzpNsEN5Dq+KfmMkfW+6OLw7SlaXrJJqnwEDTInwWkdbg==
"@xmtp/react-native-sdk@^1.34.0-beta.15":
version "1.34.0-beta.15"
resolved "https://registry.yarnpkg.com/@xmtp/react-native-sdk/-/react-native-sdk-1.34.0-beta.15.tgz#797da9e9044d6d866a2a62c46518d1614abcf360"
integrity sha512-9ZiIkp3FXvOmP5o1jkG0T0KrVtz9+dwUzsXec8oiT5067STykcehQU5NH4+JPyYCRBWXuIsPL6PRmpxzlLR5KA==
dependencies:
"@ethersproject/bytes" "^5.7.0"
"@msgpack/msgpack" "^3.0.0-beta2"
Expand Down
Loading