Skip to content

Commit f56e3d1

Browse files
Merge remote-tracking branch 'origin/main' into pr-33677
2 parents ae5291d + d1909d6 commit f56e3d1

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎apps/mobile/app.config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ const config: ExpoConfig = {
237237
slug: "t3-code",
238238
platforms: ["ios", "android"],
239239
scheme: variant.scheme,
240-
version: repoEnv.T3CODE_MOBILE_VERSION ?? "2.2.0",
240+
version: repoEnv.T3CODE_MOBILE_VERSION ?? "2.3.0",
241241
runtimeVersion: {
242242
// Skip costly fingerprinting on dev launches; preview and production OTAs require matching native projects.
243243
policy: runtimeVersionPolicy,

‎apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@ const isPullRequestRoute = (route: Route) =>
9090
route.name === "PullRequestFile" ||
9191
route.name === "PullRequestFiles";
9292

93+
// Every step of starting a task, from the project picker to the draft thread itself.
94+
const isNewTaskRoute = (route: Route) =>
95+
route.name.startsWith("NewTask") ||
96+
route.name.startsWith("AddProject") ||
97+
(route.params !== undefined && "draft" in route.params && Boolean(route.params.draft));
98+
9399
/** Beside the list, the first Settings page shows on one native screen that swaps its content. */
94100
const SETTINGS_DETAIL_SCREEN = "settings-detail";
95101

@@ -157,13 +163,7 @@ function ColumnScreen(props: {
157163
options={options}
158164
canGoBack={!props.primary}
159165
column={props.primary ? "primary" : "detail"}
160-
onCompose={
161-
descriptor.route.params &&
162-
"draft" in descriptor.route.params &&
163-
descriptor.route.params.draft
164-
? undefined
165-
: props.onCompose
166-
}
166+
onCompose={isNewTaskRoute(descriptor.route) ? undefined : props.onCompose}
167167
/>
168168
<ColumnContent
169169
primary={sidebar}

0 commit comments

Comments
 (0)