@newskit-render/my-account 7.2.2-alpha.0 → 7.2.3-alpha.0
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.
- package/dist/cjs/Components/Templates/SubscriptionAndBillingRender.js +10 -19
- package/dist/cjs/Components/Templates/SubscriptionAndBillingRender.js.map +1 -1
- package/dist/cjs/getProviderProps.js +14 -2
- package/dist/cjs/getProviderProps.js.map +1 -1
- package/dist/cjs/queries/getUserProfile.js +1 -1
- package/dist/cjs/queries/getUserProfile.js.map +1 -1
- package/dist/esm/Components/Templates/SubscriptionAndBillingRender.js +10 -19
- package/dist/esm/Components/Templates/SubscriptionAndBillingRender.js.map +1 -1
- package/dist/esm/getProviderProps.js +14 -2
- package/dist/esm/getProviderProps.js.map +1 -1
- package/dist/esm/queries/getUserProfile.js +1 -1
- package/dist/esm/queries/getUserProfile.js.map +1 -1
- package/package.json +2 -2
|
@@ -10,15 +10,6 @@ var __assign = (this && this.__assign) || function () {
|
|
|
10
10
|
};
|
|
11
11
|
return __assign.apply(this, arguments);
|
|
12
12
|
};
|
|
13
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
14
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
15
|
-
if (ar || !(i in from)) {
|
|
16
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
17
|
-
ar[i] = from[i];
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
21
|
-
};
|
|
22
13
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
23
14
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
24
15
|
};
|
|
@@ -38,9 +29,9 @@ var replaceDescription = function (description, type, serviceCancellationDate) {
|
|
|
38
29
|
return description.replace('On ${serviceCancellationDate} your ${subscriptionName} subscription expired. ', '');
|
|
39
30
|
};
|
|
40
31
|
var SubscriptionAndBillingRender = function (_a) {
|
|
41
|
-
var _b
|
|
32
|
+
var _b;
|
|
42
33
|
var contextName = _a.contextName;
|
|
43
|
-
var
|
|
34
|
+
var _c = (0, context_1.useAccountContext)(contextName), userData = _c.userData, noSubscription = _c.noSubscription, previousSubscription = _c.previousSubscription, pendingSubscription = _c.pendingSubscription, freeSubscription = _c.freeSubscription;
|
|
44
35
|
var subscriptions = userData.subscriptions;
|
|
45
36
|
var paymentFailure = userData.paymentFailure;
|
|
46
37
|
if (!subscriptions ||
|
|
@@ -48,22 +39,22 @@ var SubscriptionAndBillingRender = function (_a) {
|
|
|
48
39
|
return react_1.default.createElement(NoSubscription_1.SubscriptionStatus, __assign({}, noSubscription));
|
|
49
40
|
}
|
|
50
41
|
if (Array.isArray(subscriptions)) {
|
|
51
|
-
var
|
|
52
|
-
if (
|
|
53
|
-
(
|
|
54
|
-
|
|
55
|
-
var
|
|
42
|
+
var subscription = subscriptions[0];
|
|
43
|
+
if (subscription.status &&
|
|
44
|
+
(subscription.status === constants_1.CANCELLED_SUBSCRIPTION ||
|
|
45
|
+
subscription.status === constants_1.TERMINATED_SUBSCRIPTION)) {
|
|
46
|
+
var type = subscription.type, serviceCancellationDate = subscription.serviceCancellationDate;
|
|
56
47
|
var header = ((_b = previousSubscription === null || previousSubscription === void 0 ? void 0 : previousSubscription.header) === null || _b === void 0 ? void 0 : _b.description) &&
|
|
57
48
|
!Array.isArray(previousSubscription.header.description)
|
|
58
49
|
? __assign(__assign({}, previousSubscription.header), { description: replaceDescription(previousSubscription.header.description, type, serviceCancellationDate) }) : previousSubscription === null || previousSubscription === void 0 ? void 0 : previousSubscription.header;
|
|
59
50
|
return react_1.default.createElement(NoSubscription_1.SubscriptionStatus, __assign({}, previousSubscription, { header: header }));
|
|
60
51
|
}
|
|
61
|
-
if (
|
|
52
|
+
if (subscription.status === constants_1.PENDING_ACTIVATION_SUBSCRIPTION) {
|
|
62
53
|
return react_1.default.createElement(NoSubscription_1.SubscriptionStatus, __assign({}, pendingSubscription));
|
|
63
54
|
}
|
|
64
|
-
if (
|
|
55
|
+
if (subscription.status === constants_1.ACTIVE_SUBSCRIPTION &&
|
|
65
56
|
!paymentFailure.active &&
|
|
66
|
-
(
|
|
57
|
+
(subscription === null || subscription === void 0 ? void 0 : subscription.billingDetails.paymentMethod.type) === null) {
|
|
67
58
|
return react_1.default.createElement(NoSubscription_1.SubscriptionStatus, __assign({}, freeSubscription));
|
|
68
59
|
}
|
|
69
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubscriptionAndBillingRender.js","sourceRoot":"","sources":["../../../../src/Components/Templates/SubscriptionAndBillingRender.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SubscriptionAndBillingRender.js","sourceRoot":"","sources":["../../../../src/Components/Templates/SubscriptionAndBillingRender.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAAyB;AACzB,yCAAiD;AACjD,uBAAoC;AACpC,6DAA+D;AAC/D,yCAA2C;AAK3C,6CAKwB;AAExB,IAAM,kBAAkB,GAAG,UACzB,WAAmB,EACnB,IAAa,EACb,uBAAuC;IAEvC,IAAI,IAAI,IAAI,uBAAuB,EAAE;QACnC,OAAO,WAAW;aACf,OAAO,CACN,4BAA4B,EAC5B,IAAA,qBAAW,EAAC,uBAAuB,CAAC,CACrC;aACA,OAAO,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAA;KACxC;IACD,OAAO,WAAW,CAAC,OAAO,CACxB,+EAA+E,EAC/E,EAAE,CACH,CAAA;AACH,CAAC,CAAA;AAED,IAAM,4BAA4B,GAA+B,UAAC,EAEjE;;QADC,WAAW,iBAAA;IAEL,IAAA,KAMF,IAAA,2BAAiB,EAAC,WAAW,CAAyC,EALxE,QAAQ,cAAA,EACR,cAAc,oBAAA,EACd,oBAAoB,0BAAA,EACpB,mBAAmB,yBAAA,EACnB,gBAAgB,sBACwD,CAAA;IAC1E,IAAM,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAA;IAC5C,IAAM,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAA;IAC9C,IACE,CAAC,aAAa;QACd,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EACvD;QACA,OAAO,8BAAC,mCAAkB,eAAK,cAAc,EAAI,CAAA;KAClD;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QAChC,IAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;QAErC,IACE,YAAY,CAAC,MAAM;YACnB,CAAC,YAAY,CAAC,MAAM,KAAK,kCAAsB;gBAC7C,YAAY,CAAC,MAAM,KAAK,mCAAuB,CAAC,EAClD;YACQ,IAAA,IAAI,GAA8B,YAAY,KAA1C,EAAE,uBAAuB,GAAK,YAAY,wBAAjB,CAAiB;YACtD,IAAM,MAAM,GACV,CAAA,MAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,0CAAE,WAAW;gBACzC,CAAC,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,WAAW,CAAC;gBACrD,CAAC,uBACM,oBAAoB,CAAC,MAAM,KAC9B,WAAW,EAAE,kBAAkB,CAC7B,oBAAoB,CAAC,MAAM,CAAC,WAAW,EACvC,IAAI,EACJ,uBAAuB,CACxB,IAEL,CAAC,CAAC,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,CAAA;YAClC,OAAO,8BAAC,mCAAkB,eAAK,oBAAoB,IAAE,MAAM,EAAE,MAAM,IAAI,CAAA;SACxE;QAED,IAAI,YAAY,CAAC,MAAM,KAAK,2CAA+B,EAAE;YAC3D,OAAO,8BAAC,mCAAkB,eAAK,mBAAmB,EAAI,CAAA;SACvD;QAED,IACE,YAAY,CAAC,MAAM,KAAK,+BAAmB;YAC3C,CAAC,cAAc,CAAC,MAAM;YACtB,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,cAAc,CAAC,aAAa,CAAC,IAAI,MAAK,IAAI,EACxD;YACA,OAAO,8BAAC,mCAAkB,eAAK,gBAAgB,EAAI,CAAA;SACpD;KACF;IAED,OAAO,8BAAC,kBAAe,IAAC,WAAW,EAAE,WAAW,GAAI,CAAA;AACtD,CAAC,CAAA;AAED,kBAAe,4BAA4B,CAAA"}
|
|
@@ -46,6 +46,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
46
46
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
47
|
}
|
|
48
48
|
};
|
|
49
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
50
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
51
|
+
if (ar || !(i in from)) {
|
|
52
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
53
|
+
ar[i] = from[i];
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
57
|
+
};
|
|
49
58
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
59
|
exports.getProviderProps = void 0;
|
|
51
60
|
var api_1 = require("@newskit-render/api");
|
|
@@ -104,8 +113,11 @@ var getProviderProps = function (context, props) { return __awaiter(void 0, void
|
|
|
104
113
|
}
|
|
105
114
|
}
|
|
106
115
|
});
|
|
107
|
-
fullUser = (providerProps === null || providerProps === void 0 ? void 0 : providerProps.user)
|
|
108
|
-
|
|
116
|
+
fullUser = __assign(__assign({}, paymentUser), providerProps === null || providerProps === void 0 ? void 0 : providerProps.user);
|
|
117
|
+
if (fullUser.subscriptions && Array.isArray(fullUser.subscriptions)) {
|
|
118
|
+
fullUser = __assign(__assign({}, fullUser), { subscriptions: __spreadArray([], fullUser.subscriptions, true).reverse() });
|
|
119
|
+
}
|
|
120
|
+
providerProps = __assign(__assign({}, providerProps), { user: __assign({}, fullUser) });
|
|
109
121
|
env = {
|
|
110
122
|
LOQACCOUNT_KEY: config_1.loqaccountKey || '',
|
|
111
123
|
NGN_ACCOUNTS_PASSWORD: config_1.ngnAccountsPassword || '',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getProviderProps.js","sourceRoot":"","sources":["../../src/getProviderProps.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getProviderProps.js","sourceRoot":"","sources":["../../src/getProviderProps.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,6 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.GET_USER_PROFILE = void 0;
|
|
8
8
|
var client_1 = require("@apollo/client");
|
|
9
|
-
exports.GET_USER_PROFILE = (0, client_1.gql)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n fragment UserProfile on User {\n cpn\n firstName\n lastName\n dateOfBirth\n email\n mobile\n phoneNumber\n address {\n line1\n line2\n line3\n city\n postcode\n county\n country {\n countryIsoCode\n name\n }\n }\n subscriptions {\n type\n }\n }\n"], ["\n fragment UserProfile on User {\n cpn\n firstName\n lastName\n dateOfBirth\n email\n mobile\n phoneNumber\n address {\n line1\n line2\n line3\n city\n postcode\n county\n country {\n countryIsoCode\n name\n }\n }\n subscriptions {\n type\n }\n }\n"])));
|
|
9
|
+
exports.GET_USER_PROFILE = (0, client_1.gql)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n fragment UserProfile on User {\n cpn\n firstName\n lastName\n dateOfBirth\n email\n mobile\n phoneNumber\n address {\n line1\n line2\n line3\n city\n postcode\n county\n country {\n countryIsoCode\n name\n }\n }\n subscriptions {\n type\n serviceCancellationDate\n status\n }\n }\n"], ["\n fragment UserProfile on User {\n cpn\n firstName\n lastName\n dateOfBirth\n email\n mobile\n phoneNumber\n address {\n line1\n line2\n line3\n city\n postcode\n county\n country {\n countryIsoCode\n name\n }\n }\n subscriptions {\n type\n serviceCancellationDate\n status\n }\n }\n"])));
|
|
10
10
|
var templateObject_1;
|
|
11
11
|
//# sourceMappingURL=getUserProfile.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUserProfile.js","sourceRoot":"","sources":["../../../src/queries/getUserProfile.ts"],"names":[],"mappings":";;;;;;;AAAA,yCAAoC;AAEvB,QAAA,gBAAgB,OAAG,YAAG,
|
|
1
|
+
{"version":3,"file":"getUserProfile.js","sourceRoot":"","sources":["../../../src/queries/getUserProfile.ts"],"names":[],"mappings":";;;;;;;AAAA,yCAAoC;AAEvB,QAAA,gBAAgB,OAAG,YAAG,0cAAA,sYA2BlC,KAAA"}
|
|
@@ -9,15 +9,6 @@ var __assign = (this && this.__assign) || function () {
|
|
|
9
9
|
};
|
|
10
10
|
return __assign.apply(this, arguments);
|
|
11
11
|
};
|
|
12
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
13
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
14
|
-
if (ar || !(i in from)) {
|
|
15
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
16
|
-
ar[i] = from[i];
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
20
|
-
};
|
|
21
12
|
import React from 'react';
|
|
22
13
|
import { useAccountContext } from '../../context';
|
|
23
14
|
import { DisplayRenderer } from './';
|
|
@@ -33,9 +24,9 @@ var replaceDescription = function (description, type, serviceCancellationDate) {
|
|
|
33
24
|
return description.replace('On ${serviceCancellationDate} your ${subscriptionName} subscription expired. ', '');
|
|
34
25
|
};
|
|
35
26
|
var SubscriptionAndBillingRender = function (_a) {
|
|
36
|
-
var _b
|
|
27
|
+
var _b;
|
|
37
28
|
var contextName = _a.contextName;
|
|
38
|
-
var
|
|
29
|
+
var _c = useAccountContext(contextName), userData = _c.userData, noSubscription = _c.noSubscription, previousSubscription = _c.previousSubscription, pendingSubscription = _c.pendingSubscription, freeSubscription = _c.freeSubscription;
|
|
39
30
|
var subscriptions = userData.subscriptions;
|
|
40
31
|
var paymentFailure = userData.paymentFailure;
|
|
41
32
|
if (!subscriptions ||
|
|
@@ -43,22 +34,22 @@ var SubscriptionAndBillingRender = function (_a) {
|
|
|
43
34
|
return React.createElement(SubscriptionStatus, __assign({}, noSubscription));
|
|
44
35
|
}
|
|
45
36
|
if (Array.isArray(subscriptions)) {
|
|
46
|
-
var
|
|
47
|
-
if (
|
|
48
|
-
(
|
|
49
|
-
|
|
50
|
-
var
|
|
37
|
+
var subscription = subscriptions[0];
|
|
38
|
+
if (subscription.status &&
|
|
39
|
+
(subscription.status === CANCELLED_SUBSCRIPTION ||
|
|
40
|
+
subscription.status === TERMINATED_SUBSCRIPTION)) {
|
|
41
|
+
var type = subscription.type, serviceCancellationDate = subscription.serviceCancellationDate;
|
|
51
42
|
var header = ((_b = previousSubscription === null || previousSubscription === void 0 ? void 0 : previousSubscription.header) === null || _b === void 0 ? void 0 : _b.description) &&
|
|
52
43
|
!Array.isArray(previousSubscription.header.description)
|
|
53
44
|
? __assign(__assign({}, previousSubscription.header), { description: replaceDescription(previousSubscription.header.description, type, serviceCancellationDate) }) : previousSubscription === null || previousSubscription === void 0 ? void 0 : previousSubscription.header;
|
|
54
45
|
return React.createElement(SubscriptionStatus, __assign({}, previousSubscription, { header: header }));
|
|
55
46
|
}
|
|
56
|
-
if (
|
|
47
|
+
if (subscription.status === PENDING_ACTIVATION_SUBSCRIPTION) {
|
|
57
48
|
return React.createElement(SubscriptionStatus, __assign({}, pendingSubscription));
|
|
58
49
|
}
|
|
59
|
-
if (
|
|
50
|
+
if (subscription.status === ACTIVE_SUBSCRIPTION &&
|
|
60
51
|
!paymentFailure.active &&
|
|
61
|
-
(
|
|
52
|
+
(subscription === null || subscription === void 0 ? void 0 : subscription.billingDetails.paymentMethod.type) === null) {
|
|
62
53
|
return React.createElement(SubscriptionStatus, __assign({}, freeSubscription));
|
|
63
54
|
}
|
|
64
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubscriptionAndBillingRender.js","sourceRoot":"","sources":["../../../../src/Components/Templates/SubscriptionAndBillingRender.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SubscriptionAndBillingRender.js","sourceRoot":"","sources":["../../../../src/Components/Templates/SubscriptionAndBillingRender.tsx"],"names":[],"mappings":"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"}
|
|
@@ -45,6 +45,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
45
45
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
46
46
|
}
|
|
47
47
|
};
|
|
48
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
49
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
50
|
+
if (ar || !(i in from)) {
|
|
51
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
52
|
+
ar[i] = from[i];
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
56
|
+
};
|
|
48
57
|
import { createApolloClient, ClientTypes } from '@newskit-render/api';
|
|
49
58
|
import { editFieldProvider, newslettersAndAlertsProvider, personalDetailsProvider, subscriptionAndBillingProvider, paymentProvider, userPaymentInfoProvider, holidayStopProvider, paymentMethodsProvider, emptyProvider, } from './providers';
|
|
50
59
|
import { loqaccountKey, ngnAccountsPassword, tmAccountsPassword, sailthruApiSecret, } from './config';
|
|
@@ -101,8 +110,11 @@ export var getProviderProps = function (context, props) { return __awaiter(void
|
|
|
101
110
|
}
|
|
102
111
|
}
|
|
103
112
|
});
|
|
104
|
-
fullUser = (providerProps === null || providerProps === void 0 ? void 0 : providerProps.user)
|
|
105
|
-
|
|
113
|
+
fullUser = __assign(__assign({}, paymentUser), providerProps === null || providerProps === void 0 ? void 0 : providerProps.user);
|
|
114
|
+
if (fullUser.subscriptions && Array.isArray(fullUser.subscriptions)) {
|
|
115
|
+
fullUser = __assign(__assign({}, fullUser), { subscriptions: __spreadArray([], fullUser.subscriptions, true).reverse() });
|
|
116
|
+
}
|
|
117
|
+
providerProps = __assign(__assign({}, providerProps), { user: __assign({}, fullUser) });
|
|
106
118
|
env = {
|
|
107
119
|
LOQACCOUNT_KEY: loqaccountKey || '',
|
|
108
120
|
NGN_ACCOUNTS_PASSWORD: ngnAccountsPassword || '',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getProviderProps.js","sourceRoot":"","sources":["../../src/getProviderProps.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getProviderProps.js","sourceRoot":"","sources":["../../src/getProviderProps.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,6 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
|
|
|
3
3
|
return cooked;
|
|
4
4
|
};
|
|
5
5
|
import { gql } from '@apollo/client';
|
|
6
|
-
export var GET_USER_PROFILE = gql(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n fragment UserProfile on User {\n cpn\n firstName\n lastName\n dateOfBirth\n email\n mobile\n phoneNumber\n address {\n line1\n line2\n line3\n city\n postcode\n county\n country {\n countryIsoCode\n name\n }\n }\n subscriptions {\n type\n }\n }\n"], ["\n fragment UserProfile on User {\n cpn\n firstName\n lastName\n dateOfBirth\n email\n mobile\n phoneNumber\n address {\n line1\n line2\n line3\n city\n postcode\n county\n country {\n countryIsoCode\n name\n }\n }\n subscriptions {\n type\n }\n }\n"])));
|
|
6
|
+
export var GET_USER_PROFILE = gql(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n fragment UserProfile on User {\n cpn\n firstName\n lastName\n dateOfBirth\n email\n mobile\n phoneNumber\n address {\n line1\n line2\n line3\n city\n postcode\n county\n country {\n countryIsoCode\n name\n }\n }\n subscriptions {\n type\n serviceCancellationDate\n status\n }\n }\n"], ["\n fragment UserProfile on User {\n cpn\n firstName\n lastName\n dateOfBirth\n email\n mobile\n phoneNumber\n address {\n line1\n line2\n line3\n city\n postcode\n county\n country {\n countryIsoCode\n name\n }\n }\n subscriptions {\n type\n serviceCancellationDate\n status\n }\n }\n"])));
|
|
7
7
|
var templateObject_1;
|
|
8
8
|
//# sourceMappingURL=getUserProfile.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUserProfile.js","sourceRoot":"","sources":["../../../src/queries/getUserProfile.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAEpC,MAAM,CAAC,IAAM,gBAAgB,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"getUserProfile.js","sourceRoot":"","sources":["../../../src/queries/getUserProfile.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAEpC,MAAM,CAAC,IAAM,gBAAgB,GAAG,GAAG,ycAAA,sYA2BlC,IAAA,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@newskit-render/my-account",
|
|
3
|
-
"version": "7.2.
|
|
3
|
+
"version": "7.2.3-alpha.0",
|
|
4
4
|
"description": "Newskit Render",
|
|
5
5
|
"author": "",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"@emotion/styled": "11.9.3",
|
|
35
35
|
"@hookform/resolvers": "2.9.10",
|
|
36
36
|
"@newskit-render/api": "^1.8.0",
|
|
37
|
-
"@newskit-render/shared-components": "^4.1.1
|
|
37
|
+
"@newskit-render/shared-components": "^4.1.1",
|
|
38
38
|
"@newskit-render/validation": "^1.12.1",
|
|
39
39
|
"@stripe/react-stripe-js": "2.1.1",
|
|
40
40
|
"@stripe/stripe-js": "1.54.1",
|