Fix #7619: Wallet V2 onboarding flow (#7746)

Sources/BraveUI/SwiftUI/CustomPrivacySensitiveModifier.swift

@@ -9,13 +9,14 @@ import SwiftUI
 /// The `.privacySensitive()` doesn't work in sheets because the
 /// `redactedReasons` doesn't get passed through the environment in sheets.
 private struct CustomPrivacySensitiveModifier: ViewModifier {
+  var isDisclosed: Bool
 
   @State private var isBackgrounded: Bool = false
   @State private var isCaptured: Bool = false
 
   func body(content: Content) -> some View {
     Group {
-      if isBackgrounded || isCaptured {
+      if isBackgrounded || isCaptured || !isDisclosed {
         content
           .opacity(0)
           .overlay(alignment: .center) {
@@ -50,7 +51,7 @@ private struct CustomPrivacySensitiveModifier: ViewModifier {
 extension View {
   /// Redacts the given view if the app is backgrounded, or the system is actively
   /// recording, mirroring, or using AirPlay to stream the contents of the screen.
-  public func customPrivacySensitive() -> some View {
-    modifier(CustomPrivacySensitiveModifier())
+  public func customPrivacySensitive(isDisclosed: Bool = true) -> some View {
+    modifier(CustomPrivacySensitiveModifier(isDisclosed: isDisclosed))
   }
 }

Sources/BraveWallet/Assets.xcassets/Brave Wallet/Onboarding/setup-welcome.imageset/Contents.json → Sources/BraveWallet/Assets.xcassets/Brave Wallet/Onboarding/wallet-background.imageset/Contents.json

@@ -1,7 +1,6 @@
 {
   "images" : [
     {
-      "filename" : "brave-wallet-setup.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +11,11 @@
           "value" : "dark"
         }
       ],
-      "filename" : "brave-wallet-setup-dark.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "brave-wallet-setup@2x.png",
+      "filename" : "background landing@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +26,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "brave-wallet-setup[email protected]",
+      "filename" : "background-landing[email protected]",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "brave-wallet-setup@3x.png",
+      "filename" : "background landing@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +42,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "brave-wallet-setup[email protected]",
+      "filename" : "background-landing[email protected]",
       "idiom" : "universal",
       "scale" : "3x"
     }

Sources/BraveWallet/Assets.xcassets/Brave Wallet/Onboarding/wallet-coinbase.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/BraveWallet/Assets.xcassets/Brave Wallet/Onboarding/wallet-metamask.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/BraveWallet/Assets.xcassets/Brave Wallet/Onboarding/wallet-onboarding-complete.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/BraveWallet/Assets.xcassets/Brave Wallet/Onboarding/wallet-phantom.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/BraveWallet/Crypto/CryptoView.swift

@@ -9,6 +9,7 @@ import SwiftUI
 import BraveCore
 import Introspect
 import BraveUI
+import Preferences
 
 public struct CryptoView: View {
   var walletStore: WalletStore
@@ -19,6 +20,8 @@ public struct CryptoView: View {
   var openWalletURLAction: ((URL) -> Void)?
 
   var appRatingRequestAction: (() -> Void)?
+
+  @ObservedObject var isOnboardingCompleted = Preferences.Wallet.isOnboardingCompleted
 
   public init(
     walletStore: WalletStore,
@@ -234,14 +237,28 @@ public struct CryptoView: View {
         .transition(.move(edge: .bottom))
         .zIndex(1)  // Needed or the dismiss animation messes up
       case .onboarding:
-        UIKitNavigationView {
-          SetupCryptoView(keyringStore: keyringStore)
-            .toolbar {
-              dismissButtonToolbarContents
-            }
+        if isOnboardingCompleted.value {
+          UIKitNavigationView {
+            OnboardingCompletedView(keyringStore: keyringStore)
+          }
+          .transition(.move(edge: .bottom))
+          .zIndex(2)  // Needed or the dismiss animation messes up
+        } else {
+          UIKitNavigationView {
+            SetupCryptoView(keyringStore: keyringStore)
+              .toolbar {
+                ToolbarItemGroup(placement: .destructiveAction) {
+                  Button(action: {
+                    dismissAction()
+                  }) {
+                    Text(Strings.CancelString)
+                  }
+                }
+              }
+          }
+          .transition(.move(edge: .bottom))
+          .zIndex(3)  // Needed or the dismiss animation messes up
         }
-        .transition(.move(edge: .bottom))
-        .zIndex(2)  // Needed or the dismiss animation messes up
       }
     }
     .animation(.default, value: visibleScreen)  // Animate unlock dismiss (required for some reason)