@eluvio/elv-client-js 4.2.13 → 4.2.14

package/dist/src/walletClient/index.js

@@ -79,7 +79,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
     this.utils = client.utils;
     this.ForbiddenMethods = ElvWalletClient.ForbiddenMethods;
   }
-  return _createClass(ElvWalletClient, [{
+  _createClass(ElvWalletClient, [{
     key: "Log",
     value: function Log(message) {
       var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -136,56 +136,56 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "PersonalSign",
-    value: (function () {
-      var _PersonalSign = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref2) {
+    value: function () {
+      var _PersonalSign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref2) {
         var message, parameters, url;
-        return _regeneratorRuntime.wrap(function (_context3) {
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               message = _ref2.message;
               if (this.loggedIn) {
-                _context3.next = 1;
+                _context3.next = 3;
                 break;
               }
               throw Error("ElvWalletClient: Unable to perform signature - Not logged in");
-            case 1:
+            case 3:
               if (!this.CanSign()) {
-                _context3.next = 6;
+                _context3.next = 19;
                 break;
               }
               if (!this.__authorization.clusterToken) {
-                _context3.next = 3;
+                _context3.next = 12;
                 break;
               }
               // Custodial wallet sign
 
               message = _typeof(message) === "object" ? JSON.stringify(message) : message;
               message = Ethers.utils.keccak256(Buffer.from("\x19Ethereum Signed Message:\n".concat(message.length).concat(message), "utf-8"));
-              _context3.next = 2;
+              _context3.next = 9;
               return this.client.authClient.Sign(message);
-            case 2:
+            case 9:
               return _context3.abrupt("return", _context3.sent);
-            case 3:
+            case 12:
               if (!(this.UserInfo().walletName.toLowerCase() === "metamask")) {
-                _context3.next = 4;
+                _context3.next = 16;
                 break;
               }
               return _context3.abrupt("return", this.SignMetamask({
                 message: message,
                 address: this.UserAddress()
               }));
-            case 4:
+            case 16:
               throw Error("ElvWalletClient: Unable to sign");
-            case 5:
-              _context3.next = 7;
+            case 17:
+              _context3.next = 21;
               break;
-            case 6:
+            case 19:
               if (inBrowser) {
-                _context3.next = 7;
+                _context3.next = 21;
                 break;
               }
               throw Error("ElvWalletClient: Unable to sign");
-            case 7:
+            case 21:
               parameters = {
                 action: "personal-sign",
                 message: message,
@@ -195,18 +195,18 @@ var ElvWalletClient = /*#__PURE__*/function () {
               url.hash = UrlJoin("/action", "sign", Utils.B58(JSON.stringify(parameters)));
               url.searchParams.set("origin", window.location.origin);
               if (!(!embedded && window.location.origin === url.origin)) {
-                _context3.next = 8;
+                _context3.next = 27;
                 break;
               }
               throw Error("ElvWalletClient: Unable to sign");
-            case 8:
-              _context3.next = 9;
-              return new Promise(/*#__PURE__*/function () {
-                var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve, reject) {
-                  return _regeneratorRuntime.wrap(function (_context2) {
+            case 27:
+              _context3.next = 29;
+              return new Promise( /*#__PURE__*/function () {
+                var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve, reject) {
+                  return _regeneratorRuntime.wrap(function _callee2$(_context2) {
                     while (1) switch (_context2.prev = _context2.next) {
                       case 0:
-                        _context2.next = 1;
+                        _context2.next = 2;
                         return ActionPopup({
                           mode: "tab",
                           url: url.toString(),
@@ -214,16 +214,16 @@ var ElvWalletClient = /*#__PURE__*/function () {
                             return reject("User cancelled sign");
                           },
                           onMessage: function () {
-                            var _onMessage = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(event, Close) {
-                              return _regeneratorRuntime.wrap(function (_context) {
+                            var _onMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(event, Close) {
+                              return _regeneratorRuntime.wrap(function _callee$(_context) {
                                 while (1) switch (_context.prev = _context.next) {
                                   case 0:
                                     if (!(!event || !event.data || event.data.type !== "FlowResponse")) {
-                                      _context.next = 1;
+                                      _context.next = 2;
                                       break;
                                     }
                                     return _context.abrupt("return");
-                                  case 1:
+                                  case 2:
                                     try {
                                       resolve(event.data.response);
                                     } catch (error) {
@@ -231,7 +231,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                                     } finally {
                                       Close();
                                     }
-                                  case 2:
+                                  case 3:
                                   case "end":
                                     return _context.stop();
                                 }
@@ -243,7 +243,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                             return onMessage;
                           }()
                         });
-                      case 1:
+                      case 2:
                       case "end":
                         return _context2.stop();
                     }
@@ -253,9 +253,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   return _ref3.apply(this, arguments);
                 };
               }());
-            case 9:
+            case 29:
               return _context3.abrupt("return", _context3.sent);
-            case 10:
+            case 30:
             case "end":
               return _context3.stop();
           }
@@ -265,13 +265,13 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _PersonalSign.apply(this, arguments);
       }
       return PersonalSign;
-    }())
+    }()
   }, {
     key: "LogInURL",
     value: function () {
-      var _LogInURL = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref4) {
-        var _ref4$mode, mode, provider, marketplaceParams, clearLogin, loginUrl, _t, _t2;
-        return _regeneratorRuntime.wrap(function (_context4) {
+      var _LogInURL = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref4) {
+        var _ref4$mode, mode, provider, marketplaceParams, clearLogin, loginUrl;
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _ref4$mode = _ref4.mode, mode = _ref4$mode === void 0 ? "login" : _ref4$mode, provider = _ref4.provider, marketplaceParams = _ref4.marketplaceParams, clearLogin = _ref4.clearLogin;
@@ -288,29 +288,29 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 loginUrl.searchParams.set("mode", mode);
               }
               if (!marketplaceParams) {
-                _context4.next = 2;
+                _context4.next = 15;
                 break;
               }
-              _t = loginUrl.searchParams;
-              _context4.next = 1;
+              _context4.t0 = loginUrl.searchParams;
+              _context4.next = 11;
               return this.MarketplaceInfo({
                 marketplaceParams: marketplaceParams
               });
-            case 1:
-              _t2 = _context4.sent.marketplaceHash;
-              _t.set.call(_t, "mid", _t2);
-              _context4.next = 3;
+            case 11:
+              _context4.t1 = _context4.sent.marketplaceHash;
+              _context4.t0.set.call(_context4.t0, "mid", _context4.t1);
+              _context4.next = 16;
               break;
-            case 2:
+            case 15:
               if ((this.selectedMarketplaceInfo || {}).marketplaceHash) {
                 loginUrl.searchParams.set("mid", this.selectedMarketplaceInfo.marketplaceHash);
               }
-            case 3:
+            case 16:
               if (clearLogin) {
                 loginUrl.searchParams.set("clear", "");
               }
               return _context4.abrupt("return", loginUrl);
-            case 4:
+            case 18:
             case "end":
               return _context4.stop();
           }
@@ -344,43 +344,43 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "LogIn",
-    value: (function () {
-      var _LogIn = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref5) {
+    value: function () {
+      var _LogIn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref5) {
         var _this = this;
         var _ref5$method, method, provider, _ref5$mode, mode, callbackUrl, marketplaceParams, _ref5$clearLogin, clearLogin, callback, loginUrl;
-        return _regeneratorRuntime.wrap(function (_context7) {
+        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _ref5$method = _ref5.method, method = _ref5$method === void 0 ? "redirect" : _ref5$method, provider = _ref5.provider, _ref5$mode = _ref5.mode, mode = _ref5$mode === void 0 ? "login" : _ref5$mode, callbackUrl = _ref5.callbackUrl, marketplaceParams = _ref5.marketplaceParams, _ref5$clearLogin = _ref5.clearLogin, clearLogin = _ref5$clearLogin === void 0 ? false : _ref5$clearLogin, callback = _ref5.callback;
-              _context7.next = 1;
+              _context7.next = 3;
               return this.LogInURL({
                 mode: mode,
                 provider: provider,
                 marketplaceParams: marketplaceParams,
                 clearLogin: clearLogin
               });
-            case 1:
+            case 3:
               loginUrl = _context7.sent;
               if (!(method === "redirect")) {
-                _context7.next = 2;
+                _context7.next = 11;
                 break;
               }
               loginUrl.searchParams.set("response", "redirect");
               loginUrl.searchParams.set("source", "origin");
               loginUrl.searchParams.set("redirect", callbackUrl);
               window.location = loginUrl;
-              _context7.next = 3;
+              _context7.next = 15;
               break;
-            case 2:
+            case 11:
               loginUrl.searchParams.set("response", "message");
               loginUrl.searchParams.set("source", "parent");
-              _context7.next = 3;
-              return new Promise(/*#__PURE__*/function () {
-                var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6(resolve, reject) {
-                  return _regeneratorRuntime.wrap(function (_context6) {
+              _context7.next = 15;
+              return new Promise( /*#__PURE__*/function () {
+                var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(resolve, reject) {
+                  return _regeneratorRuntime.wrap(function _callee6$(_context6) {
                     while (1) switch (_context6.prev = _context6.next) {
                       case 0:
-                        _context6.next = 1;
+                        _context6.next = 2;
                         return ActionPopup({
                           mode: "tab",
                           url: loginUrl.toString(),
@@ -388,57 +388,56 @@ var ElvWalletClient = /*#__PURE__*/function () {
                             return reject("User cancelled login");
                           },
                           onMessage: function () {
-                            var _onMessage2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(event, Close) {
-                              var _t3;
-                              return _regeneratorRuntime.wrap(function (_context5) {
+                            var _onMessage2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(event, Close) {
+                              return _regeneratorRuntime.wrap(function _callee5$(_context5) {
                                 while (1) switch (_context5.prev = _context5.next) {
                                   case 0:
                                     if (!(!event || !event.data || event.data.type !== "LoginResponse")) {
-                                      _context5.next = 1;
+                                      _context5.next = 2;
                                       break;
                                     }
                                     return _context5.abrupt("return");
-                                  case 1:
-                                    _context5.prev = 1;
+                                  case 2:
+                                    _context5.prev = 2;
                                     if (!callback) {
-                                      _context5.next = 3;
+                                      _context5.next = 8;
                                       break;
                                     }
-                                    _context5.next = 2;
+                                    _context5.next = 6;
                                     return callback(event.data.params);
-                                  case 2:
-                                    _context5.next = 4;
+                                  case 6:
+                                    _context5.next = 10;
                                     break;
-                                  case 3:
-                                    _context5.next = 4;
+                                  case 8:
+                                    _context5.next = 10;
                                     return _this.Authenticate({
                                       token: event.data.params.clientSigningToken || event.data.params.clientAuthToken
                                     });
-                                  case 4:
+                                  case 10:
                                     resolve();
-                                    _context5.next = 6;
+                                    _context5.next = 16;
                                     break;
-                                  case 5:
-                                    _context5.prev = 5;
-                                    _t3 = _context5["catch"](1);
-                                    reject(_t3);
-                                  case 6:
-                                    _context5.prev = 6;
+                                  case 13:
+                                    _context5.prev = 13;
+                                    _context5.t0 = _context5["catch"](2);
+                                    reject(_context5.t0);
+                                  case 16:
+                                    _context5.prev = 16;
                                     Close();
-                                    return _context5.finish(6);
-                                  case 7:
+                                    return _context5.finish(16);
+                                  case 19:
                                   case "end":
                                     return _context5.stop();
                                 }
-                              }, _callee5, null, [[1, 5, 6, 7]]);
+                              }, _callee5, null, [[2, 13, 16, 19]]);
                             }));
-                            function onMessage(_x0, _x1) {
+                            function onMessage(_x10, _x11) {
                               return _onMessage2.apply(this, arguments);
                             }
                             return onMessage;
                           }()
                         });
-                      case 1:
+                      case 2:
                       case "end":
                         return _context6.stop();
                     }
@@ -448,7 +447,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   return _ref6.apply(this, arguments);
                 };
               }());
-            case 3:
+            case 15:
             case "end":
               return _context7.stop();
           }
@@ -464,32 +463,30 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @methodGroup Login
      */
-    )
   }, {
     key: "LogOut",
-    value: (function () {
-      var _LogOut = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
-        var _t4;
-        return _regeneratorRuntime.wrap(function (_context8) {
+    value: function () {
+      var _LogOut = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+        return _regeneratorRuntime.wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              if (!(this.__authorization && this.__authorization.nonce)) {
-                _context8.next = 4;
+              if (!(this.__authorization && (this.__authorization.nonce || this.__authorization.installId))) {
+                _context8.next = 9;
                 break;
               }
               _context8.prev = 1;
-              _context8.next = 2;
+              _context8.next = 4;
               return this.client.signer.ReleaseCSAT({
                 accessToken: this.AuthToken()
               });
-            case 2:
-              _context8.next = 4;
-              break;
-            case 3:
-              _context8.prev = 3;
-              _t4 = _context8["catch"](1);
-              this.Log("Failed to release token", true, _t4);
             case 4:
+              _context8.next = 9;
+              break;
+            case 6:
+              _context8.prev = 6;
+              _context8.t0 = _context8["catch"](1);
+              this.Log("Failed to release token", true, _context8.t0);
+            case 9:
               this.__authorization = {};
               this.loggedIn = false;
               this.cachedMarketplaces = {};
@@ -501,37 +498,37 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   // eslint-disable-next-line no-empty
                 } catch (error) {}
               }
-            case 5:
+            case 13:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[1, 3]]);
+        }, _callee8, this, [[1, 6]]);
       }));
       function LogOut() {
         return _LogOut.apply(this, arguments);
       }
       return LogOut;
-    }())
+    }()
   }, {
     key: "TokenStatus",
     value: function () {
-      var _TokenStatus = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
-        return _regeneratorRuntime.wrap(function (_context9) {
+      var _TokenStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+        return _regeneratorRuntime.wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              if (!(!this.__authorization || !this.__authorization.nonce)) {
-                _context9.next = 1;
+              if (!(!this.__authorization || !(this.__authorization.nonce || this.__authorization.installId))) {
+                _context9.next = 2;
                 break;
               }
               return _context9.abrupt("return", true);
-            case 1:
-              _context9.next = 2;
+            case 2:
+              _context9.next = 4;
               return this.client.signer.CSATStatus({
                 accessToken: this.AuthToken()
               });
-            case 2:
+            case 4:
               return _context9.abrupt("return", _context9.sent);
-            case 3:
+            case 5:
             case "end":
               return _context9.stop();
           }
@@ -551,49 +548,49 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "Authenticate",
-    value: (function () {
-      var _Authenticate = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee0(_ref7) {
-        var token, decodedToken, _t5;
-        return _regeneratorRuntime.wrap(function (_context0) {
-          while (1) switch (_context0.prev = _context0.next) {
+    value: function () {
+      var _Authenticate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref7) {
+        var token, decodedToken;
+        return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               token = _ref7.token;
-              _context0.prev = 1;
+              _context10.prev = 1;
               decodedToken = JSON.parse(this.utils.FromB58ToStr(token)) || {};
-              _context0.next = 3;
+              _context10.next = 8;
               break;
-            case 2:
-              _context0.prev = 2;
-              _t5 = _context0["catch"](1);
+            case 5:
+              _context10.prev = 5;
+              _context10.t0 = _context10["catch"](1);
               throw new Error("Invalid authorization token " + token);
-            case 3:
+            case 8:
               if (!(!decodedToken.expiresAt || Date.now() > decodedToken.expiresAt)) {
-                _context0.next = 4;
+                _context10.next = 10;
                 break;
               }
               throw Error("ElvWalletClient: Provided authorization token has expired");
-            case 4:
+            case 10:
               if (!decodedToken.clusterToken) {
-                _context0.next = 5;
+                _context10.next = 13;
                 break;
               }
-              _context0.next = 5;
+              _context10.next = 13;
               return this.client.SetRemoteSigner({
                 authToken: decodedToken.clusterToken,
                 signerURIs: decodedToken.signerURIs
               });
-            case 5:
+            case 13:
               this.client.SetStaticToken({
                 token: decodedToken.fabricToken
               });
-              return _context0.abrupt("return", this.SetAuthorization(_objectSpread({}, decodedToken)));
-            case 6:
+              return _context10.abrupt("return", this.SetAuthorization(_objectSpread({}, decodedToken)));
+            case 15:
             case "end":
-              return _context0.stop();
+              return _context10.stop();
           }
-        }, _callee0, this, [[1, 2]]);
+        }, _callee10, this, [[1, 5]]);
       }));
-      function Authenticate(_x10) {
+      function Authenticate(_x12) {
         return _Authenticate.apply(this, arguments);
       }
       return Authenticate;
@@ -618,28 +615,28 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * - signingToken - Identical to `authToken`, but also includes the ability to perform arbitrary signatures with the custodial wallet. This token should be protected and should not be
      * shared with third parties.
      */
-    )
   }, {
     key: "AuthenticateOAuth",
-    value: (function () {
-      var _AuthenticateOAuth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee1(_ref8) {
-        var idToken, tenantId, email, signerURIs, _ref8$shareEmail, shareEmail, _ref8$extraData, extraData, nonce, _ref8$createRemoteTok, createRemoteToken, _ref8$force, force, _ref8$tokenDuration, tokenDuration, fabricToken, expiresAt, tokenResponse, address, decodedToken, _t6;
-        return _regeneratorRuntime.wrap(function (_context1) {
-          while (1) switch (_context1.prev = _context1.next) {
+    value: function () {
+      var _AuthenticateOAuth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref8) {
+        var idToken, userIdCode, tenantId, email, signerURIs, _ref8$shareEmail, shareEmail, _ref8$extraData, extraData, nonce, installId, appName, _ref8$createRemoteTok, createRemoteToken, _ref8$force, force, _ref8$tokenDuration, tokenDuration, fabricToken, refreshToken, expiresAt, tokenResponse, address, decodedToken;
+        return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              idToken = _ref8.idToken, tenantId = _ref8.tenantId, email = _ref8.email, signerURIs = _ref8.signerURIs, _ref8$shareEmail = _ref8.shareEmail, shareEmail = _ref8$shareEmail === void 0 ? false : _ref8$shareEmail, _ref8$extraData = _ref8.extraData, extraData = _ref8$extraData === void 0 ? {} : _ref8$extraData, nonce = _ref8.nonce, _ref8$createRemoteTok = _ref8.createRemoteToken, createRemoteToken = _ref8$createRemoteTok === void 0 ? true : _ref8$createRemoteTok, _ref8$force = _ref8.force, force = _ref8$force === void 0 ? false : _ref8$force, _ref8$tokenDuration = _ref8.tokenDuration, tokenDuration = _ref8$tokenDuration === void 0 ? 24 : _ref8$tokenDuration;
+              idToken = _ref8.idToken, userIdCode = _ref8.userIdCode, tenantId = _ref8.tenantId, email = _ref8.email, signerURIs = _ref8.signerURIs, _ref8$shareEmail = _ref8.shareEmail, shareEmail = _ref8$shareEmail === void 0 ? false : _ref8$shareEmail, _ref8$extraData = _ref8.extraData, extraData = _ref8$extraData === void 0 ? {} : _ref8$extraData, nonce = _ref8.nonce, installId = _ref8.installId, appName = _ref8.appName, _ref8$createRemoteTok = _ref8.createRemoteToken, createRemoteToken = _ref8$createRemoteTok === void 0 ? true : _ref8$createRemoteTok, _ref8$force = _ref8.force, force = _ref8$force === void 0 ? false : _ref8$force, _ref8$tokenDuration = _ref8.tokenDuration, tokenDuration = _ref8$tokenDuration === void 0 ? 24 : _ref8$tokenDuration;
               if (!(!tenantId && this.selectedMarketplaceInfo)) {
-                _context1.next = 2;
+                _context11.next = 5;
                 break;
               }
-              _context1.next = 1;
+              _context11.next = 4;
               return this.AvailableMarketplaces();
-            case 1:
+            case 4:
               tenantId = this.selectedMarketplaceInfo.tenantId;
-            case 2:
-              _context1.next = 3;
+            case 5:
+              _context11.next = 7;
               return this.client.SetRemoteSigner({
                 idToken: idToken,
+                userIdCode: userIdCode,
                 tenantId: tenantId,
                 signerURIs: signerURIs,
                 extraData: _objectSpread(_objectSpread({}, extraData), {}, {
@@ -647,29 +644,33 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 }),
                 unsignedPublicAuth: true
               });
-            case 3:
+            case 7:
               if (!(createRemoteToken && this.client.signer.remoteSigner)) {
-                _context1.next = 5;
+                _context11.next = 18;
                 break;
               }
               expiresAt = Date.now() + tokenDuration * 60 * 60 * 1000;
-              _context1.next = 4;
+              _context11.next = 11;
               return this.client.signer.RetrieveCSAT({
                 email: email,
                 nonce: nonce,
+                installId: installId,
+                appName: appName,
                 tenantId: tenantId,
                 force: force,
                 duration: tokenDuration
               });
-            case 4:
-              tokenResponse = _context1.sent;
+            case 11:
+              tokenResponse = _context11.sent;
               fabricToken = tokenResponse.token;
-              nonce = tokenResponse.nonce;
-              _context1.next = 7;
+              nonce = tokenResponse.nonce || nonce;
+              installId = tokenResponse.installId || installId;
+              refreshToken = tokenResponse.refresh_token;
+              _context11.next = 22;
               break;
-            case 5:
+            case 18:
               expiresAt = Date.now() + tokenDuration * 60 * 60 * 1000;
-              _context1.next = 6;
+              _context11.next = 21;
               return this.client.CreateFabricToken({
                 duration: parseInt(tokenDuration * 60 * 60 * 1000),
                 context: email ? {
@@ -678,30 +679,31 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   }
                 } : {}
               });
-            case 6:
-              fabricToken = _context1.sent;
-            case 7:
+            case 21:
+              fabricToken = _context11.sent;
+            case 22:
               address = this.client.utils.FormatAddress(this.client.CurrentAccountAddress());
-              if (email) {
-                _context1.next = 10;
+              if (!(!email && idToken)) {
+                _context11.next = 32;
                 break;
               }
-              _context1.prev = 8;
+              _context11.prev = 24;
               decodedToken = JSON.parse(this.utils.FromB64URL(idToken.split(".")[1]));
               email = decodedToken.email;
-              _context1.next = 10;
+              _context11.next = 32;
               break;
-            case 9:
-              _context1.prev = 9;
-              _t6 = _context1["catch"](8);
+            case 29:
+              _context11.prev = 29;
+              _context11.t0 = _context11["catch"](24);
               throw Error("Failed to decode ID token");
-            case 10:
+            case 32:
               this.client.SetStaticToken({
                 token: fabricToken
               });
-              return _context1.abrupt("return", {
+              return _context11.abrupt("return", {
                 authToken: this.SetAuthorization({
                   fabricToken: fabricToken,
+                  refreshToken: refreshToken,
                   tenantId: tenantId,
                   address: address,
                   email: email,
@@ -710,11 +712,13 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   walletType: "Custodial",
                   walletName: "Eluvio",
                   register: true,
-                  nonce: nonce
+                  nonce: nonce,
+                  installId: installId
                 }),
                 signingToken: this.SetAuthorization({
                   clusterToken: this.client.signer.authToken,
                   fabricToken: fabricToken,
+                  refreshToken: refreshToken,
                   tenantId: tenantId,
                   address: address,
                   email: email,
@@ -722,16 +726,17 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   signerURIs: signerURIs,
                   walletType: "Custodial",
                   walletName: "Eluvio",
-                  nonce: nonce
+                  nonce: nonce,
+                  installId: installId
                 })
               });
-            case 11:
+            case 34:
             case "end":
-              return _context1.stop();
+              return _context11.stop();
           }
-        }, _callee1, this, [[8, 9]]);
+        }, _callee11, this, [[24, 29]]);
       }));
-      function AuthenticateOAuth(_x11) {
+      function AuthenticateOAuth(_x13) {
         return _AuthenticateOAuth.apply(this, arguments);
       }
       return AuthenticateOAuth;
@@ -749,15 +754,14 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * @returns {Promise<string>} - Returns an authorization token that can be used to initialize the client using <a href="#Authenticate">Authenticate</a>.
      * Save this token to avoid having to reauthenticate. This token expires after 24 hours.
      */
-    )
   }, {
     key: "AuthenticateExternalWallet",
-    value: (function () {
-      var _AuthenticateExternalWallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref9) {
+    value: function () {
+      var _AuthenticateExternalWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref9) {
         var _this2 = this;
         var address, _ref9$tokenDuration, tokenDuration, _ref9$walletName, walletName, Sign, expiresAt, fabricToken;
-        return _regeneratorRuntime.wrap(function (_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime.wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               address = _ref9.address, _ref9$tokenDuration = _ref9.tokenDuration, tokenDuration = _ref9$tokenDuration === void 0 ? 24 : _ref9$tokenDuration, _ref9$walletName = _ref9.walletName, walletName = _ref9$walletName === void 0 ? "Metamask" : _ref9$walletName, Sign = _ref9.Sign;
               if (!address) {
@@ -766,36 +770,36 @@ var ElvWalletClient = /*#__PURE__*/function () {
               address = this.utils.FormatAddress(address);
               if (!Sign) {
                 Sign = /*#__PURE__*/function () {
-                  var _ref0 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee10(message) {
-                    return _regeneratorRuntime.wrap(function (_context10) {
-                      while (1) switch (_context10.prev = _context10.next) {
+                  var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(message) {
+                    return _regeneratorRuntime.wrap(function _callee12$(_context12) {
+                      while (1) switch (_context12.prev = _context12.next) {
                         case 0:
-                          return _context10.abrupt("return", _this2.SignMetamask({
+                          return _context12.abrupt("return", _this2.SignMetamask({
                             message: message,
                             address: address
                           }));
                         case 1:
                         case "end":
-                          return _context10.stop();
+                          return _context12.stop();
                       }
-                    }, _callee10);
+                    }, _callee12);
                   }));
-                  return function Sign(_x13) {
-                    return _ref0.apply(this, arguments);
+                  return function Sign(_x15) {
+                    return _ref10.apply(this, arguments);
                   };
                 }();
               }
               expiresAt = Date.now() + tokenDuration * 60 * 60 * 1000;
-              _context11.next = 1;
+              _context13.next = 7;
               return this.client.CreateFabricToken({
                 address: address,
                 duration: tokenDuration * 60 * 60 * 1000,
                 Sign: Sign,
                 addEthereumPrefix: false
               });
-            case 1:
-              fabricToken = _context11.sent;
-              return _context11.abrupt("return", this.SetAuthorization({
+            case 7:
+              fabricToken = _context13.sent;
+              return _context13.abrupt("return", this.SetAuthorization({
                 fabricToken: fabricToken,
                 address: address,
                 expiresAt: expiresAt,
@@ -803,13 +807,13 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 walletName: walletName,
                 register: true
               }));
-            case 2:
+            case 9:
             case "end":
-              return _context11.stop();
+              return _context13.stop();
           }
-        }, _callee11, this);
+        }, _callee13, this);
       }));
-      function AuthenticateExternalWallet(_x12) {
+      function AuthenticateExternalWallet(_x14) {
         return _AuthenticateExternalWallet.apply(this, arguments);
       }
       return AuthenticateExternalWallet;
@@ -821,7 +825,6 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @returns {string} - The client auth token
      */
-    )
   }, {
     key: "ClientAuthToken",
     value: function ClientAuthToken() {
@@ -840,30 +843,34 @@ var ElvWalletClient = /*#__PURE__*/function () {
     }
   }, {
     key: "SetAuthorization",
-    value: function SetAuthorization(_ref1) {
+    value: function SetAuthorization(_ref11) {
       var _this3 = this;
-      var clusterToken = _ref1.clusterToken,
-        fabricToken = _ref1.fabricToken,
-        tenantId = _ref1.tenantId,
-        address = _ref1.address,
-        email = _ref1.email,
-        expiresAt = _ref1.expiresAt,
-        signerURIs = _ref1.signerURIs,
-        walletType = _ref1.walletType,
-        walletName = _ref1.walletName,
-        nonce = _ref1.nonce,
-        _ref1$register = _ref1.register,
-        register = _ref1$register === void 0 ? false : _ref1$register;
+      var clusterToken = _ref11.clusterToken,
+        fabricToken = _ref11.fabricToken,
+        refreshToken = _ref11.refreshToken,
+        tenantId = _ref11.tenantId,
+        address = _ref11.address,
+        email = _ref11.email,
+        expiresAt = _ref11.expiresAt,
+        signerURIs = _ref11.signerURIs,
+        walletType = _ref11.walletType,
+        walletName = _ref11.walletName,
+        nonce = _ref11.nonce,
+        installId = _ref11.installId,
+        _ref11$register = _ref11.register,
+        register = _ref11$register === void 0 ? false : _ref11$register;
       address = this.client.utils.FormatAddress(address);
       this.__authorization = {
         fabricToken: fabricToken,
+        refreshToken: refreshToken,
         tenantId: tenantId,
         address: address,
         email: email,
         expiresAt: expiresAt,
         walletType: walletType,
         walletName: walletName,
-        nonce: nonce
+        nonce: nonce,
+        installId: installId
       };
       if (clusterToken) {
         this.__authorization.clusterToken = clusterToken;
@@ -896,58 +903,58 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "SignMetamask",
     value: function () {
-      var _SignMetamask = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee12(_ref10) {
+      var _SignMetamask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(_ref12) {
         var message, address, accounts;
-        return _regeneratorRuntime.wrap(function (_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime.wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
-              message = _ref10.message, address = _ref10.address;
+              message = _ref12.message, address = _ref12.address;
               if (!(!inBrowser || !window.ethereum)) {
-                _context12.next = 1;
+                _context14.next = 3;
                 break;
               }
               throw Error("ElvWalletClient: Unable to initialize - Metamask not available");
-            case 1:
+            case 3:
               address = address || this.UserAddress();
-              _context12.next = 2;
+              _context14.next = 6;
               return window.ethereum.request({
                 method: "eth_requestAccounts"
               });
-            case 2:
-              accounts = _context12.sent;
+            case 6:
+              accounts = _context14.sent;
               if (!(address && !Utils.EqualAddress(accounts[0], address))) {
-                _context12.next = 3;
+                _context14.next = 9;
                 break;
               }
               throw Error("ElvWalletClient: Incorrect MetaMask account selected. Expected ".concat(address, ", got ").concat(accounts[0]));
-            case 3:
-              _context12.next = 4;
+            case 9:
+              _context14.next = 11;
               return window.ethereum.request({
                 method: "personal_sign",
                 params: [message, address, ""]
               });
-            case 4:
-              return _context12.abrupt("return", _context12.sent);
-            case 5:
+            case 11:
+              return _context14.abrupt("return", _context14.sent);
+            case 12:
             case "end":
-              return _context12.stop();
+              return _context14.stop();
           }
-        }, _callee12, this);
+        }, _callee14, this);
       }));
-      function SignMetamask(_x14) {
+      function SignMetamask(_x16) {
         return _SignMetamask.apply(this, arguments);
       }
       return SignMetamask;
     }()
   }, {
     key: "FlowURL",
-    value: function FlowURL(_ref11) {
-      var _ref11$type = _ref11.type,
-        type = _ref11$type === void 0 ? "flow" : _ref11$type,
-        flow = _ref11.flow,
-        marketplaceId = _ref11.marketplaceId,
-        _ref11$parameters = _ref11.parameters,
-        parameters = _ref11$parameters === void 0 ? {} : _ref11$parameters;
+    value: function FlowURL(_ref13) {
+      var _ref13$type = _ref13.type,
+        type = _ref13$type === void 0 ? "flow" : _ref13$type,
+        flow = _ref13.flow,
+        marketplaceId = _ref13.marketplaceId,
+        _ref13$parameters = _ref13.parameters,
+        parameters = _ref13$parameters === void 0 ? {} : _ref13$parameters;
       var url = new URL(this.appUrl);
       if (marketplaceId) {
         url.pathname = UrlJoin("/", type, flow, "marketplace", marketplaceId, Utils.B58(JSON.stringify(parameters)));
@@ -960,29 +967,29 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "GenerateCodeAuth",
     value: function () {
-      var _GenerateCodeAuth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
-        var _ref12,
+      var _GenerateCodeAuth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15() {
+        var _ref14,
           url,
           response,
-          _args13 = arguments;
-        return _regeneratorRuntime.wrap(function (_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+          _args15 = arguments;
+        return _regeneratorRuntime.wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              _ref12 = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {}, url = _ref12.url;
+              _ref14 = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {}, url = _ref14.url;
               if (url) {
-                _context13.next = 2;
+                _context15.next = 7;
                 break;
               }
-              _context13.next = 1;
+              _context15.next = 4;
               return this.LogInURL({
                 mode: "login"
               });
-            case 1:
-              url = _context13.sent;
+            case 4:
+              url = _context15.sent;
               url.searchParams.set("response", "code");
               url.searchParams.set("source", "code");
-            case 2:
-              _context13.next = 3;
+            case 7:
+              _context15.next = 9;
               return Utils.ResponseToJson(this.client.authClient.MakeAuthServiceRequest({
                 path: UrlJoin("as", "wlt", "login", "redirect", "metamask"),
                 method: "POST",
@@ -991,17 +998,17 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   dest: url.toString()
                 }
               }));
-            case 3:
-              response = _context13.sent;
+            case 9:
+              response = _context15.sent;
               response.code = response.id;
               response.url = response.url.startsWith("https://") ? response.url : "https://".concat(response.url);
               response.metamask_url = response.metamask_url.startsWith("https://") ? response.metamask_url : "https://".concat(response.metamask_url);
-              return _context13.abrupt("return", response);
-            case 4:
+              return _context15.abrupt("return", response);
+            case 14:
             case "end":
-              return _context13.stop();
+              return _context15.stop();
           }
-        }, _callee13, this);
+        }, _callee15, this);
       }));
       function GenerateCodeAuth() {
         return _GenerateCodeAuth.apply(this, arguments);
@@ -1011,13 +1018,13 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "SetCodeAuth",
     value: function () {
-      var _SetCodeAuth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee14(_ref13) {
+      var _SetCodeAuth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(_ref15) {
         var code, address, type, authToken, expiresAt, additionalPayload;
-        return _regeneratorRuntime.wrap(function (_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime.wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              code = _ref13.code, address = _ref13.address, type = _ref13.type, authToken = _ref13.authToken, expiresAt = _ref13.expiresAt, additionalPayload = _objectWithoutProperties(_ref13, _excluded);
-              _context14.next = 1;
+              code = _ref15.code, address = _ref15.address, type = _ref15.type, authToken = _ref15.authToken, expiresAt = _ref15.expiresAt, additionalPayload = _objectWithoutProperties(_ref15, _excluded);
+              _context16.next = 3;
               return Utils.ResponseToJson(this.client.authClient.MakeAuthServiceRequest({
                 path: UrlJoin("as", "wlt", "login", "session", code),
                 method: "POST",
@@ -1037,13 +1044,13 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   }, additionalPayload))
                 }
               }));
-            case 1:
+            case 3:
             case "end":
-              return _context14.stop();
+              return _context16.stop();
           }
-        }, _callee14, this);
+        }, _callee16, this);
       }));
-      function SetCodeAuth(_x15) {
+      function SetCodeAuth(_x17) {
         return _SetCodeAuth.apply(this, arguments);
       }
       return SetCodeAuth;
@@ -1051,37 +1058,37 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "GetCodeAuth",
     value: function () {
-      var _GetCodeAuth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee15(_ref14) {
-        var code, passcode, _t7;
-        return _regeneratorRuntime.wrap(function (_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+      var _GetCodeAuth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(_ref16) {
+        var code, passcode;
+        return _regeneratorRuntime.wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              code = _ref14.code, passcode = _ref14.passcode;
-              _context15.prev = 1;
-              _context15.next = 2;
+              code = _ref16.code, passcode = _ref16.passcode;
+              _context17.prev = 1;
+              _context17.next = 4;
               return Utils.ResponseToJson(this.client.authClient.MakeAuthServiceRequest({
                 path: UrlJoin("as", "wlt", "login", "redirect", "metamask", code, passcode),
                 method: "GET"
               }));
-            case 2:
-              return _context15.abrupt("return", _context15.sent);
-            case 3:
-              _context15.prev = 3;
-              _t7 = _context15["catch"](1);
-              if (!(_t7 && _t7.status === 404)) {
-                _context15.next = 4;
+            case 4:
+              return _context17.abrupt("return", _context17.sent);
+            case 7:
+              _context17.prev = 7;
+              _context17.t0 = _context17["catch"](1);
+              if (!(_context17.t0 && _context17.t0.status === 404)) {
+                _context17.next = 11;
                 break;
               }
-              return _context15.abrupt("return", undefined);
-            case 4:
-              throw _t7;
-            case 5:
+              return _context17.abrupt("return", undefined);
+            case 11:
+              throw _context17.t0;
+            case 12:
             case "end":
-              return _context15.stop();
+              return _context17.stop();
           }
-        }, _callee15, this, [[1, 3]]);
+        }, _callee17, this, [[1, 7]]);
       }));
-      function GetCodeAuth(_x16) {
+      function GetCodeAuth(_x18) {
         return _GetCodeAuth.apply(this, arguments);
       }
       return GetCodeAuth;
@@ -1089,13 +1096,13 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "TopLevelInfo",
     value: function () {
-      var _TopLevelInfo = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee16() {
+      var _TopLevelInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18() {
         var forceReload,
-          _args16 = arguments;
-        return _regeneratorRuntime.wrap(function (_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+          _args18 = arguments;
+        return _regeneratorRuntime.wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              forceReload = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : false;
+              forceReload = _args18.length > 0 && _args18[0] !== undefined ? _args18[0] : false;
               if (!this.topLevelInfoPromise || forceReload) {
                 this.topLevelInfoPromise = this.client.utils.ResponseToJson(this.client.MakeAuthServiceRequest({
                   path: "/as/mw/toplevel",
@@ -1104,15 +1111,15 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   }
                 }));
               }
-              _context16.next = 1;
+              _context18.next = 4;
               return this.topLevelInfoPromise;
-            case 1:
-              return _context16.abrupt("return", _context16.sent);
-            case 2:
+            case 4:
+              return _context18.abrupt("return", _context18.sent);
+            case 5:
             case "end":
-              return _context16.stop();
+              return _context18.stop();
           }
-        }, _callee16, this);
+        }, _callee18, this);
       }));
       function TopLevelInfo() {
         return _TopLevelInfo.apply(this, arguments);
@@ -1122,25 +1129,25 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "LoadAvailableMarketplaces",
     value: function () {
-      var _LoadAvailableMarketplaces = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee18() {
+      var _LoadAvailableMarketplaces = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee20() {
         var _this4 = this;
         var forceReload,
-          _args18 = arguments;
-        return _regeneratorRuntime.wrap(function (_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+          _args20 = arguments;
+        return _regeneratorRuntime.wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              forceReload = _args18.length > 0 && _args18[0] !== undefined ? _args18[0] : false;
+              forceReload = _args20.length > 0 && _args20[0] !== undefined ? _args20[0] : false;
               if (!this.availableMarketplacesPromise || forceReload) {
-                this.availableMarketplacesPromise = new Promise(/*#__PURE__*/function () {
-                  var _ref15 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee17(resolve) {
+                this.availableMarketplacesPromise = new Promise( /*#__PURE__*/function () {
+                  var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19(resolve) {
                     var topLevelInfo, marketplaces, availableMarketplaces, availableMarketplacesById;
-                    return _regeneratorRuntime.wrap(function (_context17) {
-                      while (1) switch (_context17.prev = _context17.next) {
+                    return _regeneratorRuntime.wrap(function _callee19$(_context19) {
+                      while (1) switch (_context19.prev = _context19.next) {
                         case 0:
-                          _context17.next = 1;
+                          _context19.next = 2;
                           return _this4.TopLevelInfo();
-                        case 1:
-                          topLevelInfo = _context17.sent;
+                        case 2:
+                          topLevelInfo = _context19.sent;
                           marketplaces = topLevelInfo.marketplaces;
                           availableMarketplaces = _objectSpread({}, _this4.availableMarketplaces || {});
                           availableMarketplacesById = _objectSpread({}, _this4.availableMarketplacesById || {});
@@ -1162,24 +1169,24 @@ var ElvWalletClient = /*#__PURE__*/function () {
                           _this4.availableMarketplaces = availableMarketplaces;
                           _this4.availableMarketplacesById = availableMarketplacesById;
                           resolve();
-                        case 2:
+                        case 10:
                         case "end":
-                          return _context17.stop();
+                          return _context19.stop();
                       }
-                    }, _callee17);
+                    }, _callee19);
                   }));
-                  return function (_x17) {
-                    return _ref15.apply(this, arguments);
+                  return function (_x19) {
+                    return _ref17.apply(this, arguments);
                   };
                 }());
               }
-              _context18.next = 1;
+              _context20.next = 4;
               return this.availableMarketplacesPromise;
-            case 1:
+            case 4:
             case "end":
-              return _context18.stop();
+              return _context20.stop();
           }
-        }, _callee18, this);
+        }, _callee20, this);
       }));
       function LoadAvailableMarketplaces() {
         return _LoadAvailableMarketplaces.apply(this, arguments);
@@ -1189,25 +1196,25 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "LatestMarketplaceHash",
     value: function () {
-      var _LatestMarketplaceHash = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee19(_ref16) {
+      var _LatestMarketplaceHash = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21(_ref18) {
         var marketplaceParams, marketplaceInfo, marketplaceLink;
-        return _regeneratorRuntime.wrap(function (_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime.wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
-              marketplaceParams = _ref16.marketplaceParams;
-              _context19.next = 1;
+              marketplaceParams = _ref18.marketplaceParams;
+              _context21.next = 3;
               return this.MarketplaceInfo({
                 marketplaceParams: marketplaceParams
               });
-            case 1:
-              marketplaceInfo = _context19.sent;
+            case 3:
+              marketplaceInfo = _context21.sent;
               if (!(this.previewMarketplaceId && Utils.EqualHash(this.previewMarketplaceId, marketplaceInfo.marketplaceId))) {
-                _context19.next = 2;
+                _context21.next = 6;
                 break;
               }
-              return _context19.abrupt("return", this.previewMarketplaceHash);
-            case 2:
-              _context19.next = 3;
+              return _context21.abrupt("return", this.previewMarketplaceHash);
+            case 6:
+              _context21.next = 8;
               return this.client.ContentObjectMetadata({
                 libraryId: this.mainSiteLibraryId,
                 objectId: this.mainSiteId,
@@ -1215,16 +1222,16 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 resolveLinks: false,
                 noAuth: true
               });
-            case 3:
-              marketplaceLink = _context19.sent;
-              return _context19.abrupt("return", LinkTargetHash(marketplaceLink));
-            case 4:
+            case 8:
+              marketplaceLink = _context21.sent;
+              return _context21.abrupt("return", LinkTargetHash(marketplaceLink));
+            case 10:
             case "end":
-              return _context19.stop();
+              return _context21.stop();
           }
-        }, _callee19, this);
+        }, _callee21, this);
       }));
-      function LatestMarketplaceHash(_x18) {
+      function LatestMarketplaceHash(_x20) {
         return _LatestMarketplaceHash.apply(this, arguments);
       }
       return LatestMarketplaceHash;
@@ -1232,37 +1239,37 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "LoadMarketplace",
     value: function () {
-      var _LoadMarketplace = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee21(marketplaceParams) {
+      var _LoadMarketplace = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee23(marketplaceParams) {
         var _this5 = this;
-        var marketplaceInfo, marketplaceId, marketplaceHash, marketplace, _t9;
-        return _regeneratorRuntime.wrap(function (_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        var marketplaceInfo, marketplaceId, marketplaceHash, marketplace;
+        return _regeneratorRuntime.wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              _context21.next = 1;
+              _context23.next = 2;
               return this.LoadAvailableMarketplaces();
-            case 1:
+            case 2:
               marketplaceInfo = this.MarketplaceInfo({
                 marketplaceParams: marketplaceParams
               });
               marketplaceId = marketplaceInfo.marketplaceId;
-              _context21.next = 2;
+              _context23.next = 6;
               return this.LatestMarketplaceHash({
                 marketplaceParams: marketplaceParams
               });
-            case 2:
-              marketplaceHash = _context21.sent;
+            case 6:
+              marketplaceHash = _context23.sent;
               if (this.cachedMarketplaces[marketplaceId] && this.cachedMarketplaces[marketplaceId].versionHash !== marketplaceHash) {
                 delete this.cachedMarketplaces[marketplaceId];
               }
               if (this.cachedMarketplaces[marketplaceId]) {
-                _context21.next = 11;
+                _context23.next = 36;
                 break;
               }
               if (!(this.previewMarketplaceId && Utils.EqualHash(marketplaceId, this.previewMarketplaceId))) {
-                _context21.next = 4;
+                _context23.next = 15;
                 break;
               }
-              _context21.next = 3;
+              _context23.next = 12;
               return this.client.ContentObjectMetadata({
                 versionHash: this.previewMarketplaceHash,
                 metadataSubtree: "/public/asset_metadata/info",
@@ -1274,12 +1281,12 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 produceLinkUrls: true,
                 authorizationToken: this.publicStaticToken
               });
-            case 3:
-              marketplace = _context21.sent;
-              _context21.next = 6;
+            case 12:
+              marketplace = _context23.sent;
+              _context23.next = 18;
               break;
-            case 4:
-              _context21.next = 5;
+            case 15:
+              _context23.next = 17;
               return this.client.ContentObjectMetadata({
                 libraryId: this.mainSiteLibraryId,
                 objectId: this.mainSiteId,
@@ -1292,14 +1299,14 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 produceLinkUrls: true,
                 authorizationToken: this.publicStaticToken
               });
-            case 5:
-              marketplace = _context21.sent;
-            case 6:
+            case 17:
+              marketplace = _context23.sent;
+            case 18:
               if (!marketplace.branding.use_tenant_styling) {
-                _context21.next = 9;
+                _context23.next = 25;
                 break;
               }
-              _context21.next = 7;
+              _context23.next = 21;
               return this.client.ContentObjectMetadata({
                 libraryId: this.mainSiteLibraryId,
                 objectId: this.mainSiteId,
@@ -1307,68 +1314,68 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 authorizationToken: this.publicStaticToken,
                 produceLinkUrls: true
               });
-            case 7:
-              _t9 = _context21.sent;
-              if (_t9) {
-                _context21.next = 8;
+            case 21:
+              _context23.t0 = _context23.sent;
+              if (_context23.t0) {
+                _context23.next = 24;
                 break;
               }
-              _t9 = {};
-            case 8:
-              marketplace.tenantBranding = _t9;
-            case 9:
-              _context21.next = 10;
-              return Promise.all(marketplace.items.map(/*#__PURE__*/function () {
-                var _ref17 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee20(item, index) {
-                  var authorizationToken, _t8;
-                  return _regeneratorRuntime.wrap(function (_context20) {
-                    while (1) switch (_context20.prev = _context20.next) {
+              _context23.t0 = {};
+            case 24:
+              marketplace.tenantBranding = _context23.t0;
+            case 25:
+              _context23.next = 27;
+              return Promise.all(marketplace.items.map( /*#__PURE__*/function () {
+                var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee22(item, index) {
+                  var authorizationToken;
+                  return _regeneratorRuntime.wrap(function _callee22$(_context22) {
+                    while (1) switch (_context22.prev = _context22.next) {
                       case 0:
                         if (!item.requires_permissions) {
-                          _context20.next = 5;
+                          _context22.next = 14;
                           break;
                         }
                         if (_this5.loggedIn) {
-                          _context20.next = 2;
+                          _context22.next = 5;
                           break;
                         }
-                        _context20.next = 1;
+                        _context22.next = 4;
                         return _this5.client.CreateFabricToken({});
-                      case 1:
-                        authorizationToken = _context20.sent;
-                      case 2:
-                        _context20.prev = 2;
-                        _context20.next = 3;
+                      case 4:
+                        authorizationToken = _context22.sent;
+                      case 5:
+                        _context22.prev = 5;
+                        _context22.next = 8;
                         return _this5.client.ContentObjectMetadata({
                           versionHash: LinkTargetHash(item.nft_template),
                           metadataSubtree: "permissioned",
                           authorizationToken: authorizationToken
                         });
-                      case 3:
+                      case 8:
                         item.authorized = true;
-                        _context20.next = 5;
+                        _context22.next = 14;
                         break;
-                      case 4:
-                        _context20.prev = 4;
-                        _t8 = _context20["catch"](2);
+                      case 11:
+                        _context22.prev = 11;
+                        _context22.t0 = _context22["catch"](5);
                         item.authorized = false;
-                      case 5:
+                      case 14:
                         item.nftTemplateMetadata = (item.nft_template || {}).nft || {};
                         item.nftTemplateHash = ((item.nft_template || {})["."] || {}).source;
                         item.itemIndex = index;
-                        return _context20.abrupt("return", item);
-                      case 6:
+                        return _context22.abrupt("return", item);
+                      case 18:
                       case "end":
-                        return _context20.stop();
+                        return _context22.stop();
                     }
-                  }, _callee20, null, [[2, 4]]);
+                  }, _callee22, null, [[5, 11]]);
                 }));
-                return function (_x20, _x21) {
-                  return _ref17.apply(this, arguments);
+                return function (_x22, _x23) {
+                  return _ref19.apply(this, arguments);
                 };
               }()));
-            case 10:
-              marketplace.items = _context21.sent;
+            case 27:
+              marketplace.items = _context23.sent;
               marketplace.collections = (marketplace.collections || []).map(function (collection, collectionIndex) {
                 return _objectSpread(_objectSpread({}, collection), {}, {
                   collectionIndex: collectionIndex
@@ -1403,15 +1410,15 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 } catch (error) {}
               });
               this.cachedMarketplaces[marketplaceId] = marketplace;
-            case 11:
-              return _context21.abrupt("return", this.cachedMarketplaces[marketplaceId]);
-            case 12:
+            case 36:
+              return _context23.abrupt("return", this.cachedMarketplaces[marketplaceId]);
+            case 37:
             case "end":
-              return _context21.stop();
+              return _context23.stop();
           }
-        }, _callee21, this);
+        }, _callee23, this);
       }));
-      function LoadMarketplace(_x19) {
+      function LoadMarketplace(_x21) {
         return _LoadMarketplace.apply(this, arguments);
       }
       return LoadMarketplace;
@@ -1419,14 +1426,14 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "FilteredQuery",
     value: function () {
-      var _FilteredQuery = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee22() {
+      var _FilteredQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee24() {
         var _this6 = this;
-        var _ref18,
-          _ref18$mode,
+        var _ref20,
+          _ref20$mode,
           mode,
-          _ref18$sortBy,
+          _ref20$sortBy,
           sortBy,
-          _ref18$sortDesc,
+          _ref20$sortDesc,
           sortDesc,
           filter,
           editionFilters,
@@ -1442,15 +1449,15 @@ var ElvWalletClient = /*#__PURE__*/function () {
           capLimit,
           userAddress,
           sellerAddress,
-          _ref18$lastNDays,
+          _ref20$lastNDays,
           lastNDays,
           startTime,
           endTime,
-          _ref18$includeCheckou,
+          _ref20$includeCheckou,
           includeCheckoutLocked,
-          _ref18$start,
+          _ref20$start,
           start,
-          _ref18$limit,
+          _ref20$limit,
           limit,
           params,
           marketplaceInfo,
@@ -1458,20 +1465,15 @@ var ElvWalletClient = /*#__PURE__*/function () {
           filters,
           headers,
           path,
-          _ref20,
+          _ref22,
           contents,
           paging,
           modesToFormat,
-          _args22 = arguments,
-          _t0,
-          _t1,
-          _t10,
-          _t11,
-          _t12;
-        return _regeneratorRuntime.wrap(function (_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+          _args24 = arguments;
+        return _regeneratorRuntime.wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              _ref18 = _args22.length > 0 && _args22[0] !== undefined ? _args22[0] : {}, _ref18$mode = _ref18.mode, mode = _ref18$mode === void 0 ? "listings" : _ref18$mode, _ref18$sortBy = _ref18.sortBy, sortBy = _ref18$sortBy === void 0 ? "created" : _ref18$sortBy, _ref18$sortDesc = _ref18.sortDesc, sortDesc = _ref18$sortDesc === void 0 ? false : _ref18$sortDesc, filter = _ref18.filter, editionFilters = _ref18.editionFilters, attributeFilters = _ref18.attributeFilters, contractAddress = _ref18.contractAddress, tokenId = _ref18.tokenId, currency = _ref18.currency, marketplaceParams = _ref18.marketplaceParams, tenantId = _ref18.tenantId, collectionIndexes = _ref18.collectionIndexes, priceRange = _ref18.priceRange, tokenIdRange = _ref18.tokenIdRange, capLimit = _ref18.capLimit, userAddress = _ref18.userAddress, sellerAddress = _ref18.sellerAddress, _ref18$lastNDays = _ref18.lastNDays, lastNDays = _ref18$lastNDays === void 0 ? -1 : _ref18$lastNDays, startTime = _ref18.startTime, endTime = _ref18.endTime, _ref18$includeCheckou = _ref18.includeCheckoutLocked, includeCheckoutLocked = _ref18$includeCheckou === void 0 ? false : _ref18$includeCheckou, _ref18$start = _ref18.start, start = _ref18$start === void 0 ? 0 : _ref18$start, _ref18$limit = _ref18.limit, limit = _ref18$limit === void 0 ? 50 : _ref18$limit;
+              _ref20 = _args24.length > 0 && _args24[0] !== undefined ? _args24[0] : {}, _ref20$mode = _ref20.mode, mode = _ref20$mode === void 0 ? "listings" : _ref20$mode, _ref20$sortBy = _ref20.sortBy, sortBy = _ref20$sortBy === void 0 ? "created" : _ref20$sortBy, _ref20$sortDesc = _ref20.sortDesc, sortDesc = _ref20$sortDesc === void 0 ? false : _ref20$sortDesc, filter = _ref20.filter, editionFilters = _ref20.editionFilters, attributeFilters = _ref20.attributeFilters, contractAddress = _ref20.contractAddress, tokenId = _ref20.tokenId, currency = _ref20.currency, marketplaceParams = _ref20.marketplaceParams, tenantId = _ref20.tenantId, collectionIndexes = _ref20.collectionIndexes, priceRange = _ref20.priceRange, tokenIdRange = _ref20.tokenIdRange, capLimit = _ref20.capLimit, userAddress = _ref20.userAddress, sellerAddress = _ref20.sellerAddress, _ref20$lastNDays = _ref20.lastNDays, lastNDays = _ref20$lastNDays === void 0 ? -1 : _ref20$lastNDays, startTime = _ref20.startTime, endTime = _ref20.endTime, _ref20$includeCheckou = _ref20.includeCheckoutLocked, includeCheckoutLocked = _ref20$includeCheckou === void 0 ? false : _ref20$includeCheckou, _ref20$start = _ref20.start, start = _ref20$start === void 0 ? 0 : _ref20$start, _ref20$limit = _ref20.limit, limit = _ref20$limit === void 0 ? 50 : _ref20$limit;
               collectionIndexes = (collectionIndexes || []).map(function (i) {
                 return parseInt(i);
               });
@@ -1490,27 +1492,27 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 params.checkout = true;
               }
               if (!marketplaceParams) {
-                _context22.next = 3;
+                _context24.next = 14;
                 break;
               }
-              _context22.next = 1;
+              _context24.next = 9;
               return this.MarketplaceInfo({
                 marketplaceParams: marketplaceParams
               });
-            case 1:
-              marketplaceInfo = _context22.sent;
+            case 9:
+              marketplaceInfo = _context24.sent;
               if (!(collectionIndexes.length > 0)) {
-                _context22.next = 3;
+                _context24.next = 14;
                 break;
               }
-              _context22.next = 2;
+              _context24.next = 13;
               return this.Marketplace({
                 marketplaceParams: marketplaceParams
               });
-            case 2:
-              marketplace = _context22.sent;
-            case 3:
-              _context22.prev = 3;
+            case 13:
+              marketplace = _context24.sent;
+            case 14:
+              _context24.prev = 14;
               filters = [];
               if (sellerAddress) {
                 filters.push("seller:eq:".concat(this.client.utils.FormatAddress(sellerAddress)));
@@ -1570,9 +1572,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 });
               }
               if (attributeFilters) {
-                attributeFilters.map(function (_ref19) {
-                  var name = _ref19.name,
-                    value = _ref19.value;
+                attributeFilters.map(function (_ref21) {
+                  var name = _ref21.name,
+                    value = _ref21.value;
                   if (!name || !value) {
                     return;
                   }
@@ -1611,84 +1613,84 @@ var ElvWalletClient = /*#__PURE__*/function () {
               if (capLimit) {
                 filters.push("info/cap:le:".concat(parseInt(capLimit)));
               }
-              _t0 = mode;
-              _context22.next = _t0 === "owned" ? 4 : _t0 === "owned-full-meta" ? 5 : _t0 === "listings" ? 6 : _t0 === "transfers" ? 7 : _t0 === "sales" ? 8 : _t0 === "listing-stats" ? 9 : _t0 === "sales-stats" ? 10 : _t0 === "leaderboard" ? 11 : 12;
+              _context24.t0 = mode;
+              _context24.next = _context24.t0 === "owned" ? 29 : _context24.t0 === "owned-full-meta" ? 31 : _context24.t0 === "listings" ? 34 : _context24.t0 === "transfers" ? 36 : _context24.t0 === "sales" ? 40 : _context24.t0 === "listing-stats" ? 44 : _context24.t0 === "sales-stats" ? 46 : _context24.t0 === "leaderboard" ? 49 : 51;
               break;
-            case 4:
+            case 29:
               path = UrlJoin("as", "wlt", userAddress || this.UserAddress());
-              return _context22.abrupt("continue", 12);
-            case 5:
+              return _context24.abrupt("break", 51);
+            case 31:
               path = UrlJoin("as", "apigw", "nfts");
               headers = {
                 Authorization: "Bearer ".concat(this.AuthToken())
               };
-              return _context22.abrupt("continue", 12);
-            case 6:
+              return _context24.abrupt("break", 51);
+            case 34:
               path = UrlJoin("as", "mkt", "f");
-              return _context22.abrupt("continue", 12);
-            case 7:
+              return _context24.abrupt("break", 51);
+            case 36:
               path = UrlJoin("as", "mkt", "hst", "f");
               filters.push("action:eq:TRANSFERRED");
               filters.push("action:eq:SOLD");
-              return _context22.abrupt("continue", 12);
-            case 8:
+              return _context24.abrupt("break", 51);
+            case 40:
               path = UrlJoin("as", "mkt", "hst", "f");
               filters.push("action:eq:SOLD");
               filters.push("seller:co:0x");
-              return _context22.abrupt("continue", 12);
-            case 9:
+              return _context24.abrupt("break", 51);
+            case 44:
               path = UrlJoin("as", "mkt", "stats", "listed");
-              return _context22.abrupt("continue", 12);
-            case 10:
+              return _context24.abrupt("break", 51);
+            case 46:
               path = UrlJoin("as", "mkt", "stats", "sold");
               filters.push("seller:co:0x");
-              return _context22.abrupt("continue", 12);
-            case 11:
+              return _context24.abrupt("break", 51);
+            case 49:
               path = UrlJoin("as", "wlt", "leaders");
-              return _context22.abrupt("continue", 12);
-            case 12:
+              return _context24.abrupt("break", 51);
+            case 51:
               if (filters.length > 0) {
                 params.filter = filters;
               }
               if (!mode.includes("stats")) {
-                _context22.next = 14;
+                _context24.next = 56;
                 break;
               }
-              _context22.next = 13;
+              _context24.next = 55;
               return Utils.ResponseToJson(this.client.authClient.MakeAuthServiceRequest({
                 path: path,
                 method: "GET",
                 queryParams: params,
                 headers: headers
               }));
-            case 13:
-              return _context22.abrupt("return", _context22.sent);
-            case 14:
-              _t10 = Utils;
-              _context22.next = 15;
+            case 55:
+              return _context24.abrupt("return", _context24.sent);
+            case 56:
+              _context24.t2 = Utils;
+              _context24.next = 59;
               return this.client.authClient.MakeAuthServiceRequest({
                 path: path,
                 method: "GET",
                 queryParams: params,
                 headers: headers
               });
-            case 15:
-              _t11 = _context22.sent;
-              _context22.next = 16;
-              return _t10.ResponseToJson.call(_t10, _t11);
-            case 16:
-              _t1 = _context22.sent;
-              if (_t1) {
-                _context22.next = 17;
+            case 59:
+              _context24.t3 = _context24.sent;
+              _context24.next = 62;
+              return _context24.t2.ResponseToJson.call(_context24.t2, _context24.t3);
+            case 62:
+              _context24.t1 = _context24.sent;
+              if (_context24.t1) {
+                _context24.next = 65;
                 break;
               }
-              _t1 = [];
-            case 17:
-              _ref20 = _t1;
-              contents = _ref20.contents;
-              paging = _ref20.paging;
+              _context24.t1 = [];
+            case 65:
+              _ref22 = _context24.t1;
+              contents = _ref22.contents;
+              paging = _ref22.paging;
               modesToFormat = ["owned", "listings", "owned-full-meta"];
-              return _context22.abrupt("return", {
+              return _context24.abrupt("return", {
                 paging: {
                   start: params.start,
                   limit: params.limit,
@@ -1699,14 +1701,14 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   return modesToFormat.includes(mode) ? FormatNFT(_this6, item) : item;
                 })
               });
-            case 18:
-              _context22.prev = 18;
-              _t12 = _context22["catch"](3);
-              if (!(_t12.status && _t12.status.toString() === "404")) {
-                _context22.next = 19;
+            case 72:
+              _context24.prev = 72;
+              _context24.t4 = _context24["catch"](14);
+              if (!(_context24.t4.status && _context24.t4.status.toString() === "404")) {
+                _context24.next = 76;
                 break;
               }
-              return _context22.abrupt("return", {
+              return _context24.abrupt("return", {
                 paging: {
                   start: params.start,
                   limit: params.limit,
@@ -1715,13 +1717,13 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 },
                 results: []
               });
-            case 19:
-              throw _t12;
-            case 20:
+            case 76:
+              throw _context24.t4;
+            case 77:
             case "end":
-              return _context22.stop();
+              return _context24.stop();
           }
-        }, _callee22, this, [[3, 18]]);
+        }, _callee24, this, [[14, 72]]);
       }));
       function FilteredQuery() {
         return _FilteredQuery.apply(this, arguments);
@@ -1731,26 +1733,26 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "MintingStatus",
     value: function () {
-      var _MintingStatus = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee23(_ref21) {
-        var marketplaceParams, tenantId, marketplaceInfo, response, _t13;
-        return _regeneratorRuntime.wrap(function (_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+      var _MintingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref23) {
+        var marketplaceParams, tenantId, marketplaceInfo, response;
+        return _regeneratorRuntime.wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              marketplaceParams = _ref21.marketplaceParams, tenantId = _ref21.tenantId;
+              marketplaceParams = _ref23.marketplaceParams, tenantId = _ref23.tenantId;
               if (tenantId) {
-                _context23.next = 2;
+                _context25.next = 6;
                 break;
               }
-              _context23.next = 1;
+              _context25.next = 4;
               return this.MarketplaceInfo({
                 marketplaceParams: marketplaceParams || this.selectedMarketplaceInfo
               });
-            case 1:
-              marketplaceInfo = _context23.sent;
+            case 4:
+              marketplaceInfo = _context25.sent;
               tenantId = marketplaceInfo.tenantId;
-            case 2:
-              _context23.prev = 2;
-              _context23.next = 3;
+            case 6:
+              _context25.prev = 6;
+              _context25.next = 9;
               return Utils.ResponseToJson(this.client.authClient.MakeAuthServiceRequest({
                 path: UrlJoin("as", "wlt", "status", "act", tenantId),
                 method: "GET",
@@ -1758,15 +1760,15 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   Authorization: "Bearer ".concat(this.AuthToken())
                 }
               }));
-            case 3:
-              response = _context23.sent;
-              return _context23.abrupt("return", response.map(function (status) {
+            case 9:
+              response = _context25.sent;
+              return _context25.abrupt("return", response.map(function (status) {
                 var _status$op$split = status.op.split(":"),
                   _status$op$split2 = _slicedToArray(_status$op$split, 3),
                   op = _status$op$split2[0],
                   address = _status$op$split2[1],
                   id = _status$op$split2[2];
-                address = address.startsWith("0x") ? Utils.FormatAddress(address) : address;
+                address = address && address.startsWith("0x") ? Utils.FormatAddress(address) : address;
                 var confirmationId, tokenId, offerId, giftId;
                 if (op === "nft-buy") {
                   confirmationId = id;
@@ -1822,18 +1824,18 @@ var ElvWalletClient = /*#__PURE__*/function () {
               }).sort(function (a, b) {
                 return a.ts < b.ts ? 1 : -1;
               }));
-            case 4:
-              _context23.prev = 4;
-              _t13 = _context23["catch"](2);
-              this.Log("Failed to retrieve minting status", true, _t13);
-              return _context23.abrupt("return", []);
-            case 5:
+            case 13:
+              _context25.prev = 13;
+              _context25.t0 = _context25["catch"](6);
+              this.Log("Failed to retrieve minting status", true, _context25.t0);
+              return _context25.abrupt("return", []);
+            case 17:
             case "end":
-              return _context23.stop();
+              return _context25.stop();
           }
-        }, _callee23, this, [[2, 4]]);
+        }, _callee25, this, [[6, 13]]);
       }));
-      function MintingStatus(_x22) {
+      function MintingStatus(_x24) {
         return _MintingStatus.apply(this, arguments);
       }
       return MintingStatus;
@@ -1841,17 +1843,17 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "DeployTenant",
     value: function () {
-      var _DeployTenant = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee24(_ref22) {
-        var tenantId, _ref22$tenantSlug, tenantSlug, tenantHash, _ref22$environment, environment, tenantLink, deployedTenantHash, body, token;
-        return _regeneratorRuntime.wrap(function (_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+      var _DeployTenant = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee26(_ref24) {
+        var tenantId, _ref24$tenantSlug, tenantSlug, tenantHash, _ref24$environment, environment, tenantLink, deployedTenantHash, body, token;
+        return _regeneratorRuntime.wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              tenantId = _ref22.tenantId, _ref22$tenantSlug = _ref22.tenantSlug, tenantSlug = _ref22$tenantSlug === void 0 ? "" : _ref22$tenantSlug, tenantHash = _ref22.tenantHash, _ref22$environment = _ref22.environment, environment = _ref22$environment === void 0 ? "production" : _ref22$environment;
+              tenantId = _ref24.tenantId, _ref24$tenantSlug = _ref24.tenantSlug, tenantSlug = _ref24$tenantSlug === void 0 ? "" : _ref24$tenantSlug, tenantHash = _ref24.tenantHash, _ref24$environment = _ref24.environment, environment = _ref24$environment === void 0 ? "production" : _ref24$environment;
               if (tenantHash) {
-                _context24.next = 4;
+                _context26.next = 11;
                 break;
               }
-              _context24.next = 1;
+              _context26.next = 4;
               return this.client.ContentObjectMetadata({
                 libraryId: this.mainSiteLibraryId,
                 objectId: this.mainSiteId,
@@ -1862,32 +1864,32 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 resolveIgnoreErrors: true,
                 select: ["."]
               });
-            case 1:
-              tenantLink = _context24.sent;
+            case 4:
+              tenantLink = _context26.sent;
               if (tenantLink) {
-                _context24.next = 2;
+                _context26.next = 7;
                 break;
               }
               throw Error("Eluvio Wallet Client: Invalid or missing tenancy: ".concat(tenantSlug));
-            case 2:
+            case 7:
               deployedTenantHash = tenantLink["."].source;
-              _context24.next = 3;
+              _context26.next = 10;
               return this.client.LatestVersionHash({
                 versionHash: deployedTenantHash
               });
-            case 3:
-              tenantHash = _context24.sent;
-            case 4:
+            case 10:
+              tenantHash = _context26.sent;
+            case 11:
               body = {
                 content_hash: tenantHash,
                 env: environment,
                 ts: Date.now()
               };
-              _context24.next = 5;
+              _context26.next = 14;
               return this.client.Sign(JSON.stringify(body));
-            case 5:
-              token = _context24.sent;
-              _context24.next = 6;
+            case 14:
+              token = _context26.sent;
+              _context26.next = 17;
               return this.client.authClient.MakeAuthServiceRequest({
                 path: UrlJoin("as", "tnt", "config", tenantId, "metadata"),
                 method: "POST",
@@ -1896,13 +1898,13 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   Authorization: "Bearer ".concat(token)
                 }
               });
-            case 6:
+            case 17:
             case "end":
-              return _context24.stop();
+              return _context26.stop();
           }
-        }, _callee24, this);
+        }, _callee26, this);
       }));
-      function DeployTenant(_x23) {
+      function DeployTenant(_x25) {
         return _DeployTenant.apply(this, arguments);
       }
       return DeployTenant;
@@ -1910,20 +1912,20 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "PurgeUrl",
     value: function () {
-      var _PurgeUrl = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref23) {
+      var _PurgeUrl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee27(_ref25) {
         var tenantId, url, body, token;
-        return _regeneratorRuntime.wrap(function (_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime.wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              tenantId = _ref23.tenantId, url = _ref23.url;
+              tenantId = _ref25.tenantId, url = _ref25.url;
               body = {
                 url: url
               };
-              _context25.next = 1;
+              _context27.next = 4;
               return this.client.CreateFabricToken({});
-            case 1:
-              token = _context25.sent;
-              _context25.next = 2;
+            case 4:
+              token = _context27.sent;
+              _context27.next = 7;
               return this.client.authClient.MakeAuthServiceRequest({
                 path: UrlJoin("as", "tnt", tenantId, "purge"),
                 method: "POST",
@@ -1932,13 +1934,13 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   Authorization: "Bearer ".concat(token)
                 }
               });
-            case 2:
+            case 7:
             case "end":
-              return _context25.stop();
+              return _context27.stop();
           }
-        }, _callee25, this);
+        }, _callee27, this);
       }));
-      function PurgeUrl(_x24) {
+      function PurgeUrl(_x26) {
         return _PurgeUrl.apply(this, arguments);
       }
       return PurgeUrl;
@@ -1978,50 +1980,50 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "Initialize",
-    value: (function () {
-      var _Initialize = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee26(_ref24) {
-        var client, _ref24$appId, appId, _ref24$network, network, _ref24$mode, mode, localization, marketplaceParams, previewMarketplaceId, _ref24$storeAuthToken, storeAuthToken, _ref24$skipMarketplac, skipMarketplaceLoad, _ref25, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, previewMarketplaceHash, walletClient, url, savedToken, _t14;
-        return _regeneratorRuntime.wrap(function (_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+    value: function () {
+      var _Initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee28(_ref26) {
+        var client, _ref26$appId, appId, _ref26$network, network, _ref26$mode, mode, localization, marketplaceParams, previewMarketplaceId, _ref26$storeAuthToken, storeAuthToken, _ref26$skipMarketplac, skipMarketplaceLoad, _ref27, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, previewMarketplaceHash, walletClient, url, savedToken;
+        return _regeneratorRuntime.wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              client = _ref24.client, _ref24$appId = _ref24.appId, appId = _ref24$appId === void 0 ? "general" : _ref24$appId, _ref24$network = _ref24.network, network = _ref24$network === void 0 ? "main" : _ref24$network, _ref24$mode = _ref24.mode, mode = _ref24$mode === void 0 ? "production" : _ref24$mode, localization = _ref24.localization, marketplaceParams = _ref24.marketplaceParams, previewMarketplaceId = _ref24.previewMarketplaceId, _ref24$storeAuthToken = _ref24.storeAuthToken, storeAuthToken = _ref24$storeAuthToken === void 0 ? true : _ref24$storeAuthToken, _ref24$skipMarketplac = _ref24.skipMarketplaceLoad, skipMarketplaceLoad = _ref24$skipMarketplac === void 0 ? false : _ref24$skipMarketplac;
-              _ref25 = marketplaceParams || {}, tenantSlug = _ref25.tenantSlug, marketplaceSlug = _ref25.marketplaceSlug, marketplaceId = _ref25.marketplaceId, marketplaceHash = _ref25.marketplaceHash;
+              client = _ref26.client, _ref26$appId = _ref26.appId, appId = _ref26$appId === void 0 ? "general" : _ref26$appId, _ref26$network = _ref26.network, network = _ref26$network === void 0 ? "main" : _ref26$network, _ref26$mode = _ref26.mode, mode = _ref26$mode === void 0 ? "production" : _ref26$mode, localization = _ref26.localization, marketplaceParams = _ref26.marketplaceParams, previewMarketplaceId = _ref26.previewMarketplaceId, _ref26$storeAuthToken = _ref26.storeAuthToken, storeAuthToken = _ref26$storeAuthToken === void 0 ? true : _ref26$storeAuthToken, _ref26$skipMarketplac = _ref26.skipMarketplaceLoad, skipMarketplaceLoad = _ref26$skipMarketplac === void 0 ? false : _ref26$skipMarketplac;
+              _ref27 = marketplaceParams || {}, tenantSlug = _ref27.tenantSlug, marketplaceSlug = _ref27.marketplaceSlug, marketplaceId = _ref27.marketplaceId, marketplaceHash = _ref27.marketplaceHash;
               if (Configuration[network]) {
-                _context26.next = 1;
+                _context28.next = 6;
                 break;
               }
               throw Error("ElvWalletClient: Invalid network ".concat(network));
-            case 1:
+            case 6:
               if (Configuration[network][mode]) {
-                _context26.next = 2;
+                _context28.next = 8;
                 break;
               }
               throw Error("ElvWalletClient: Invalid mode ".concat(mode));
-            case 2:
+            case 8:
               if (client) {
-                _context26.next = 4;
+                _context28.next = 12;
                 break;
               }
-              _context26.next = 3;
+              _context28.next = 11;
               return ElvClient.FromNetworkName({
                 networkName: network,
                 assumeV3: true
               });
-            case 3:
-              client = _context26.sent;
-            case 4:
+            case 11:
+              client = _context28.sent;
+            case 12:
               previewMarketplaceHash = previewMarketplaceId;
               if (!(previewMarketplaceHash && !previewMarketplaceHash.startsWith("hq__"))) {
-                _context26.next = 6;
+                _context28.next = 17;
                 break;
               }
-              _context26.next = 5;
+              _context28.next = 16;
               return client.LatestVersionHash({
                 objectId: previewMarketplaceId
               });
-            case 5:
-              previewMarketplaceHash = _context26.sent;
-            case 6:
+            case 16:
+              previewMarketplaceHash = _context28.sent;
+            case 17:
               walletClient = new ElvWalletClient({
                 appId: appId,
                 client: client,
@@ -2038,62 +2040,63 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 storeAuthToken: storeAuthToken
               });
               if (!(inBrowser && window.location && window.location.href)) {
-                _context26.next = 12;
+                _context28.next = 37;
                 break;
               }
               url = new URL(window.location.href);
               if (!url.searchParams.get("elvToken")) {
-                _context26.next = 8;
+                _context28.next = 27;
                 break;
               }
-              _context26.next = 7;
+              _context28.next = 23;
               return walletClient.Authenticate({
                 token: url.searchParams.get("elvToken")
               });
-            case 7:
+            case 23:
               url.searchParams["delete"]("elvToken");
               window.history.replaceState("", "", url);
-              _context26.next = 12;
+              _context28.next = 37;
               break;
-            case 8:
+            case 27:
               if (!(storeAuthToken && localStorageAvailable)) {
-                _context26.next = 12;
+                _context28.next = 37;
                 break;
               }
-              _context26.prev = 9;
+              _context28.prev = 28;
               // Load saved auth token
               savedToken = localStorage.getItem("__elv-token-".concat(network));
               if (!savedToken) {
-                _context26.next = 10;
+                _context28.next = 33;
                 break;
               }
-              _context26.next = 10;
+              _context28.next = 33;
               return walletClient.Authenticate({
                 token: savedToken
               });
-            case 10:
-              _context26.next = 12;
+            case 33:
+              _context28.next = 37;
               break;
-            case 11:
-              _context26.prev = 11;
-              _t14 = _context26["catch"](9);
-            case 12:
+            case 35:
+              _context28.prev = 35;
+              _context28.t0 = _context28["catch"](28);
+            case 37:
               if (!skipMarketplaceLoad) {
                 walletClient.LoadAvailableMarketplaces();
               }
-              return _context26.abrupt("return", walletClient);
-            case 13:
+              return _context28.abrupt("return", walletClient);
+            case 39:
             case "end":
-              return _context26.stop();
+              return _context28.stop();
           }
-        }, _callee26, null, [[9, 11]]);
+        }, _callee28, null, [[28, 35]]);
       }));
-      function Initialize(_x25) {
+      function Initialize(_x27) {
         return _Initialize.apply(this, arguments);
       }
       return Initialize;
-    }())
+    }()
   }]);
+  return ElvWalletClient;
 }();
 Object.assign(ElvWalletClient.prototype, require("./ClientMethods"));
 Object.assign(ElvWalletClient.prototype, require("./Profile"));