copy totp to clipboard before closing popup

src/popup/app/current/currentController.js

@@ -83,8 +83,7 @@ angular
                         chrome.tabs.sendMessage(tabId, {
                             command: 'fillForm',
                             fillScript: fillScript
-                        }, { frameId: pageDetails[i].frameId }, $window.close);
-
+                        }, { frameId: pageDetails[i].frameId }, function () {
                             if (login.totp && tokenService.getPremium()) {
                                 totpService.isAutoCopyEnabled().then(function (enabled) {
                                     if (enabled) {
@@ -96,8 +95,14 @@ angular
                                     if (code) {
                                         utilsService.copyToClipboard(code);
                                     }
+
+                                    $window.close();
                                 });
                             }
+                            else {
+                                $window.close();
+                            }
+                        });
                     }
                 }
             }