tek-wallet 0.0.383 → 0.0.385

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -152,7 +152,7 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
152
152
  var _b = (0, react_1.useState)(), selectedToken = _b[0], setSelectedToken = _b[1];
153
153
  var _c = (0, react_1.useState)(), selectedNetwork = _c[0], setSelectedNetwork = _c[1];
154
154
  var isAuthenticated = (0, useWalletData_1.default)().isAuthenticated;
155
- var _d = (0, useWithdrawData_1.default)(), withdrawTokens = _d.withdrawTokens, updateWithdrawToken = _d.updateWithdrawToken, updateSendInternalToken = _d.updateSendInternalToken;
155
+ var _d = (0, useWithdrawData_1.default)(), withdrawTokens = _d.withdrawTokens, updateWithdrawToken = _d.updateWithdrawToken, updateSendInternalToken = _d.updateSendInternalToken, sendInternalTokens = _d.sendInternalTokens;
156
156
  var _e = (0, react_1.useState)(), infoDialogContent = _e[0], setInfoDialogContent = _e[1];
157
157
  var _f = (0, react_1.useState)(""), amount = _f[0], setAmount = _f[1];
158
158
  var _g = (0, react_1.useState)(undefined), memo = _g[0], setMemo = _g[1];
@@ -164,13 +164,18 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
164
164
  var scannerAddressQrCodeRef = (0, react_1.useRef)(null);
165
165
  var backDropRef = (0, react_1.useRef)(null);
166
166
  var suggestUseTransferInternalDialogRef = (0, react_1.useRef)(null);
167
+ var suggestUseTransferExternalDialogRef = (0, react_1.useRef)(null);
167
168
  var _m = (0, react_1.useState)(), selectedMethod = _m[0], setSelectedMethod = _m[1];
168
169
  var _o = (0, react_1.useState)(), sendInfoGet = _o[0], setSendInfoGet = _o[1];
169
170
  var _p = (0, react_1.useState)(false), isLoadingEstimateFee = _p[0], setIsLoadingEstimateFee = _p[1];
170
171
  // const [estimateFee, setEstimateFee] = useState<number>();
171
172
  var _q = (0, react_1.useState)(), recipientAddressError = _q[0], setRecipientAddressError = _q[1];
172
- var _r = (0, react_1.useState)(), recipientAddressInternal = _r[0], setRecipientAddressInternal = _r[1];
173
173
  var onlyChangeAddress = (0, react_1.useRef)(false);
174
+ var withdrawToken = (0, react_1.useMemo)(function () {
175
+ return selectedMethod === SendMethods.TRANSFER_EXTERNAL
176
+ ? withdrawTokens
177
+ : sendInternalTokens;
178
+ }, [withdrawTokens, sendInternalTokens, selectedMethod]);
174
179
  var networks = (0, react_1.useMemo)(function () {
175
180
  console.warn("🚀 ~ networks ~ selectedToken:", selectedToken);
176
181
  if (!selectedToken) {
@@ -191,7 +196,6 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
191
196
  setRecipientAddress("");
192
197
  setSelectedMethod(undefined);
193
198
  setSendInfoGet(undefined);
194
- setRecipientAddressInternal(undefined);
195
199
  setAmountError(undefined);
196
200
  setAmountErrorMessage(undefined);
197
201
  setHiddenError(true);
@@ -274,14 +278,13 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
274
278
  (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props, e);
275
279
  };
276
280
  var findWithdrawToken = function (contract_address) {
277
- return withdrawTokens === null || withdrawTokens === void 0 ? void 0 : withdrawTokens.find(function (item) { return (item === null || item === void 0 ? void 0 : item.address) === contract_address; });
281
+ return withdrawToken === null || withdrawToken === void 0 ? void 0 : withdrawToken.find(function (item) { return (item === null || item === void 0 ? void 0 : item.address) === contract_address; });
278
282
  };
279
283
  var handleSelectTransferInternal = function (tonTransferParam) {
280
284
  var _a;
281
285
  (_a = suggestUseTransferInternalDialogRef.current) === null || _a === void 0 ? void 0 : _a.close();
282
286
  var data = tonTransferParam !== null && tonTransferParam !== void 0 ? tonTransferParam : sendInfoGet;
283
- console.warn("🚀 ~ handleSelectTransferInternal ~ sendInfoGet:", data, recipientAddressInternal);
284
- setRecipientAddress(recipientAddressInternal);
287
+ setRecipientAddress(data === null || data === void 0 ? void 0 : data.address);
285
288
  setSelectedMethod(SendMethods.TRANSFER_INTERNAL);
286
289
  if (onlyChangeAddress.current) {
287
290
  return;
@@ -410,7 +413,6 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
410
413
  setRecipientAddressError(undefined);
411
414
  }
412
415
  if (!!(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.master_wallet_address)) {
413
- setRecipientAddressInternal(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.master_wallet_address);
414
416
  (_a = suggestUseTransferInternalDialogRef.current) === null || _a === void 0 ? void 0 : _a.open();
415
417
  }
416
418
  else if (!!(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.valid)) {
@@ -428,9 +430,9 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
428
430
  }); };
429
431
  var handleScanAllQrCode = function (result) { return __awaiter(void 0, void 0, void 0, function () {
430
432
  var text, isReceiveInternal, tonTransferParam, validateWalletAddress;
431
- var _a, _b, _c, _d, _e;
432
- return __generator(this, function (_f) {
433
- switch (_f.label) {
433
+ var _a, _b, _c, _d, _e, _f;
434
+ return __generator(this, function (_g) {
435
+ switch (_g.label) {
434
436
  case 0:
435
437
  (_a = scannerAllQrCodeRef.current) === null || _a === void 0 ? void 0 : _a.close();
436
438
  if (!result) return [3 /*break*/, 2];
@@ -440,19 +442,21 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
440
442
  tonTransferParam = isReceiveInternal
441
443
  ? JSON.parse(text)
442
444
  : (0, parseTonTransferUrl_1.default)(text);
443
- console.warn("🚀 ~ handleScanAllQrCode ~ tonTransferParam:", tonTransferParam);
444
- console.warn("🚀 ~ handleScanAllQrCode ~ tonTransferParam:", tonTransferParam);
445
445
  (_c = backDropRef.current) === null || _c === void 0 ? void 0 : _c.open();
446
446
  return [4 /*yield*/, (0, validate_wallet_address_service_1.default)({
447
447
  address: tonTransferParam === null || tonTransferParam === void 0 ? void 0 : tonTransferParam.address,
448
448
  network: (selectedNetwork === null || selectedNetwork === void 0 ? void 0 : selectedNetwork.slug) || "ton",
449
449
  })];
450
450
  case 1:
451
- validateWalletAddress = _f.sent();
451
+ validateWalletAddress = _g.sent();
452
452
  if (!validateWalletAddress) {
453
453
  setInfoDialogContent("Unsupported QR");
454
454
  return [2 /*return*/];
455
455
  }
456
+ if (validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.master_wallet_address) {
457
+ tonTransferParam.address =
458
+ validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.master_wallet_address;
459
+ }
456
460
  setSendInfoGet(tonTransferParam);
457
461
  (_d = backDropRef.current) === null || _d === void 0 ? void 0 : _d.close();
458
462
  console.warn("validateWalletAddress", validateWalletAddress);
@@ -467,7 +471,6 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
467
471
  setRecipientAddressError(undefined);
468
472
  }
469
473
  if (!!(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.master_wallet_address)) {
470
- setRecipientAddressInternal(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.master_wallet_address);
471
474
  if (isReceiveInternal ||
472
475
  selectedMethod === SendMethods.TRANSFER_INTERNAL) {
473
476
  handleSelectTransferInternal(tonTransferParam);
@@ -477,13 +480,19 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
477
480
  }
478
481
  }
479
482
  else if (!!(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.valid)) {
480
- handleSelectContinueTransferExternal(tonTransferParam);
483
+ if (selectedMethod === SendMethods.TRANSFER_EXTERNAL ||
484
+ selectedMethod === SendMethods.SCAN_QR_CODE) {
485
+ handleSelectContinueTransferExternal(tonTransferParam);
486
+ }
487
+ else {
488
+ (_f = suggestUseTransferExternalDialogRef.current) === null || _f === void 0 ? void 0 : _f.open();
489
+ }
481
490
  }
482
491
  else {
483
492
  setInfoDialogContent("Unsupported QR");
484
493
  setRecipientAddressError("Invalid wallet address");
485
494
  }
486
- _f.label = 2;
495
+ _g.label = 2;
487
496
  case 2: return [2 /*return*/];
488
497
  }
489
498
  });
@@ -535,10 +544,10 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
535
544
  }
536
545
  };
537
546
  (0, react_1.useEffect)(function () {
538
- if (isAuthenticated && !withdrawTokens) {
547
+ if (isAuthenticated && !withdrawToken) {
539
548
  updateWithdrawToken();
540
549
  }
541
- if (isAuthenticated && !withdrawTokens) {
550
+ if (isAuthenticated && !withdrawToken) {
542
551
  updateSendInternalToken();
543
552
  }
544
553
  }, [isAuthenticated]);
@@ -565,7 +574,7 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
565
574
  }, sx: {
566
575
  my: theme.mixins.customMargin.m12,
567
576
  } })] }, item));
568
- }) }) }, WithdrawStep.SELECT_METHOD), (0, jsx_runtime_1.jsx)(react_2.SwiperSlide, { children: (0, jsx_runtime_1.jsx)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { gap: theme.mixins.gaps.g12, height: "fit-content" }), children: withdrawTokens === null || withdrawTokens === void 0 ? void 0 : withdrawTokens.map(function (item) {
577
+ }) }) }, WithdrawStep.SELECT_METHOD), (0, jsx_runtime_1.jsx)(react_2.SwiperSlide, { children: (0, jsx_runtime_1.jsx)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { gap: theme.mixins.gaps.g12, height: "fit-content" }), children: withdrawToken === null || withdrawToken === void 0 ? void 0 : withdrawToken.map(function (item) {
569
578
  var stringifiedTokenData = JSON.stringify(item);
570
579
  if (!item)
571
580
  return null;
@@ -610,7 +619,11 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
610
619
  display: "grid",
611
620
  gridTemplateColumns: "1fr auto 1fr",
612
621
  gap: theme.mixins.gaps.g8,
613
- }, children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.dialogActionsCancel), { width: "100%" }), onClick: function () { return handleSelectContinueTransferExternal(); }, children: "Keep continue" }), (0, jsx_runtime_1.jsx)(material_1.Divider, { orientation: "vertical", variant: "middle", flexItem: true }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.dialogActionsOk), { width: "100%" }), onClick: function () { return handleSelectTransferInternal(); }, children: "Ok" })] }) }) })] }) }) }));
622
+ }, children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.dialogActionsCancel), { width: "100%" }), onClick: function () { return handleSelectContinueTransferExternal(); }, children: "Keep continue" }), (0, jsx_runtime_1.jsx)(material_1.Divider, { orientation: "vertical", variant: "middle", flexItem: true }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.dialogActionsOk), { width: "100%" }), onClick: function () { return handleSelectTransferInternal(); }, children: "Ok" })] }) }) }), (0, jsx_runtime_1.jsx)(AppDialog_1.default, { ref: suggestUseTransferExternalDialogRef, children: (0, jsx_runtime_1.jsx)(DialogContentLayout_1.default, { content: "This wallet only support send externally, move to this method?", actions: (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: {
623
+ display: "grid",
624
+ gridTemplateColumns: "1fr auto 1fr",
625
+ gap: theme.mixins.gaps.g8,
626
+ }, children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.dialogActionsCancel), { width: "100%" }), onClick: function () { var _a; return (_a = suggestUseTransferExternalDialogRef.current) === null || _a === void 0 ? void 0 : _a.close(); }, children: "Cancel" }), (0, jsx_runtime_1.jsx)(material_1.Divider, { orientation: "vertical", variant: "middle", flexItem: true }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.dialogActionsOk), { width: "100%" }), onClick: function () { return handleSelectContinueTransferExternal(); }, children: "Ok" })] }) }) })] }) }) }));
614
627
  });
615
628
  WithdrawFunction.displayName = "WithdrawFunction";
616
629
  exports.default = WithdrawFunction;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tek-wallet",
3
- "version": "0.0.383",
3
+ "version": "0.0.385",
4
4
  "description": "A custom React provider with TypeScript support",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",