Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/flipcash/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@ dependencies {
implementation(project(":apps:flipcash:features:balance"))
implementation(project(":apps:flipcash:features:menu"))
implementation(project(":apps:flipcash:features:lab"))
implementation(project(":apps:flipcash:features:advanced"))
implementation(project(":apps:flipcash:features:device-logs"))
implementation(project(":apps:flipcash:features:appupdates"))
implementation(project(":apps:flipcash:features:deposit"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import androidx.navigation3.runtime.entryProvider
import androidx.navigation3.runtime.NavBackStack
import androidx.navigation3.scene.OverlayScene
import androidx.navigation3.scene.SinglePaneSceneStrategy
import com.flipcash.app.advanced.AdvancedFeaturesScreen
import com.flipcash.app.devicelogs.DeviceLogsScreen
import com.flipcash.app.backupkey.BackupKeyScreen
import com.flipcash.app.balance.WalletScreen
Expand Down Expand Up @@ -50,7 +49,7 @@ import com.flipcash.app.login.OnboardingFlowScreen
import com.flipcash.app.menu.MenuScreen
import com.flipcash.app.myaccount.BlocklistScreen
import com.flipcash.app.myaccount.UserProfileScreen
import com.flipcash.app.myaccount.MyAccountScreen
import com.flipcash.app.myaccount.SettingsScreen
import com.flipcash.app.scanner.ScannerScreen
import com.flipcash.app.shareapp.ShareAppScreen
import com.flipcash.app.tokens.SwapFlowScreen
Expand Down Expand Up @@ -169,10 +168,9 @@ fun appEntryProvider(
// Menu
annotatedEntry<AppRoute.Menu.Lab> { key -> LabsScreen(onboarding = key.onboarding) }
annotatedEntry<AppRoute.Menu.UserProfile> { UserProfileScreen() }
annotatedEntry<AppRoute.Menu.MyAccount> { MyAccountScreen() }
annotatedEntry<AppRoute.Menu.Settings> { SettingsScreen() }
annotatedEntry<AppRoute.Menu.Blocklist> { BlocklistScreen() }
annotatedEntry<AppRoute.Menu.BackupKey> { BackupKeyScreen() }
annotatedEntry<AppRoute.Menu.AdvancedFeatures> { AdvancedFeaturesScreen() }
annotatedEntry<AppRoute.Menu.DeviceLogs> { DeviceLogsScreen() }
annotatedEntry<AppRoute.Menu.AccountSelection> { AccountSelectionScreen() }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,9 @@ class BuildNavGraphForLaunchTest {
DeeplinkAction.Navigate(
listOf(
AppRoute.Tabs.Menu,
AppRoute.Menu.MyAccount,
AppRoute.Menu.Settings,
AppRoute.Verification(
origin = AppRoute.Menu.MyAccount,
origin = AppRoute.Menu.Settings,
includePhone = false,
email = "test@example.com",
emailVerificationCode = "123456",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,15 +316,13 @@ sealed interface AppRoute : NavKey, Parcelable {
@Parcelize
sealed interface Menu : AppRoute {
@Serializable
data object MyAccount : Menu
data object Settings : Menu
@Serializable
data object BackupKey : Menu

@Serializable
data object Blocklist: Menu
@Serializable
data object AdvancedFeatures : Menu
@Serializable
data object DeviceLogs : Menu
@Serializable
data object AccountSelection : Menu
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ sealed class EmailDeeplinkOrigin {
fun fromRoute(route: AppRoute?): EmailDeeplinkOrigin? {
return when (route) {
is AppRoute.Token.Swap -> OnRamp(route)
is AppRoute.Menu.MyAccount -> MyAccount
is AppRoute.Menu.Settings -> MyAccount
else -> null
}
}
Expand Down
3 changes: 3 additions & 0 deletions apps/flipcash/core/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,9 @@
<string name="title_settingsSectionContracts">Contracts</string>
<string name="subtitle_settingsUserFlags">User Flags</string>
<string name="title_settingsSectionAccount">Account</string>
<string name="title_settingsSectionProfile">Profile</string>
<string name="title_settingsSectionSecurity">Security</string>
<string name="title_settingsSectionPrivacy">Privacy</string>
<string name="title_userFlags">User Flags</string>

<string name="title_purchase">Purchase</string>
Expand Down
2 changes: 0 additions & 2 deletions apps/flipcash/features/advanced/.gitignore

This file was deleted.

20 changes: 0 additions & 20 deletions apps/flipcash/features/advanced/build.gradle.kts

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading