Skip to content

Commit

Permalink
fix transaction link for solana pay (via socket update)
Browse files Browse the repository at this point in the history
  • Loading branch information
@0xNe0x1
0xNe0x1 committed Jan 25, 2024
1 parent ae050e0 commit b05c616
Show file tree
Hide file tree
Showing 11 changed files with 75 additions and 67 deletions.
2 changes: 1 addition & 1 deletion dist/esm/index.bundle.js
View file

Large diffs are not rendered by default.

32 changes: 17 additions & 15 deletions dist/esm/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29746,14 +29746,16 @@ var SolanaPayDialog = (function (props) {

socket.onmessage = function (event) {
if (event && event.data) {
var _data$params, _data$params$result;
var _data$params, _data$params$result, _data$params$result$v, _ref9, _data$params2, _data$params2$result, _data$params2$result$;

var data = JSON.parse(event.data);

if (data && data !== null && data !== void 0 && (_data$params = data.params) !== null && _data$params !== void 0 && (_data$params$result = _data$params.result) !== null && _data$params$result !== void 0 && _data$params$result.value) {
var _data$params2, _data$params2$result;
if (data && data !== null && data !== void 0 && (_data$params = data.params) !== null && _data$params !== void 0 && (_data$params$result = _data$params.result) !== null && _data$params$result !== void 0 && (_data$params$result$v = _data$params$result.value) !== null && _data$params$result$v !== void 0 && _data$params$result$v.logs && (_ref9 = (data === null || data === void 0 ? void 0 : (_data$params2 = data.params) === null || _data$params2 === void 0 ? void 0 : (_data$params2$result = _data$params2.result) === null || _data$params2$result === void 0 ? void 0 : (_data$params2$result$ = _data$params2$result.value) === null || _data$params2$result$ === void 0 ? void 0 : _data$params2$result$.logs) || []) !== null && _ref9 !== void 0 && _ref9.find(function (log) {
return log.match('Program DePayRG7ZySPWzeK9Kvq7aPeif7sdbBZNh6DHcvNj7F7');
})) {
var _data$params3, _data$params3$result;

var result = data === null || data === void 0 ? void 0 : (_data$params2 = data.params) === null || _data$params2 === void 0 ? void 0 : (_data$params2$result = _data$params2.result) === null || _data$params2$result === void 0 ? void 0 : _data$params2$result.value;
var result = data === null || data === void 0 ? void 0 : (_data$params3 = data.params) === null || _data$params3 === void 0 ? void 0 : (_data$params3$result = _data$params3.result) === null || _data$params3$result === void 0 ? void 0 : _data$params3$result.value;

if (result && result.err === null) {
setState('succeeded');
Expand Down Expand Up @@ -29804,7 +29806,7 @@ var SolanaPayDialog = (function (props) {
setPaymentValidationSocket(socket);

socket.onopen = /*#__PURE__*/function () {
var _ref9 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee5(event) {
var _ref10 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee5(event) {
var msg;
return regenerator.wrap(function _callee5$(_context5) {
while (1) {
Expand All @@ -29830,7 +29832,7 @@ var SolanaPayDialog = (function (props) {
}));

return function (_x6) {
return _ref9.apply(this, arguments);
return _ref10.apply(this, arguments);
};
}();

Expand Down Expand Up @@ -29960,9 +29962,9 @@ var SolanaPayDialog = (function (props) {
}
};

var trackTransaction = function trackTransaction(_ref10) {
var account = _ref10.account,
nonce = _ref10.nonce;
var trackTransaction = function trackTransaction(_ref11) {
var account = _ref11.account,
nonce = _ref11.nonce;
openTransactionTrackingSocket({
account: account,
nonce: nonce
Expand Down Expand Up @@ -29994,7 +29996,7 @@ var SolanaPayDialog = (function (props) {
});
_context7.next = 10;
return Promise.all(relevantTransactions.map( /*#__PURE__*/function () {
var _ref12 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee6(relevantTransaction) {
var _ref13 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee6(relevantTransaction) {
var fullTransactionData, foundRouterInstruction;
return regenerator.wrap(function _callee6$(_context6) {
while (1) {
Expand Down Expand Up @@ -30053,7 +30055,7 @@ var SolanaPayDialog = (function (props) {
}));

return function (_x7) {
return _ref12.apply(this, arguments);
return _ref13.apply(this, arguments);
};
}()));

Expand All @@ -30069,7 +30071,7 @@ var SolanaPayDialog = (function (props) {
};

var traceAndContinue = /*#__PURE__*/function () {
var _ref13 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee9(secretId, selectedPaymentOption, QRCodeURI) {
var _ref14 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee9(secretId, selectedPaymentOption, QRCodeURI) {
return regenerator.wrap(function _callee9$(_context9) {
while (1) {
switch (_context9.prev = _context9.next) {
Expand Down Expand Up @@ -30113,12 +30115,12 @@ var SolanaPayDialog = (function (props) {
}));

return function traceAndContinue(_x8, _x9, _x10) {
return _ref13.apply(this, arguments);
return _ref14.apply(this, arguments);
};
}();

var storePayment = /*#__PURE__*/function () {
var _ref15 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee10(transaction) {
var _ref16 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee10(transaction) {
return regenerator.wrap(function _callee10$(_context10) {
while (1) {
switch (_context10.prev = _context10.next) {
Expand Down Expand Up @@ -30172,7 +30174,7 @@ var SolanaPayDialog = (function (props) {
}));

return function storePayment(_x11) {
return _ref15.apply(this, arguments);
return _ref16.apply(this, arguments);
};
}();

Expand Down
2 changes: 1 addition & 1 deletion dist/esm/index.js.map
View file

Large diffs are not rendered by default.

32 changes: 17 additions & 15 deletions dist/esm/index.solana.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37339,14 +37339,16 @@ var SolanaPayDialog = (function (props) {

socket.onmessage = function (event) {
if (event && event.data) {
var _data$params, _data$params$result;
var _data$params, _data$params$result, _data$params$result$v, _ref9, _data$params2, _data$params2$result, _data$params2$result$;

var data = JSON.parse(event.data);

if (data && data !== null && data !== void 0 && (_data$params = data.params) !== null && _data$params !== void 0 && (_data$params$result = _data$params.result) !== null && _data$params$result !== void 0 && _data$params$result.value) {
var _data$params2, _data$params2$result;
if (data && data !== null && data !== void 0 && (_data$params = data.params) !== null && _data$params !== void 0 && (_data$params$result = _data$params.result) !== null && _data$params$result !== void 0 && (_data$params$result$v = _data$params$result.value) !== null && _data$params$result$v !== void 0 && _data$params$result$v.logs && (_ref9 = (data === null || data === void 0 ? void 0 : (_data$params2 = data.params) === null || _data$params2 === void 0 ? void 0 : (_data$params2$result = _data$params2.result) === null || _data$params2$result === void 0 ? void 0 : (_data$params2$result$ = _data$params2$result.value) === null || _data$params2$result$ === void 0 ? void 0 : _data$params2$result$.logs) || []) !== null && _ref9 !== void 0 && _ref9.find(function (log) {
return log.match('Program DePayRG7ZySPWzeK9Kvq7aPeif7sdbBZNh6DHcvNj7F7');
})) {
var _data$params3, _data$params3$result;

var result = data === null || data === void 0 ? void 0 : (_data$params2 = data.params) === null || _data$params2 === void 0 ? void 0 : (_data$params2$result = _data$params2.result) === null || _data$params2$result === void 0 ? void 0 : _data$params2$result.value;
var result = data === null || data === void 0 ? void 0 : (_data$params3 = data.params) === null || _data$params3 === void 0 ? void 0 : (_data$params3$result = _data$params3.result) === null || _data$params3$result === void 0 ? void 0 : _data$params3$result.value;

if (result && result.err === null) {
setState('succeeded');
Expand Down Expand Up @@ -37397,7 +37399,7 @@ var SolanaPayDialog = (function (props) {
setPaymentValidationSocket(socket);

socket.onopen = /*#__PURE__*/function () {
var _ref9 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee5(event) {
var _ref10 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee5(event) {
var msg;
return regenerator.wrap(function _callee5$(_context5) {
while (1) {
Expand All @@ -37423,7 +37425,7 @@ var SolanaPayDialog = (function (props) {
}));

return function (_x6) {
return _ref9.apply(this, arguments);
return _ref10.apply(this, arguments);
};
}();

Expand Down Expand Up @@ -37553,9 +37555,9 @@ var SolanaPayDialog = (function (props) {
}
};

var trackTransaction = function trackTransaction(_ref10) {
var account = _ref10.account,
nonce = _ref10.nonce;
var trackTransaction = function trackTransaction(_ref11) {
var account = _ref11.account,
nonce = _ref11.nonce;
openTransactionTrackingSocket({
account: account,
nonce: nonce
Expand Down Expand Up @@ -37587,7 +37589,7 @@ var SolanaPayDialog = (function (props) {
});
_context7.next = 10;
return Promise.all(relevantTransactions.map( /*#__PURE__*/function () {
var _ref12 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee6(relevantTransaction) {
var _ref13 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee6(relevantTransaction) {
var fullTransactionData, foundRouterInstruction;
return regenerator.wrap(function _callee6$(_context6) {
while (1) {
Expand Down Expand Up @@ -37646,7 +37648,7 @@ var SolanaPayDialog = (function (props) {
}));

return function (_x7) {
return _ref12.apply(this, arguments);
return _ref13.apply(this, arguments);
};
}()));

Expand All @@ -37662,7 +37664,7 @@ var SolanaPayDialog = (function (props) {
};

var traceAndContinue = /*#__PURE__*/function () {
var _ref13 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee9(secretId, selectedPaymentOption, QRCodeURI) {
var _ref14 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee9(secretId, selectedPaymentOption, QRCodeURI) {
return regenerator.wrap(function _callee9$(_context9) {
while (1) {
switch (_context9.prev = _context9.next) {
Expand Down Expand Up @@ -37706,12 +37708,12 @@ var SolanaPayDialog = (function (props) {
}));

return function traceAndContinue(_x8, _x9, _x10) {
return _ref13.apply(this, arguments);
return _ref14.apply(this, arguments);
};
}();

var storePayment = /*#__PURE__*/function () {
var _ref15 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee10(transaction) {
var _ref16 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee10(transaction) {
return regenerator.wrap(function _callee10$(_context10) {
while (1) {
switch (_context10.prev = _context10.next) {
Expand Down Expand Up @@ -37765,7 +37767,7 @@ var SolanaPayDialog = (function (props) {
}));

return function storePayment(_x11) {
return _ref15.apply(this, arguments);
return _ref16.apply(this, arguments);
};
}();

Expand Down
2 changes: 1 addition & 1 deletion dist/esm/index.solana.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/umd/index.bundle.js
View file

Large diffs are not rendered by default.

32 changes: 17 additions & 15 deletions dist/umd/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29742,14 +29742,16 @@

socket.onmessage = function (event) {
if (event && event.data) {
var _data$params, _data$params$result;
var _data$params, _data$params$result, _data$params$result$v, _ref9, _data$params2, _data$params2$result, _data$params2$result$;

var data = JSON.parse(event.data);

if (data && data !== null && data !== void 0 && (_data$params = data.params) !== null && _data$params !== void 0 && (_data$params$result = _data$params.result) !== null && _data$params$result !== void 0 && _data$params$result.value) {
var _data$params2, _data$params2$result;
if (data && data !== null && data !== void 0 && (_data$params = data.params) !== null && _data$params !== void 0 && (_data$params$result = _data$params.result) !== null && _data$params$result !== void 0 && (_data$params$result$v = _data$params$result.value) !== null && _data$params$result$v !== void 0 && _data$params$result$v.logs && (_ref9 = (data === null || data === void 0 ? void 0 : (_data$params2 = data.params) === null || _data$params2 === void 0 ? void 0 : (_data$params2$result = _data$params2.result) === null || _data$params2$result === void 0 ? void 0 : (_data$params2$result$ = _data$params2$result.value) === null || _data$params2$result$ === void 0 ? void 0 : _data$params2$result$.logs) || []) !== null && _ref9 !== void 0 && _ref9.find(function (log) {
return log.match('Program DePayRG7ZySPWzeK9Kvq7aPeif7sdbBZNh6DHcvNj7F7');
})) {
var _data$params3, _data$params3$result;

var result = data === null || data === void 0 ? void 0 : (_data$params2 = data.params) === null || _data$params2 === void 0 ? void 0 : (_data$params2$result = _data$params2.result) === null || _data$params2$result === void 0 ? void 0 : _data$params2$result.value;
var result = data === null || data === void 0 ? void 0 : (_data$params3 = data.params) === null || _data$params3 === void 0 ? void 0 : (_data$params3$result = _data$params3.result) === null || _data$params3$result === void 0 ? void 0 : _data$params3$result.value;

if (result && result.err === null) {
setState('succeeded');
Expand Down Expand Up @@ -29800,7 +29802,7 @@
setPaymentValidationSocket(socket);

socket.onopen = /*#__PURE__*/function () {
var _ref9 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee5(event) {
var _ref10 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee5(event) {
var msg;
return regenerator.wrap(function _callee5$(_context5) {
while (1) {
Expand All @@ -29826,7 +29828,7 @@
}));

return function (_x6) {
return _ref9.apply(this, arguments);
return _ref10.apply(this, arguments);
};
}();

Expand Down Expand Up @@ -29956,9 +29958,9 @@
}
};

var trackTransaction = function trackTransaction(_ref10) {
var account = _ref10.account,
nonce = _ref10.nonce;
var trackTransaction = function trackTransaction(_ref11) {
var account = _ref11.account,
nonce = _ref11.nonce;
openTransactionTrackingSocket({
account: account,
nonce: nonce
Expand Down Expand Up @@ -29990,7 +29992,7 @@
});
_context7.next = 10;
return Promise.all(relevantTransactions.map( /*#__PURE__*/function () {
var _ref12 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee6(relevantTransaction) {
var _ref13 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee6(relevantTransaction) {
var fullTransactionData, foundRouterInstruction;
return regenerator.wrap(function _callee6$(_context6) {
while (1) {
Expand Down Expand Up @@ -30049,7 +30051,7 @@
}));

return function (_x7) {
return _ref12.apply(this, arguments);
return _ref13.apply(this, arguments);
};
}()));

Expand All @@ -30065,7 +30067,7 @@
};

var traceAndContinue = /*#__PURE__*/function () {
var _ref13 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee9(secretId, selectedPaymentOption, QRCodeURI) {
var _ref14 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee9(secretId, selectedPaymentOption, QRCodeURI) {
return regenerator.wrap(function _callee9$(_context9) {
while (1) {
switch (_context9.prev = _context9.next) {
Expand Down Expand Up @@ -30109,12 +30111,12 @@
}));

return function traceAndContinue(_x8, _x9, _x10) {
return _ref13.apply(this, arguments);
return _ref14.apply(this, arguments);
};
}();

var storePayment = /*#__PURE__*/function () {
var _ref15 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee10(transaction) {
var _ref16 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee10(transaction) {
return regenerator.wrap(function _callee10$(_context10) {
while (1) {
switch (_context10.prev = _context10.next) {
Expand Down Expand Up @@ -30168,7 +30170,7 @@
}));

return function storePayment(_x11) {
return _ref15.apply(this, arguments);
return _ref16.apply(this, arguments);
};
}();

Expand Down
2 changes: 1 addition & 1 deletion dist/umd/index.js.map
View file

Large diffs are not rendered by default.

Loading

0 comments on commit b05c616

Please sign in to comment.