Skip to content

Commit

Permalink
Merge pull request #1110 from MutinyWallet/silent-merge
Browse files Browse the repository at this point in the history
Fix silent merge conflict
  • Loading branch information
TonyGiorgio authored Apr 4, 2024
2 parents 27dca41 + 6bf03c7 commit fabbeb2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mutiny-core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,7 @@ impl<S: MutinyStorage> MutinyWalletBuilder<S> {

// start the hermes background process
// get profile key if we have it, we need this to decrypt private zaps
let profile_key = match &mw.nostr.primary_key {
let profile_key = match &mw.nostr.nostr_keys.read().await.signer {
NostrSigner::Keys(keys) => Some(keys.clone()),
#[cfg(target_arch = "wasm32")]
NostrSigner::NIP07(_) => None,
Expand Down

0 comments on commit fabbeb2

Please sign in to comment.