diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt index bf78980872..36c6435954 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt @@ -443,7 +443,7 @@ private fun assertWelcomeHeader() = private fun assertStartSyncHeader() { scrollToElementByText(STRING_ONBOARDING_ACCOUNT_SIGN_IN_HEADER) - onView(allOf(withText("Sync $appName between devices"))) + onView(allOf(withText(R.string.onboarding_account_sign_in_header_1))) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) } private fun assertAccountsSignInButton() = diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingManualSignInViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingManualSignInViewHolder.kt index fbc5310c05..cfcc86f37c 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingManualSignInViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingManualSignInViewHolder.kt @@ -29,7 +29,7 @@ class OnboardingManualSignInViewHolder(view: View) : RecyclerView.ViewHolder(vie val context = itemView.context val appName = context.getString(R.string.app_name) binding.headerText.text = - context.getString(R.string.onboarding_account_sign_in_header_2, appName) + context.getString(R.string.onboarding_account_sign_in_header_1) binding.descriptionText.text = context.getString(R.string.onboarding_manual_sign_in_description_2, appName) } diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt index 28e2bd876d..a7413eefa6 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt @@ -372,10 +372,7 @@ private fun SyncedTabsErrorPreview() { FirefoxTheme { Box(Modifier.background(FirefoxTheme.colors.layer1)) { SyncedTabsErrorItem( - errorText = stringResource( - R.string.synced_tabs_no_tabs_2, - stringResource(R.string.app_name) - ), + errorText = stringResource(R.string.synced_tabs_no_tabs), errorButton = SyncedTabsListItem.ErrorButton( buttonText = stringResource(R.string.synced_tabs_sign_in_button) ) { diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsIntegration.kt b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsIntegration.kt index c312342cea..97d5a08485 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsIntegration.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsIntegration.kt @@ -116,10 +116,7 @@ class SyncedTabsIntegration( SyncedTabsView.ErrorType.NO_TABS_AVAILABLE -> SyncedTabsListItem.Error( - errorText = context.getString( - R.string.synced_tabs_no_tabs_2, - context.getString(R.string.app_name) - ), + errorText = context.getString(R.string.synced_tabs_no_tabs), ) SyncedTabsView.ErrorType.SYNC_UNAVAILABLE -> diff --git a/app/src/main/res/layout/onboarding_manual_signin.xml b/app/src/main/res/layout/onboarding_manual_signin.xml index 5d787262c6..2e5923273d 100644 --- a/app/src/main/res/layout/onboarding_manual_signin.xml +++ b/app/src/main/res/layout/onboarding_manual_signin.xml @@ -33,7 +33,7 @@ app:layout_constraintStart_toStartOf="@id/avatar_icon" app:layout_constraintBottom_toBottomOf="@id/avatar_icon" android:layout_marginStart="52dp" - tools:text="@string/onboarding_account_sign_in_header_2" /> + tools:text="@string/onboarding_account_sign_in_header_1" /> Welcome to %s! - Sync Firefox between devices + Sync Firefox between devices - Sync %1$s between devices - + Sync %1$s between devices Bring bookmarks, history, and passwords to %1$s on this device. @@ -1636,9 +1635,9 @@ Please enable tab syncing. - You don’t have any tabs open in Firefox on your other devices. + You don’t have any tabs open in Firefox on your other devices. - You don’t have any tabs open in %1$s on your other devices. + You don’t have any tabs open in %1$s on your other devices. View a list of tabs from your other devices. diff --git a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingManualSignInViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingManualSignInViewHolderTest.kt index efbc64c0df..abb66aff05 100644 --- a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingManualSignInViewHolderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingManualSignInViewHolderTest.kt @@ -51,8 +51,7 @@ class OnboardingManualSignInViewHolderTest { @Test fun `bind header text`() { OnboardingManualSignInViewHolder(binding.root).bind() - val appName = testContext.getString(R.string.app_name) - val string = testContext.getString(R.string.onboarding_account_sign_in_header_2, appName) + val string = testContext.getString(R.string.onboarding_account_sign_in_header_1) assertEquals( string, binding.headerText.text