Run format and clippy

bitcoinppl · Dec 1, 2024 · 981073d · 981073d
1 parent a0f7d2e
commit 981073d
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 14 deletions.
diff --git a/ios/Cove/Cove.swift b/ios/Cove/Cove.swift
@@ -6709,6 +6709,8 @@ public protocol RustWalletViewModelProtocol: AnyObject {
 
     func transactionDetails(txId: TxId) async throws -> TransactionDetails
 
+    func validateMetadata()
+
     func walletMetadata() -> WalletMetadata
 
     func wordValidator() throws -> WordValidator
@@ -7201,6 +7203,11 @@ open class RustWalletViewModel:
         )
     }
 
+    open func validateMetadata() { try! rustCall {
+        uniffi_cove_fn_method_rustwalletviewmodel_validate_metadata(self.uniffiClonePointer(), $0)
+    }
+    }
+
     open func walletMetadata() -> WalletMetadata {
         try! FfiConverterTypeWalletMetadata.lift(try! rustCall {
             uniffi_cove_fn_method_rustwalletviewmodel_wallet_metadata(self.uniffiClonePointer(), $0)
@@ -18869,6 +18876,9 @@ private let initializationResult: InitializationResult = {
     if uniffi_cove_checksum_method_rustwalletviewmodel_transaction_details() != 62006 {
         return InitializationResult.apiChecksumMismatch
     }
+    if uniffi_cove_checksum_method_rustwalletviewmodel_validate_metadata() != 62915 {
+        return InitializationResult.apiChecksumMismatch
+    }
     if uniffi_cove_checksum_method_rustwalletviewmodel_wallet_metadata() != 44518 {
         return InitializationResult.apiChecksumMismatch
     }

diff --git a/ios/Cove/WalletSettingsSheet.swift b/ios/Cove/WalletSettingsSheet.swift
@@ -29,15 +29,21 @@ struct WalletSettingsSheet: View {
                 }
 
                 Section(header: Text("Basic Settings")) {
-                    TextField("Wallet Name", text: Binding(
-                        get: { model.walletMetadata.name },
-                        set: { model.dispatch(action: .updateName($0)) }
-                    ))
+                    TextField(
+                        "Wallet Name",
+                        text: Binding(
+                            get: { model.walletMetadata.name },
+                            set: { model.dispatch(action: .updateName($0)) }
+                        )
+                    )
 
-                    Picker("Wallet Color", selection: Binding(
-                        get: { model.walletMetadata.color },
-                        set: { model.dispatch(action: .updateColor($0)) }
-                    )) {
+                    Picker(
+                        "Wallet Color",
+                        selection: Binding(
+                            get: { model.walletMetadata.color },
+                            set: { model.dispatch(action: .updateColor($0)) }
+                        )
+                    ) {
                         ForEach(colors, id: \.self) { color in
                             Text(color.toColor().description)
                                 .tag(color)
@@ -89,18 +95,22 @@ struct WalletSettingsSheet: View {
             }
             .listStyle(InsetGroupedListStyle())
             .navigationTitle("Wallet Settings")
-            .navigationBarItems(leading:
+            .navigationBarItems(
+                leading:
                 Button {
                     dismiss()
+                    model.validateMetadata()
                     navigate(Route.settings)
                 } label: {
                     Label("App Settings", systemImage: "gear")
                         .foregroundColor(.blue)
                 }
             )
-            .navigationBarItems(trailing: Button("Done") {
-                dismiss()
-            })
+            .navigationBarItems(
+                trailing: Button("Done") {
+                    dismiss()
+                }
+            )
             .foregroundColor(.primary)
             .confirmationDialog("Are you sure?", isPresented: $showingDeleteConfirmation) {
                 Button("Delete", role: .destructive) {
@@ -122,7 +132,9 @@ struct WalletSettingsSheet: View {
                 }
                 Button("Cancel", role: .cancel) {}
             } message: {
-                Text("Whoever has access to your secret words, has access to your bitcoin. Please keep these safe, don't show them to anyone.")
+                Text(
+                    "Whoever has access to your secret words, has access to your bitcoin. Please keep these safe, don't show them to anyone."
+                )
             }
         }
     }

diff --git a/ios/Cove/WalletViewModel.swift b/ios/Cove/WalletViewModel.swift
@@ -56,6 +56,10 @@ extension WeakReconciler: WalletViewModelReconciler where Reconciler == WalletVi
         walletMetadata.swiftColor
     }
 
+    func validateMetadata() {
+        rust.validateMetadata()
+    }
+
     func firstAddress() async throws -> AddressInfo {
         try await rust.addressAt(index: 0)
     }

diff --git a/rust/src/cove_nfc/parser/stream.rs b/rust/src/cove_nfc/parser/stream.rs
@@ -11,7 +11,7 @@ pub trait StreamExt {
     fn to_vec(self) -> Vec<u8>;
 }
 
-impl<'a> StreamExt for Stream<'a> {
+impl StreamExt for Stream<'_> {
     fn len(&self) -> usize {
         self.as_ref().len()
     }