From d94615d07d186d49c1ccb4b2d0c01be11180dd63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 6 Sep 2023 00:30:25 +0900 Subject: [PATCH 1/4] change route to teachersunite for the campaign --- src/ROUTES.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ROUTES.js b/src/ROUTES.js index b38ce25f590f..bff46cf25045 100644 --- a/src/ROUTES.js +++ b/src/ROUTES.js @@ -129,10 +129,10 @@ export default { FLAG_COMMENT: `flag/:reportID/:reportActionID`, getFlagCommentRoute: (reportID, reportActionID) => `flag/${reportID}/${reportActionID}`, SEARCH: 'search', - SAVE_THE_WORLD: 'save-the-world', - I_KNOW_A_TEACHER: 'save-the-world/i-know-a-teacher', - INTRO_SCHOOL_PRINCIPAL: 'save-the-world/intro-school-principal', - I_AM_A_TEACHER: 'save-the-world/i-am-a-teacher', + SAVE_THE_WORLD: 'teachersunite', + I_KNOW_A_TEACHER: 'teachersunite/i-know-a-teacher', + INTRO_SCHOOL_PRINCIPAL: 'teachersunite/intro-school-principal', + I_AM_A_TEACHER: 'teachersunite/i-am-a-teacher', DETAILS: 'details', getDetailsRoute: (login) => `details?login=${encodeURIComponent(login)}`, PROFILE: 'a/:accountID', From fd6b500c66c9b12f75be4adab8070f92395641e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 6 Sep 2023 00:30:44 +0900 Subject: [PATCH 2/4] add deep link for teachers unite campaign --- .well-known/apple-app-site-association | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.well-known/apple-app-site-association b/.well-known/apple-app-site-association index 9274dd8c1382..d2c447cf2a49 100644 --- a/.well-known/apple-app-site-association +++ b/.well-known/apple-app-site-association @@ -63,6 +63,10 @@ { "/": "/new/*", "comment": "New Chat" + }, + { + "/": "/teachersunite/*", + "comment": "Teachers Unite!" } ] } From acd97b1da449b552c6afdc96580a437b8840fd3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 6 Sep 2023 00:33:33 +0900 Subject: [PATCH 3/4] change const name SAVE_THE_WORLD to TEACHERS_UNITE --- src/ROUTES.js | 2 +- src/libs/Navigation/linkingConfig.js | 2 +- src/pages/TeachersUnite/ImTeacherPage.js | 2 +- src/pages/TeachersUnite/IntroSchoolPrincipalPage.js | 2 +- src/pages/TeachersUnite/KnowATeacherPage.js | 2 +- .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ROUTES.js b/src/ROUTES.js index bff46cf25045..6d9ba099911d 100644 --- a/src/ROUTES.js +++ b/src/ROUTES.js @@ -129,7 +129,7 @@ export default { FLAG_COMMENT: `flag/:reportID/:reportActionID`, getFlagCommentRoute: (reportID, reportActionID) => `flag/${reportID}/${reportActionID}`, SEARCH: 'search', - SAVE_THE_WORLD: 'teachersunite', + TEACHERS_UNITE: 'teachersunite', I_KNOW_A_TEACHER: 'teachersunite/i-know-a-teacher', INTRO_SCHOOL_PRINCIPAL: 'teachersunite/intro-school-principal', I_AM_A_TEACHER: 'teachersunite/i-am-a-teacher', diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js index ee3054e02f96..89caab4d733f 100644 --- a/src/libs/Navigation/linkingConfig.js +++ b/src/libs/Navigation/linkingConfig.js @@ -265,7 +265,7 @@ export default { }, TeachersUnite: { screens: { - SaveTheWorld_Root: ROUTES.SAVE_THE_WORLD, + SaveTheWorld_Root: ROUTES.TEACHERS_UNITE, I_Know_A_Teacher: ROUTES.I_KNOW_A_TEACHER, Intro_School_Principal: ROUTES.INTRO_SCHOOL_PRINCIPAL, I_Am_A_Teacher: ROUTES.I_AM_A_TEACHER, diff --git a/src/pages/TeachersUnite/ImTeacherPage.js b/src/pages/TeachersUnite/ImTeacherPage.js index f077c7724978..dbeba700d208 100644 --- a/src/pages/TeachersUnite/ImTeacherPage.js +++ b/src/pages/TeachersUnite/ImTeacherPage.js @@ -22,7 +22,7 @@ function ImTeacherPage() { Navigation.goBack(ROUTES.SAVE_THE_WORLD)} + onBackButtonPress={() => Navigation.goBack(ROUTES.TEACHERS_UNITE)} /> Navigation.goBack(ROUTES.SAVE_THE_WORLD)} + onBackButtonPress={() => Navigation.goBack(ROUTES.TEACHERS_UNITE)} />
Navigation.goBack(ROUTES.SAVE_THE_WORLD)} + onBackButtonPress={() => Navigation.goBack(ROUTES.TEACHERS_UNITE)} /> interceptAnonymousUser(() => Navigation.navigate(ROUTES.SAVE_THE_WORLD)), + onSelected: () => interceptAnonymousUser(() => Navigation.navigate(ROUTES.TEACHERS_UNITE)), }, { icon: Expensicons.Receipt, From 10c41da000bb36d46da014111921b04ddadae50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 13 Sep 2023 13:38:53 +0800 Subject: [PATCH 4/4] moving the workspace route to its original place --- .well-known/apple-app-site-association | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.well-known/apple-app-site-association b/.well-known/apple-app-site-association index 9097ad8f5be7..c871764117ed 100644 --- a/.well-known/apple-app-site-association +++ b/.well-known/apple-app-site-association @@ -64,13 +64,13 @@ "/": "/new/*", "comment": "New Chat" }, - { - "/": "/teachersunite/*", - "comment": "Teachers Unite!" - }, { "/": "/workspace/*", "comment": "Workspace Details" + }, + { + "/": "/teachersunite/*", + "comment": "Teachers Unite!" } ] }