Skip to content

Commit

Permalink
Merge pull request #4013 from tloncorp/promote-6.4.1
Browse files Browse the repository at this point in the history
ops: promote 6.4.1
  • Loading branch information
arthyn authored Oct 4, 2024
2 parents 4dbe81c + 0f29674 commit 037a8fa
Show file tree
Hide file tree
Showing 134 changed files with 4,599 additions and 3,034 deletions.
212 changes: 97 additions & 115 deletions apps/tlon-mobile/cosmos.imports.ts
Original file line number Diff line number Diff line change
@@ -1,65 +1,67 @@
// This file is automatically generated by Cosmos. Add it to .gitignore and
// only edit if you know what you're doing.

import { RendererConfig, UserModuleWrappers } from 'react-cosmos-core';

import * as fixture0 from './src/App.fixture';
import * as fixture52 from './src/fixtures/ActionSheet/AddGalleryPostSheet.fixture';
import * as fixture51 from './src/fixtures/ActionSheet/AttachmentSheet.fixture';
import * as fixture50 from './src/fixtures/ActionSheet/ChannelSortActionsSheet.fixture';
import * as fixture49 from './src/fixtures/ActionSheet/CreateChannelSheet.fixture';
import * as fixture48 from './src/fixtures/ActionSheet/DeleteSheet.fixture';
import * as fixture47 from './src/fixtures/ActionSheet/EditSectionNameSheet.fixture';
import * as fixture46 from './src/fixtures/ActionSheet/GenericActionSheet.fixture';
import * as fixture45 from './src/fixtures/ActionSheet/GroupJoinRequestSheet.fixture';
import * as fixture44 from './src/fixtures/ActionSheet/GroupPreviewSheet.fixture';
import * as fixture43 from './src/fixtures/ActionSheet/ProfileSheet.fixture';
import * as fixture42 from './src/fixtures/ActionSheet/SendPostRetrySheet.fixture';
import * as fixture38 from './src/fixtures/Activity.fixture';
import * as fixture37 from './src/fixtures/AddGroupSheet.fixture';
import * as fixture36 from './src/fixtures/AttachmentPreviewList.fixture';
import * as fixture35 from './src/fixtures/AudioEmbed.fixture';
import * as fixture34 from './src/fixtures/Avatar.fixture';
import * as fixture33 from './src/fixtures/BlockSectionList.fixture';
import * as fixture32 from './src/fixtures/Button.fixture';
import * as fixture31 from './src/fixtures/Channel.fixture';
import * as fixture30 from './src/fixtures/ChannelDivider.fixture';
import * as fixture29 from './src/fixtures/ChannelHeader.fixture';
import * as fixture28 from './src/fixtures/ChannelSwitcherSheet.fixture';
import * as fixture27 from './src/fixtures/ChatMessage.fixture';
import * as fixture26 from './src/fixtures/ContactList.fixture';
import * as fixture25 from './src/fixtures/CreateGroup.fixture';
import * as fixture41 from './src/fixtures/DetailView/ChatDetailView.fixture';
import * as fixture40 from './src/fixtures/DetailView/GalleryDetailView.fixture';
import * as fixture39 from './src/fixtures/DetailView/NotebookDetailView.fixture';
import * as fixture24 from './src/fixtures/FindGroups.fixture';
import * as fixture23 from './src/fixtures/Form.fixture';
import * as fixture22 from './src/fixtures/GalleryPost.fixture';
import * as fixture21 from './src/fixtures/GroupList.fixture';
import * as fixture20 from './src/fixtures/GroupListItem.fixture';
import * as fixture19 from './src/fixtures/ImageViewer.fixture';
import * as fixture18 from './src/fixtures/Input.fixture';
import * as fixture17 from './src/fixtures/InputToolbar.fixture';
import * as fixture16 from './src/fixtures/InviteUsersSheet.fixture';
import * as fixture15 from './src/fixtures/MessageActions.fixture';
import * as fixture14 from './src/fixtures/MessageInput.fixture';
import * as fixture13 from './src/fixtures/MetaEditorScreen.fixture';
import * as fixture12 from './src/fixtures/OutsideEmbed.fixture';
import * as fixture11 from './src/fixtures/PostReference.fixture';
import * as fixture10 from './src/fixtures/PostScreen.fixture';
import * as fixture9 from './src/fixtures/ProfileBlock.fixture';
import * as fixture8 from './src/fixtures/ProfileSheet.fixture';
import * as fixture7 from './src/fixtures/ReferenceSkeleton.fixture';
import * as fixture6 from './src/fixtures/ScreenHeader.fixture';
import * as fixture5 from './src/fixtures/SearchBar.fixture';
import * as fixture4 from './src/fixtures/Text.fixture';
import * as fixture3 from './src/fixtures/UserProfileScreen.fixture';
import * as fixture2 from './src/fixtures/VideoEmbed.fixture';
import * as fixture1 from './src/fixtures/ViewReactionsSheet.fixture';
import * as fixture2 from './src/fixtures/VideoEmbed.fixture';
import * as fixture3 from './src/fixtures/UserProfileScreen.fixture';
import * as fixture4 from './src/fixtures/Text.fixture';
import * as fixture5 from './src/fixtures/SearchBar.fixture';
import * as fixture6 from './src/fixtures/ScreenHeader.fixture';
import * as fixture7 from './src/fixtures/ReferenceSkeleton.fixture';
import * as fixture8 from './src/fixtures/ProfileSheet.fixture';
import * as fixture9 from './src/fixtures/ProfileBlock.fixture';
import * as fixture10 from './src/fixtures/PostScreen.fixture';
import * as fixture11 from './src/fixtures/PostReference.fixture';
import * as fixture12 from './src/fixtures/ParentAgnosticKeyboardAvoidingView.fixture';
import * as fixture13 from './src/fixtures/OutsideEmbed.fixture';
import * as fixture14 from './src/fixtures/MetaEditorScreen.fixture';
import * as fixture15 from './src/fixtures/MessageInput.fixture';
import * as fixture16 from './src/fixtures/MessageActions.fixture';
import * as fixture17 from './src/fixtures/InviteUsersSheet.fixture';
import * as fixture18 from './src/fixtures/InputToolbar.fixture';
import * as fixture19 from './src/fixtures/Input.fixture';
import * as fixture20 from './src/fixtures/ImageViewer.fixture';
import * as fixture21 from './src/fixtures/GroupListItem.fixture';
import * as fixture22 from './src/fixtures/GroupList.fixture';
import * as fixture23 from './src/fixtures/GalleryPost.fixture';
import * as fixture24 from './src/fixtures/Form.fixture';
import * as fixture25 from './src/fixtures/FindGroups.fixture';
import * as fixture26 from './src/fixtures/CreateGroup.fixture';
import * as fixture27 from './src/fixtures/ContactList.fixture';
import * as fixture28 from './src/fixtures/ChatMessage.fixture';
import * as fixture29 from './src/fixtures/ChannelSwitcherSheet.fixture';
import * as fixture30 from './src/fixtures/ChannelHeader.fixture';
import * as fixture31 from './src/fixtures/ChannelDivider.fixture';
import * as fixture32 from './src/fixtures/Channel.fixture';
import * as fixture33 from './src/fixtures/Button.fixture';
import * as fixture34 from './src/fixtures/BlockSectionList.fixture';
import * as fixture35 from './src/fixtures/Avatar.fixture';
import * as fixture36 from './src/fixtures/AudioEmbed.fixture';
import * as fixture37 from './src/fixtures/AttachmentPreviewList.fixture';
import * as fixture38 from './src/fixtures/AddGroupSheet.fixture';
import * as fixture39 from './src/fixtures/Activity.fixture';
import * as fixture40 from './src/fixtures/DetailView/NotebookDetailView.fixture';
import * as fixture41 from './src/fixtures/DetailView/GalleryDetailView.fixture';
import * as fixture42 from './src/fixtures/DetailView/ChatDetailView.fixture';
import * as fixture43 from './src/fixtures/ActionSheet/SendPostRetrySheet.fixture';
import * as fixture44 from './src/fixtures/ActionSheet/ProfileSheet.fixture';
import * as fixture45 from './src/fixtures/ActionSheet/GroupPreviewSheet.fixture';
import * as fixture46 from './src/fixtures/ActionSheet/GroupJoinRequestSheet.fixture';
import * as fixture47 from './src/fixtures/ActionSheet/GenericActionSheet.fixture';
import * as fixture48 from './src/fixtures/ActionSheet/EditSectionNameSheet.fixture';
import * as fixture49 from './src/fixtures/ActionSheet/DeleteSheet.fixture';
import * as fixture50 from './src/fixtures/ActionSheet/CreateChannelSheet.fixture';
import * as fixture51 from './src/fixtures/ActionSheet/AttachmentSheet.fixture';
import * as fixture52 from './src/fixtures/ActionSheet/AddGalleryPostSheet.fixture';

import * as decorator0 from './src/fixtures/cosmos.decorator';

export const rendererConfig: RendererConfig = {
playgroundUrl: 'http://localhost:5000',
rendererUrl: null,
"playgroundUrl": "http://localhost:5001",
"rendererUrl": null
};

const fixtures = {
Expand All @@ -75,75 +77,55 @@ const fixtures = {
'src/fixtures/ProfileBlock.fixture.tsx': { module: fixture9 },
'src/fixtures/PostScreen.fixture.tsx': { module: fixture10 },
'src/fixtures/PostReference.fixture.tsx': { module: fixture11 },
'src/fixtures/OutsideEmbed.fixture.tsx': { module: fixture12 },
'src/fixtures/MetaEditorScreen.fixture.tsx': { module: fixture13 },
'src/fixtures/MessageInput.fixture.tsx': { module: fixture14 },
'src/fixtures/MessageActions.fixture.tsx': { module: fixture15 },
'src/fixtures/InviteUsersSheet.fixture.tsx': { module: fixture16 },
'src/fixtures/InputToolbar.fixture.tsx': { module: fixture17 },
'src/fixtures/Input.fixture.tsx': { module: fixture18 },
'src/fixtures/ImageViewer.fixture.tsx': { module: fixture19 },
'src/fixtures/GroupListItem.fixture.tsx': { module: fixture20 },
'src/fixtures/GroupList.fixture.tsx': { module: fixture21 },
'src/fixtures/GalleryPost.fixture.tsx': { module: fixture22 },
'src/fixtures/Form.fixture.tsx': { module: fixture23 },
'src/fixtures/FindGroups.fixture.tsx': { module: fixture24 },
'src/fixtures/CreateGroup.fixture.tsx': { module: fixture25 },
'src/fixtures/ContactList.fixture.tsx': { module: fixture26 },
'src/fixtures/ChatMessage.fixture.tsx': { module: fixture27 },
'src/fixtures/ChannelSwitcherSheet.fixture.tsx': { module: fixture28 },
'src/fixtures/ChannelHeader.fixture.tsx': { module: fixture29 },
'src/fixtures/ChannelDivider.fixture.tsx': { module: fixture30 },
'src/fixtures/Channel.fixture.tsx': { module: fixture31 },
'src/fixtures/Button.fixture.tsx': { module: fixture32 },
'src/fixtures/BlockSectionList.fixture.tsx': { module: fixture33 },
'src/fixtures/Avatar.fixture.tsx': { module: fixture34 },
'src/fixtures/AudioEmbed.fixture.tsx': { module: fixture35 },
'src/fixtures/AttachmentPreviewList.fixture.tsx': { module: fixture36 },
'src/fixtures/AddGroupSheet.fixture.tsx': { module: fixture37 },
'src/fixtures/Activity.fixture.tsx': { module: fixture38 },
'src/fixtures/DetailView/NotebookDetailView.fixture.tsx': {
module: fixture39,
},
'src/fixtures/DetailView/GalleryDetailView.fixture.tsx': {
module: fixture40,
},
'src/fixtures/DetailView/ChatDetailView.fixture.tsx': { module: fixture41 },
'src/fixtures/ActionSheet/SendPostRetrySheet.fixture.tsx': {
module: fixture42,
},
'src/fixtures/ActionSheet/ProfileSheet.fixture.tsx': { module: fixture43 },
'src/fixtures/ActionSheet/GroupPreviewSheet.fixture.tsx': {
module: fixture44,
},
'src/fixtures/ActionSheet/GroupJoinRequestSheet.fixture.tsx': {
module: fixture45,
},
'src/fixtures/ActionSheet/GenericActionSheet.fixture.tsx': {
module: fixture46,
},
'src/fixtures/ActionSheet/EditSectionNameSheet.fixture.tsx': {
module: fixture47,
},
'src/fixtures/ActionSheet/DeleteSheet.fixture.tsx': { module: fixture48 },
'src/fixtures/ActionSheet/CreateChannelSheet.fixture.tsx': {
module: fixture49,
},
'src/fixtures/ActionSheet/ChannelSortActionsSheet.fixture.tsx': {
module: fixture50,
},
'src/fixtures/ParentAgnosticKeyboardAvoidingView.fixture.tsx': { module: fixture12 },
'src/fixtures/OutsideEmbed.fixture.tsx': { module: fixture13 },
'src/fixtures/MetaEditorScreen.fixture.tsx': { module: fixture14 },
'src/fixtures/MessageInput.fixture.tsx': { module: fixture15 },
'src/fixtures/MessageActions.fixture.tsx': { module: fixture16 },
'src/fixtures/InviteUsersSheet.fixture.tsx': { module: fixture17 },
'src/fixtures/InputToolbar.fixture.tsx': { module: fixture18 },
'src/fixtures/Input.fixture.tsx': { module: fixture19 },
'src/fixtures/ImageViewer.fixture.tsx': { module: fixture20 },
'src/fixtures/GroupListItem.fixture.tsx': { module: fixture21 },
'src/fixtures/GroupList.fixture.tsx': { module: fixture22 },
'src/fixtures/GalleryPost.fixture.tsx': { module: fixture23 },
'src/fixtures/Form.fixture.tsx': { module: fixture24 },
'src/fixtures/FindGroups.fixture.tsx': { module: fixture25 },
'src/fixtures/CreateGroup.fixture.tsx': { module: fixture26 },
'src/fixtures/ContactList.fixture.tsx': { module: fixture27 },
'src/fixtures/ChatMessage.fixture.tsx': { module: fixture28 },
'src/fixtures/ChannelSwitcherSheet.fixture.tsx': { module: fixture29 },
'src/fixtures/ChannelHeader.fixture.tsx': { module: fixture30 },
'src/fixtures/ChannelDivider.fixture.tsx': { module: fixture31 },
'src/fixtures/Channel.fixture.tsx': { module: fixture32 },
'src/fixtures/Button.fixture.tsx': { module: fixture33 },
'src/fixtures/BlockSectionList.fixture.tsx': { module: fixture34 },
'src/fixtures/Avatar.fixture.tsx': { module: fixture35 },
'src/fixtures/AudioEmbed.fixture.tsx': { module: fixture36 },
'src/fixtures/AttachmentPreviewList.fixture.tsx': { module: fixture37 },
'src/fixtures/AddGroupSheet.fixture.tsx': { module: fixture38 },
'src/fixtures/Activity.fixture.tsx': { module: fixture39 },
'src/fixtures/DetailView/NotebookDetailView.fixture.tsx': { module: fixture40 },
'src/fixtures/DetailView/GalleryDetailView.fixture.tsx': { module: fixture41 },
'src/fixtures/DetailView/ChatDetailView.fixture.tsx': { module: fixture42 },
'src/fixtures/ActionSheet/SendPostRetrySheet.fixture.tsx': { module: fixture43 },
'src/fixtures/ActionSheet/ProfileSheet.fixture.tsx': { module: fixture44 },
'src/fixtures/ActionSheet/GroupPreviewSheet.fixture.tsx': { module: fixture45 },
'src/fixtures/ActionSheet/GroupJoinRequestSheet.fixture.tsx': { module: fixture46 },
'src/fixtures/ActionSheet/GenericActionSheet.fixture.tsx': { module: fixture47 },
'src/fixtures/ActionSheet/EditSectionNameSheet.fixture.tsx': { module: fixture48 },
'src/fixtures/ActionSheet/DeleteSheet.fixture.tsx': { module: fixture49 },
'src/fixtures/ActionSheet/CreateChannelSheet.fixture.tsx': { module: fixture50 },
'src/fixtures/ActionSheet/AttachmentSheet.fixture.tsx': { module: fixture51 },
'src/fixtures/ActionSheet/AddGalleryPostSheet.fixture.tsx': {
module: fixture52,
},
'src/fixtures/ActionSheet/AddGalleryPostSheet.fixture.tsx': { module: fixture52 }
};

const decorators = {
'src/fixtures/cosmos.decorator.tsx': { module: decorator0 },
'src/fixtures/cosmos.decorator.tsx': { module: decorator0 }
};

export const moduleWrappers: UserModuleWrappers = {
lazy: false,
fixtures,
decorators,
decorators
};
10 changes: 8 additions & 2 deletions apps/tlon-mobile/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1356,7 +1356,9 @@ PODS:
- Firebase/Performance (= 10.24.0)
- React-Core
- RNFBApp
- RNGestureHandler (2.18.1):
- RNFlashList (1.6.3):
- React-Core
- RNGestureHandler (2.20.0):
- glog
- RCT-Folly (= 2022.05.16.00)
- React-Core
Expand Down Expand Up @@ -1491,6 +1493,7 @@ DEPENDENCIES:
- "RNFBApp (from `../../../node_modules/@react-native-firebase/app`)"
- "RNFBCrashlytics (from `../../../node_modules/@react-native-firebase/crashlytics`)"
- "RNFBPerf (from `../../../node_modules/@react-native-firebase/perf`)"
- "RNFlashList (from `../../../node_modules/@shopify/flash-list`)"
- RNGestureHandler (from `../../../node_modules/react-native-gesture-handler`)
- RNReanimated (from `../../../node_modules/react-native-reanimated`)
- RNScreens (from `../../../node_modules/react-native-screens`)
Expand Down Expand Up @@ -1725,6 +1728,8 @@ EXTERNAL SOURCES:
:path: "../../../node_modules/@react-native-firebase/crashlytics"
RNFBPerf:
:path: "../../../node_modules/@react-native-firebase/perf"
RNFlashList:
:path: "../../../node_modules/@shopify/flash-list"
RNGestureHandler:
:path: "../../../node_modules/react-native-gesture-handler"
RNReanimated:
Expand Down Expand Up @@ -1862,7 +1867,8 @@ SPEC CHECKSUMS:
RNFBApp: 91311b27bc9a33e23b76a62825afd1635501018a
RNFBCrashlytics: c3219ef7a0c779f2428236215781c38e7892f6f9
RNFBPerf: 2c926ff255c704a644dd53572008cba47c67ada0
RNGestureHandler: 9a413b04f827e0169f0f9f97a845c266da61f87c
RNFlashList: 4b4b6b093afc0df60ae08f9cbf6ccd4c836c667a
RNGestureHandler: 79c035e2243d3b7f4f353e7eb32869eace6b596c
RNReanimated: 4b1bce37b188450e3a2d03c925edd5fb11d4bb2d
RNScreens: a4d9ce8f68f833f4e42410140eafd88e38bba163
RNSVG: 3f65a03e0c61a8495dee92bf82545ed9041cbf3b
Expand Down
7 changes: 4 additions & 3 deletions apps/tlon-mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"@react-navigation/bottom-tabs": "^6.5.12",
"@react-navigation/native": "^6.1.7",
"@react-navigation/native-stack": "^6.9.13",
"@shopify/flash-list": "1.6.3",
"@tanstack/react-query": "~5.32.1",
"@tloncorp/app": "workspace:*",
"@tloncorp/editor": "workspace:*",
Expand Down Expand Up @@ -98,7 +99,7 @@
"react-native-country-codes-picker": "^2.3.3",
"react-native-device-info": "^10.8.0",
"react-native-fetch-api": "^3.0.0",
"react-native-gesture-handler": "~2.18.0",
"react-native-gesture-handler": "~2.20.0",
"react-native-get-random-values": "^1.11.0",
"react-native-phone-input": "^1.3.7",
"react-native-polyfill-globals": "^3.1.0",
Expand All @@ -120,12 +121,12 @@
"@faker-js/faker": "^8.4.1",
"@jest/globals": "^29.7.0",
"@react-native/metro-config": "^0.73.5",
"@tamagui/babel-plugin": "1.101.3",
"@tamagui/babel-plugin": "~1.112.12",
"@testing-library/react-native": "^12.5.2",
"@trivago/prettier-plugin-sort-imports": "^4.2.0",
"@types/react": "^18.2.55",
"@types/tmp": "^0.2.6",
"@types/seedrandom": "^3.0.5",
"@types/tmp": "^0.2.6",
"babel-plugin-inline-import": "^3.0.0",
"babel-preset-expo": "^10.0.0",
"better-sqlite3": "~9.4.3",
Expand Down
5 changes: 5 additions & 0 deletions apps/tlon-mobile/src/App.main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import AuthenticatedApp from './components/AuthenticatedApp';
import { CheckVerifyScreen } from './screens/Onboarding/CheckVerifyScreen';
import { EULAScreen } from './screens/Onboarding/EULAScreen';
import { InventoryCheckScreen } from './screens/Onboarding/InventoryCheckScreen';
import { InviteLinkScreen } from './screens/Onboarding/InviteLinkScreen';
import { JoinWaitListScreen } from './screens/Onboarding/JoinWaitListScreen';
import { RequestPhoneVerifyScreen } from './screens/Onboarding/RequestPhoneVerifyScreen';
import { ReserveShipScreen } from './screens/Onboarding/ReserveShipScreen';
Expand Down Expand Up @@ -110,6 +111,10 @@ const App = ({
component={SignUpEmailScreen}
/>
<OnboardingStack.Screen name="EULA" component={EULAScreen} />
<OnboardingStack.Screen
name="InviteLink"
component={InviteLinkScreen}
/>
<OnboardingStack.Screen
name="InventoryCheck"
component={InventoryCheckScreen}
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion apps/tlon-mobile/src/fixtures/AddGroupSheet.fixture.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { initialContacts } from './fakeData';
export default {
basic: (
<FixtureWrapper>
<AppDataContextProvider contacts={initialContacts}>
<AppDataContextProvider contacts={initialContacts} currentUserId="zod">
<AddGroupSheet
open
onOpenChange={() => {}}
Expand Down
21 changes: 20 additions & 1 deletion apps/tlon-mobile/src/fixtures/Channel.fixture.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
createFakePosts,
group,
initialContacts,
tlonLocalBulletinBoard,
tlonLocalGettingStarted,
tlonLocalIntros,
} from './fakeData';
Expand Down Expand Up @@ -142,6 +143,24 @@ export const ChannelFixture = (props: {
);
};

export const GalleryChannelFixture = (props: { theme?: 'light' | 'dark' }) => {
const switcher = useChannelSwitcher(tlonLocalBulletinBoard);

const [posts] = useState(() => createFakePosts(10, 'block'));

return (
<ChannelFixtureWrapper theme={props.theme}>
<Channel
{...baseProps}
posts={posts}
channel={switcher.activeChannel}
goToChannels={() => switcher.open()}
/>
<SwitcherFixture switcher={switcher} />
</ChannelFixtureWrapper>
);
};

export const NotebookChannelFixture = (props: { theme?: 'light' | 'dark' }) => {
const switcher = useChannelSwitcher(tlonLocalGettingStarted);

Expand All @@ -157,7 +176,6 @@ export const NotebookChannelFixture = (props: { theme?: 'light' | 'dark' }) => {
</ChannelFixtureWrapper>
);
};

const ChannelFixtureWithImage = () => {
const switcher = useChannelSwitcher(tlonLocalIntros);
const [imageAttachment, setImageAttachment] = useState<string | null>(null);
Expand Down Expand Up @@ -493,6 +511,7 @@ export default {
})}
/>
),
gallery: <GalleryChannelFixture />,
notebook: <NotebookChannelFixture />,
chatWithImage: <ChannelFixtureWithImage />,
negotiationMismatch: <ChannelFixture negotiationMatch={false} />,
Expand Down
Loading

0 comments on commit 037a8fa

Please sign in to comment.