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

fix: archive icon name and export, swipeable usage in sample app #2913

Merged
merged 3 commits into from
Jan 29, 2025
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
5 changes: 0 additions & 5 deletions examples/SampleApp/src/ChatUsers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import { UserResponse } from 'stream-chat';
import { StreamChatGenerics } from './types';

export const USER_TOKENS: Record<string, string> = {
luke_skywalker:
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoibHVrZV9za3l3YWxrZXIifQ.kFSLHRB5X62t0Zlc7nwczWUfsQMwfkpylC6jCUZ6Mc0',
e2etest1:
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiZTJldGVzdDEifQ.XlQOw8nl7fFzHoBkEiTcYGkNo5r7EBYA40LABGOk4hc',
e2etest2:
Expand All @@ -30,9 +28,6 @@ export const USER_TOKENS: Record<string, string> = {
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoicm9kb2xwaGUifQ.tLl-I8ADBhTKB-x5FB9jK4-am0dELLXgydM6VN9rTL8',
};
export const USERS: Record<string, UserResponse<StreamChatGenerics>> = {
luke_skywalker: {
id: 'luke_skywalker',
},
neil: {
id: 'neil',
image: 'https://ca.slack-edge.com/T02RM6X6B-U01173D1D5J-0dead6eea6ea-512',
Expand Down
6 changes: 3 additions & 3 deletions examples/SampleApp/src/components/ChannelInfoOverlay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {
import { useAppOverlayContext } from '../context/AppOverlayContext';
import { useBottomSheetOverlayContext } from '../context/BottomSheetOverlayContext';
import { useChannelInfoOverlayContext } from '../context/ChannelInfoOverlayContext';
import { Archieve } from '../icons/Archieve';
import { Archive } from '../icons/Archive';
import { Pin } from '../icons/Pin';

dayjs.extend(relativeTime);
Expand Down Expand Up @@ -422,10 +422,10 @@ export const ChannelInfoOverlay = (props: ChannelInfoOverlayProps) => {
]}
>
<View style={styles.rowInner}>
<Archieve height={24} width={24} />
<Archive height={24} width={24} />
</View>
<Text style={[styles.rowText, { color: black }]}>
{membership?.archived_at ? 'Unarchieve' : 'Archieve'}
{membership?.archived_at ? 'Unarchive' : 'Archive'}
</Text>
</View>
</TapGestureHandler>
Expand Down
2 changes: 1 addition & 1 deletion examples/SampleApp/src/components/ChannelPreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { StyleSheet, View } from 'react-native';
import { useNavigation } from '@react-navigation/native';
import { RectButton } from 'react-native-gesture-handler';
import Swipeable from 'react-native-gesture-handler/ReanimatedSwipeable';
import Swipeable from 'react-native-gesture-handler/Swipeable';
import {
ChannelPreviewMessenger,
ChannelPreviewMessengerProps,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useTheme } from 'stream-chat-react-native';

import { IconProps } from '../utils/base';

export const Archieve: React.FC<IconProps> = ({ height = 512, width = 512 }) => {
export const Archive: React.FC<IconProps> = ({ height = 512, width = 512 }) => {
const {
theme: {
colors: { grey },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import { StyleSheet, TouchableOpacity, View } from 'react-native';
import { StyleSheet, View } from 'react-native';
import { TouchableOpacity } from 'react-native-gesture-handler';
isekovanic marked this conversation as resolved.
Show resolved Hide resolved
isekovanic marked this conversation as resolved.
Show resolved Hide resolved

import { ChannelAvatar } from './ChannelAvatar';
import type { ChannelPreviewProps } from './ChannelPreview';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Svg, { Path } from 'react-native-svg';

import { IconProps } from './utils/base';

export const Archieve: React.FC<IconProps> = ({ height = 512, width = 512, ...rest }) => (
export const Archive: React.FC<IconProps> = ({ height = 512, width = 512, ...rest }) => (
<Svg height={height} viewBox={'0 0 512 512'} width={width} {...rest}>
<Path d='M32 32l448 0c17.7 0 32 14.3 32 32l0 32c0 17.7-14.3 32-32 32L32 128C14.3 128 0 113.7 0 96L0 64C0 46.3 14.3 32 32 32zm0 128l448 0 0 256c0 35.3-28.7 64-64 64L96 480c-35.3 0-64-28.7-64-64l0-256zm128 80c0 8.8 7.2 16 16 16l160 0c8.8 0 16-7.2 16-16s-7.2-16-16-16l-160 0c-8.8 0-16 7.2-16 16z' />
</Svg>
Expand Down
2 changes: 1 addition & 1 deletion package/src/icons/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export * from './utils/base';

export * from './Archieve';
export * from './Archive';
export * from './ArrowRight';
export * from './ArrowLeft';
export * from './ArrowUp';
Expand Down
Loading