@polkadot/extension-base 0.39.4-7 → 0.40.2

package/background/handlers/Extension.cjs

@@ -720,6 +720,9 @@ class Extension {
       case 'pri(seed.validate)':
         return this.seedValidate(request);
 
+      case 'pri(settings.notification)':
+        return (0, _classPrivateFieldLooseBase2.default)(this, _state)[_state].setNotification(request);
+
       case 'pri(signing.approve.password)':
         return this.signingApprovePassword(request);
 

package/background/handlers/Extension.js

@@ -678,6 +678,9 @@ export default class Extension {
       case 'pri(seed.validate)':
         return this.seedValidate(request);
 
+      case 'pri(settings.notification)':
+        return _classPrivateFieldLooseBase(this, _state)[_state].setNotification(request);
+
       case 'pri(signing.approve.password)':
         return this.signingApprovePassword(request);
 

package/background/handlers/State.cjs

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.NotificationOptions = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -19,6 +19,8 @@ var _extensionChains = require("@polkadot/extension-chains");
 
 var _chrome = _interopRequireDefault(require("@polkadot/extension-inject/chrome"));
 
+var _uiSettings = _interopRequireDefault(require("@polkadot/ui-settings"));
+
 var _util = require("@polkadot/util");
 
 var _index = require("../../stores/index.cjs");
@@ -28,16 +30,32 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 let idCounter = 0;
-const WINDOW_OPTS = {
-  // This is not allowed on FF, only on Chrome - disable completely
-  // focused: true,
+
+const NOTIFICATION_URL = _chrome.default.extension.getURL('notification.html');
+
+const POPUP_WINDOW_OPTS = {
+  focused: true,
   height: 621,
   left: 150,
   top: 150,
   type: 'popup',
-  url: _chrome.default.extension.getURL('notification.html'),
+  url: NOTIFICATION_URL,
   width: 560
 };
+const NORMAL_WINDOW_OPTS = {
+  focused: true,
+  type: 'normal',
+  url: NOTIFICATION_URL
+};
+let NotificationOptions;
+exports.NotificationOptions = NotificationOptions;
+
+(function (NotificationOptions) {
+  NotificationOptions[NotificationOptions["None"] = 0] = "None";
+  NotificationOptions[NotificationOptions["Normal"] = 1] = "Normal";
+  NotificationOptions[NotificationOptions["PopUp"] = 2] = "PopUp";
+})(NotificationOptions || (exports.NotificationOptions = NotificationOptions = {}));
+
 const AUTH_URLS_KEY = 'authUrls';
 
 function getId() {
@@ -54,6 +72,8 @@ var _injectedProviders = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("
 
 var _metaRequests = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("metaRequests");
 
+var _notification = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("notification");
+
 var _providers = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("providers");
 
 var _signRequests = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("signRequests");
@@ -84,6 +104,10 @@ class State {
       writable: true,
       value: {}
     });
+    Object.defineProperty(this, _notification, {
+      writable: true,
+      value: _uiSettings.default.notification
+    });
     Object.defineProperty(this, _providers, {
       writable: true,
       value: void 0
@@ -250,7 +274,7 @@ class State {
   }
 
   popupOpen() {
-    _chrome.default.windows.create(_objectSpread({}, WINDOW_OPTS), window => {
+    (0, _classPrivateFieldLooseBase2.default)(this, _notification)[_notification] !== 'extension' && _chrome.default.windows.create((0, _classPrivateFieldLooseBase2.default)(this, _notification)[_notification] === 'window' ? NORMAL_WINDOW_OPTS : POPUP_WINDOW_OPTS, window => {
       if (window) {
         (0, _classPrivateFieldLooseBase2.default)(this, _windows)[_windows].push(window.id || 0);
       }
@@ -437,6 +461,11 @@ class State {
     (0, _extensionChains.addMetadata)(meta);
   }
 
+  setNotification(notification) {
+    (0, _classPrivateFieldLooseBase2.default)(this, _notification)[_notification] = notification;
+    return true;
+  }
+
   sign(url, request, account) {
     const id = getId();
     return new Promise((resolve, reject) => {

package/background/handlers/State.d.ts

@@ -36,6 +36,11 @@ interface SignRequest extends Resolver<ResponseSigning> {
     request: RequestSign;
     url: string;
 }
+export declare enum NotificationOptions {
+    None = 0,
+    Normal = 1,
+    PopUp = 2
+}
 export default class State {
     #private;
     readonly authSubject: BehaviorSubject<AuthorizeRequest[]>;
@@ -75,6 +80,7 @@ export default class State {
     rpcSubscribeConnected(_request: null, cb: ProviderInterfaceCallback, port: chrome.runtime.Port): void;
     rpcUnsubscribe(request: RequestRpcUnsubscribe, port: chrome.runtime.Port): Promise<boolean>;
     saveMetadata(meta: MetadataDef): void;
+    setNotification(notification: string): boolean;
     sign(url: string, request: RequestSign, account: AccountJson): Promise<ResponseSigning>;
 }
 export {};

package/background/handlers/State.js

@@ -11,19 +11,33 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { BehaviorSubject } from 'rxjs';
 import { addMetadata, knownMetadata } from '@polkadot/extension-chains';
 import chrome from '@polkadot/extension-inject/chrome';
+import settings from '@polkadot/ui-settings';
 import { assert } from '@polkadot/util';
 import { MetadataStore } from "../../stores/index.js";
 let idCounter = 0;
-const WINDOW_OPTS = {
-  // This is not allowed on FF, only on Chrome - disable completely
-  // focused: true,
+const NOTIFICATION_URL = chrome.extension.getURL('notification.html');
+const POPUP_WINDOW_OPTS = {
+  focused: true,
   height: 621,
   left: 150,
   top: 150,
   type: 'popup',
-  url: chrome.extension.getURL('notification.html'),
+  url: NOTIFICATION_URL,
   width: 560
 };
+const NORMAL_WINDOW_OPTS = {
+  focused: true,
+  type: 'normal',
+  url: NOTIFICATION_URL
+};
+export let NotificationOptions;
+
+(function (NotificationOptions) {
+  NotificationOptions[NotificationOptions["None"] = 0] = "None";
+  NotificationOptions[NotificationOptions["Normal"] = 1] = "Normal";
+  NotificationOptions[NotificationOptions["PopUp"] = 2] = "PopUp";
+})(NotificationOptions || (NotificationOptions = {}));
+
 const AUTH_URLS_KEY = 'authUrls';
 
 function getId() {
@@ -40,6 +54,8 @@ var _injectedProviders = /*#__PURE__*/_classPrivateFieldLooseKey("injectedProvid
 
 var _metaRequests = /*#__PURE__*/_classPrivateFieldLooseKey("metaRequests");
 
+var _notification = /*#__PURE__*/_classPrivateFieldLooseKey("notification");
+
 var _providers = /*#__PURE__*/_classPrivateFieldLooseKey("providers");
 
 var _signRequests = /*#__PURE__*/_classPrivateFieldLooseKey("signRequests");
@@ -70,6 +86,10 @@ export default class State {
       writable: true,
       value: {}
     });
+    Object.defineProperty(this, _notification, {
+      writable: true,
+      value: settings.notification
+    });
     Object.defineProperty(this, _providers, {
       writable: true,
       value: void 0
@@ -236,7 +256,7 @@ export default class State {
   }
 
   popupOpen() {
-    chrome.windows.create(_objectSpread({}, WINDOW_OPTS), window => {
+    _classPrivateFieldLooseBase(this, _notification)[_notification] !== 'extension' && chrome.windows.create(_classPrivateFieldLooseBase(this, _notification)[_notification] === 'window' ? NORMAL_WINDOW_OPTS : POPUP_WINDOW_OPTS, window => {
       if (window) {
         _classPrivateFieldLooseBase(this, _windows)[_windows].push(window.id || 0);
       }
@@ -423,6 +443,11 @@ export default class State {
     addMetadata(meta);
   }
 
+  setNotification(notification) {
+    _classPrivateFieldLooseBase(this, _notification)[_notification] = notification;
+    return true;
+  }
+
   sign(url, request, account) {
     const id = getId();
     return new Promise((resolve, reject) => {

package/background/types.d.ts

@@ -86,6 +86,7 @@ export interface RequestSignatures {
     'pri(metadata.list)': [null, MetadataDef[]];
     'pri(seed.create)': [RequestSeedCreate, ResponseSeedCreate];
     'pri(seed.validate)': [RequestSeedValidate, ResponseSeedValidate];
+    'pri(settings.notification)': [string, boolean];
     'pri(signing.approve.password)': [RequestSigningApprovePassword, boolean];
     'pri(signing.approve.signature)': [RequestSigningApproveSignature, boolean];
     'pri(signing.cancel)': [RequestSigningCancel, boolean];

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@polkadot/extension-base",
   "description": "Functions, classes and other utilities used in @polkadot/extension",
-  "version": "0.39.4-7",
+  "version": "0.40.2",
   "type": "module",
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "license": "Apache-2",
   "main": "index.js",
   "sideEffects": false,
   "dependencies": {
-    "@babel/runtime": "^7.15.3",
-    "@polkadot/api": "^5.7.2-2",
-    "@polkadot/extension-dapp": "^0.39.4-7",
-    "@polkadot/extension-inject": "^0.39.4-7",
+    "@babel/runtime": "^7.15.4",
+    "@polkadot/api": "^5.9.2-7",
+    "@polkadot/extension-dapp": "^0.40.2",
+    "@polkadot/extension-inject": "^0.40.2",
     "@polkadot/keyring": "^7.3.1",
-    "@polkadot/phishing": "^0.6.276",
-    "@polkadot/ui-keyring": "^0.85.3"
+    "@polkadot/phishing": "^0.6.294",
+    "@polkadot/ui-keyring": "^0.85.4-3"
   },
   "exports": {
     ".": {

package/packageInfo.cjs

@@ -9,6 +9,6 @@ exports.packageInfo = void 0;
 // Auto-generated by @polkadot/dev, do not edit
 const packageInfo = {
   name: '@polkadot/extension-base',
-  version: '0.39.4-7'
+  version: '0.40.2'
 };
 exports.packageInfo = packageInfo;

package/packageInfo.js

@@ -3,5 +3,5 @@
 // Auto-generated by @polkadot/dev, do not edit
 export const packageInfo = {
   name: '@polkadot/extension-base',
-  version: '0.39.4-7'
+  version: '0.40.2'
 };