Merge branch 'fix-totp-wizzard-issues'

cathyjf · Oct 6, 2022 · a162c19 · a162c19
2 parents 05a5d38 + 57433b8
commit a162c19
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/MacPass/MPTOTPSetupViewController.m b/MacPass/MPTOTPSetupViewController.m
@@ -91,6 +91,7 @@ - (IBAction)cancel:(id)sender {
 - (IBAction)save:(id)sender {
   // Update entry settings!
   // FIXME: add model observing to ensure correct history recording
+  [self.view.window makeFirstResponder:nil];
   [self.generator saveToEntry:self.representedEntry];
   [self.presentingViewController dismissViewController:self];
 }
@@ -205,7 +206,7 @@ - (void)_updateView:(MPOTPUpdateSource)source {
     case MPOTPUpdateSourceQRImage: {
       NSString *qrCodeString = self.qrCodeImageView.image.QRCodeString;
       NSURL *otpURL = [NSURL URLWithString:qrCodeString];
-      self.generator = otpURL.isSteamOTPURL ? [[KPKSteamOTPGenerator alloc] initWithURL:self.urlTextField.stringValue] : [[KPKTimeOTPGenerator alloc] initWithURL:self.urlTextField.stringValue];
+      self.generator = otpURL.isSteamOTPURL ? [[KPKSteamOTPGenerator alloc] initWithURL:qrCodeString] : [[KPKTimeOTPGenerator alloc] initWithURL:qrCodeString];
       break;
     }
     case MPOTPUpdateSourceURL:{