Merge branch 'master' into MBL-17659-implement-e2e-test-for-draft-assignment

# Conflicts:
#	apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/AssignmentsE2ETest.kt
#	apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentComposeTest.kt
#	apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/AssignmentE2ETest.kt
#	automation/espresso/src/main/kotlin/com/instructure/espresso/CustomViewAssertions.kt

Author: kdeakinstructure

.gitignore

@@ -36,8 +36,6 @@ mkmf.log
 parent/app/src/androidTest/java/com/instructure/parentapp/ui/utils/espresso_secrets/
 parent/app/src/androidTest/java/com/instructure/parentapp/ui/data/
 dataseedingapi/out/
-soseedygrpc/out/
-dataseedingapi/src/main/java/com/instructure/soseedy/
 local.properties
 libs/canvas-api-2/target/pacts/
 apps/true/

android-vault

@@ -105,14 +105,17 @@ Provide a user-facing description of changes. This should be:
 
 Complete the following items before marking PR as ready:
 
-- [ ] Dark/light mode testing
-- [ ] Landscape/tablet testing
-- [ ] Accessibility testing
-- [ ] Product approval (if needed)
+- [ ] Follow-up e2e test ticket created or not needed
+- [ ] Run E2E test suite
+- [ ] Tested in dark mode
+- [ ] Tested in light mode
+- [ ] Test in landscape mode and/or tablet
+- [ ] A11y checked
+- [ ] Approve from product
 
 ## Important Notes
 
-- **DO NOT** include E2E tests or screenshots sections unless specifically needed
+- **DO NOT** include this checkbox item "- [ ] Run E2E test suite" or screenshots sections unless specifically needed
 - Always include the `affects:` field to specify which apps are impacted
 - Reference the related issue(s) with `refs:`
 - Complete the checklist before marking the PR as ready for review

apps/.claude/skills/pr/SKILL.md

@@ -78,9 +78,9 @@ class HelpMenuE2ETest : ParentComposeTest() {
         Intents.init()
 
         try {
-            helpPage.assertHelpMenuURL(HelpMenu.SEARCH_GUIDES_TITLE, "https://community.canvaslms.com/t5/Canvas/ct-p/canvas")
+            helpPage.assertHelpMenuURL(HelpMenu.SEARCH_GUIDES_TITLE, "https://community.instructure.com/en/all-guides")
             helpPage.assertHelpMenuURL(HelpMenu.SUBMIT_FEATURE_TITLE, "https://community.canvaslms.com/t5/Idea-Conversations/idb-p/ideas")
-            helpPage.assertHelpMenuURL(HelpMenu.SHARE_LOVE_TITLE, "https://community.canvaslms.com/t5/Canvas/ct-p/canvas")
+            helpPage.assertHelpMenuURL(HelpMenu.SHARE_LOVE_TITLE, "market://details?id=com.instructure.parentapp")
         }
         finally {
             Intents.release()

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/classic/HelpMenuE2ETest.kt

@@ -20,10 +20,10 @@ package com.instructure.parentapp.di.feature
 import com.instructure.canvasapi2.apis.AssignmentAPI
 import com.instructure.canvasapi2.apis.CourseAPI
 import com.instructure.canvasapi2.managers.graphql.CustomGradeStatusesManager
-import com.instructure.pandautils.features.grades.GradesBehaviour
 import com.instructure.pandautils.features.grades.GradesRepository
-import com.instructure.parentapp.features.grades.ParentGradesBehaviour
+import com.instructure.pandautils.features.grades.GradesViewModelBehavior
 import com.instructure.parentapp.features.grades.ParentGradesRepository
+import com.instructure.parentapp.features.grades.ParentGradesViewModelBehavior
 import com.instructure.parentapp.util.ParentPrefs
 import dagger.Module
 import dagger.Provides
@@ -45,9 +45,7 @@ class GradesModule {
     }
 
     @Provides
-    fun provideGradesBehaviour(
-        parentPrefs: ParentPrefs
-    ): GradesBehaviour {
-        return ParentGradesBehaviour(parentPrefs)
+    fun provideGradesViewModelBehavior(): GradesViewModelBehavior {
+        return ParentGradesViewModelBehavior()
     }
 }

apps/parent/src/main/java/com/instructure/parentapp/di/feature/GradesModule.kt

@@ -176,7 +176,8 @@ private fun CourseDetailsScreenContent(
                         applyOnWebView = applyOnWebView,
                         onLtiButtonPressed = {
                             actionHandler(CourseDetailsAction.OnLtiClicked(it))
-                        }
+                        },
+                        baseUrl = uiState.baseUrl
                     )
                 }
             }

apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsScreen.kt

@@ -33,7 +33,8 @@ data class CourseDetailsUiState(
     val tabs: List<TabType> = emptyList(),
     val currentTab: TabType? = null,
     val syllabus: String = "",
-    val snackbarMessage: String? = null
+    val snackbarMessage: String? = null,
+    val baseUrl: String? = null
 )
 
 enum class TabType(@StringRes val labelRes: Int) {

apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsUiState.kt

@@ -21,8 +21,10 @@ import android.content.Context
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Course
 import com.instructure.canvasapi2.models.Tab
+import com.instructure.canvasapi2.models.toBaseUrl
 import com.instructure.canvasapi2.type.EnrollmentType
 import com.instructure.canvasapi2.utils.ApiPrefs
 import com.instructure.canvasapi2.utils.weave.catch
@@ -70,7 +72,8 @@ class CourseDetailsViewModel @Inject constructor(
             _uiState.update {
                 it.copy(
                     isLoading = true,
-                    studentColor = parentPrefs.currentStudent.studentColor
+                    studentColor = parentPrefs.currentStudent.studentColor,
+                    baseUrl = CanvasContext.emptyCourseContext(courseId).toBaseUrl()
                 )
             }
 

apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsViewModel.kt

@@ -44,7 +44,8 @@ internal fun CourseDetailsWebViewScreen(
     studentColor: Int,
     onRefresh: () -> Unit,
     applyOnWebView: (CanvasWebView) -> Unit,
-    onLtiButtonPressed: (String) -> Unit
+    onLtiButtonPressed: (String) -> Unit,
+    baseUrl: String? = null
 ) {
     val pullRefreshState = rememberPullRefreshState(
         refreshing = isRefreshing,
@@ -62,7 +63,8 @@ internal fun CourseDetailsWebViewScreen(
         ComposeCanvasWebViewWrapper(
             content = html,
             onLtiButtonPressed = onLtiButtonPressed,
-            applyOnWebView = applyOnWebView
+            applyOnWebView = applyOnWebView,
+            baseUrl = baseUrl
         )
         PullRefreshIndicator(
             refreshing = isRefreshing,

apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsWebViewScreen.kt

@@ -94,7 +94,8 @@ internal fun FrontPageContent(
                 studentColor = uiState.studentColor,
                 onRefresh = { actionHandler(FrontPageAction.Refresh) },
                 applyOnWebView = applyOnWebView,
-                onLtiButtonPressed = onLtiButtonPressed
+                onLtiButtonPressed = onLtiButtonPressed,
+                baseUrl = uiState.baseUrl
             )
         }
     }