@flarehr/apollo-super-selection 1.3.40525 → 1.3.40541
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/lib/apollo-super-selection/apollo-super-selection.esm.js +1 -1
- package/dist/lib/apollo-super-selection/p-2a49b07d.system.entry.js +69 -0
- package/dist/lib/apollo-super-selection/p-b3af59b8.entry.js +14 -0
- package/dist/lib/apollo-super-selection/p-bdcfc026.system.js +1 -1
- package/dist/lib/cjs/sss-button_40.cjs.entry.js +38 -4
- package/dist/lib/collection/components/super-selection-app/api/super-selection.api.dto.js +7 -0
- package/dist/lib/collection/components/super-selection-app/api/super-selection.api.js +1 -0
- package/dist/lib/collection/components/super-selection-app/existing-choice/existing-choice.js +16 -3
- package/dist/lib/collection/components/super-selection-app/services/existing-super-choice-info.service.js +11 -0
- package/dist/lib/collection/components/super-selection-app/services/super-selection-app.service.js +3 -0
- package/dist/lib/collection/components/super-selection-app/super-selection-app.js +5 -1
- package/dist/lib/esm/sss-button_40.entry.js +38 -4
- package/dist/lib/esm-es5/sss-button_40.entry.js +1 -1
- package/dist/lib/types/components/super-selection-app/api/super-selection.api.dto.d.ts +9 -0
- package/dist/lib/types/components/super-selection-app/services/existing-super-choice-info.service.d.ts +8 -1
- package/dist/lib/types/components/super-selection-app/services/super-selection-app.service.d.ts +1 -0
- package/package.json +1 -1
- package/dist/lib/apollo-super-selection/p-6126259d.system.entry.js +0 -69
- package/dist/lib/apollo-super-selection/p-a5305364.entry.js +0 -14
|
@@ -1 +1 @@
|
|
|
1
|
-
System.register(["./p-44bec843.system.js","./p-14885f78.system.js","./p-15f0e5eb.system.js"],(function(e,s){"use strict";var t,i,o;return{setters:[function(e){t=e.p;i=e.b},function(){},function(e){o=e.g}],execute:function(){var e=function(){var e=s.meta.url;var i={};if(e!==""){i.resourcesUrl=new URL(".",e).href}return t(i)};e().then((function(e){o();return i([["p-6ac8791e.system",[[0,"context-consumer",{context:[16],renderer:[16],subscribe:[16],unsubscribe:[32]}]]],["p-02f24922.system",[[0,"stencil-async-content",{documentLocation:[1,"document-location"],content:[32]}]]],["p-ef3afa00.system",[[0,"stencil-route-title",{titleSuffix:[1,"title-suffix"],pageTitle:[1,"page-title"]}]]],["p-f29066b9.system",[[0,"stencil-router-prompt",{when:[4],message:[1],history:[16],unblock:[32]}]]],["p-51aefdb1.system",[[0,"stencil-router-redirect",{history:[16],root:[1],url:[1]}]]],["p-
|
|
1
|
+
System.register(["./p-44bec843.system.js","./p-14885f78.system.js","./p-15f0e5eb.system.js"],(function(e,s){"use strict";var t,i,o;return{setters:[function(e){t=e.p;i=e.b},function(){},function(e){o=e.g}],execute:function(){var e=function(){var e=s.meta.url;var i={};if(e!==""){i.resourcesUrl=new URL(".",e).href}return t(i)};e().then((function(e){o();return i([["p-6ac8791e.system",[[0,"context-consumer",{context:[16],renderer:[16],subscribe:[16],unsubscribe:[32]}]]],["p-02f24922.system",[[0,"stencil-async-content",{documentLocation:[1,"document-location"],content:[32]}]]],["p-ef3afa00.system",[[0,"stencil-route-title",{titleSuffix:[1,"title-suffix"],pageTitle:[1,"page-title"]}]]],["p-f29066b9.system",[[0,"stencil-router-prompt",{when:[4],message:[1],history:[16],unblock:[32]}]]],["p-51aefdb1.system",[[0,"stencil-router-redirect",{history:[16],root:[1],url:[1]}]]],["p-2a49b07d.system",[[0,"sss-prefill",{history:[16],prefill:[32]}],[0,"sss-my-own-fund",{history:[16],formState:[32],isNotAllInformationProvidedMessageVisible:[32],isSubmitDisabled:[32]}],[0,"sss-super-choice-page",{history:[16],promotedFunds:[32],campaignConnectRequestInProgress:[32]}],[0,"sss-self-managed-fund",{history:[16],formState:[32],isSubmitDisabled:[32]}],[1,"super-selection-app-host",{sessionState:[32],jwt:[32],appConfiguration:[32],ignoreExistingSelection:[32]}],[0,"sss-default-fund",{history:[16],defaultFundProductName:[32]}],[0,"sss-consent-page",{history:[16]}],[0,"sss-existing-choice-page",{history:[16],existingFund:[32]}],[0,"sss-standard-choice-form",{history:[16],standardChoiceFormSignature:[32],formState:[32],isSubmitDisabled:[32]}],[0,"sss-promoted-fund-join-v1-page",{history:[16]}],[0,"sss-promoted-fund-join-v2-page",{history:[16]}],[0,"sss-slate-join-page",{history:[16]}],[0,"sss-success"],[0,"sss-prefill-my-own-fund",{history:[16],prefill:[16],mode:[32],formState:[32],isSubmitDisabled:[32],fundUsi:[32],fundName:[32],memberNumber:[32],memberGivenNames:[32],memberLastName:[32]}],[0,"sss-prefill-smsf",{history:[16],prefill:[16],mode:[32],formState:[32],isSubmitDisabled:[32],fundName:[32],fundAbn:[32],fundEsa:[32],fundAddressLine1:[32],fundAddressLine2:[32],fundAddressCity:[32],fundAddressPostcode:[32],fundAddressState:[32],fundAddress:[32],memberGivenNames:[32],memberLastName:[32],bankAccountName:[32],bankName:[32],bankAccountBsb:[32],bankAccountNumber:[32]}],[0,"sss-prefill-invalid-my-own-fund",{history:[16],prefill:[16],fundUsi:[32],fundName:[32],memberNumber:[32],memberGivenNames:[32],memberLastName:[32]}],[0,"sss-prefill-invalid-smsf",{history:[16],prefill:[16],fundName:[32],fundAbn:[32],fundEsa:[32],fundAddressLine1:[32],fundAddressLine2:[32],fundAddressCity:[32],fundAddressPostcode:[32],fundAddressState:[32],fundAddress:[32],memberGivenNames:[32],memberLastName:[32],bankAccountName:[32],bankAccountBsb:[32],bankAccountNumber:[32]}],[1,"super-selection-app",{ignoreExistingSelection:[4,"ignore-existing-selection"],accessToken:[1,"access-token"],backendUrl:[1,"backend-url"],appBaseUrl:[1,"app-base-url"],history:[16],location:[16],isSelfHosted:[4,"is-self-hosted"],isAppInitialised:[32]}],[0,"sss-my-own-fund-inputs",{myOwnFundForm:[16],showValidationErrors:[4,"show-validation-errors"],selectedOption:[32]}],[0,"sss-loading-super-indicator"],[0,"sss-self-managed-fund-inputs",{fundForm:[16],showValidationErrors:[4,"show-validation-errors"],isAbnValid:[32],isAbnTouched:[32],isAbnUsedForRegulated:[32],currentBank:[32],addressErrorMessage:[32]}],[0,"sss-super-choice-item-bottom",{disclaimer:[16],abnInfo:[1,"abn-info"],abn:[1],isMultiFund:[4,"is-multi-fund"]}],[0,"sss-loading-page"],[0,"sss-super-choice-item-top",{name:[1],logo:[1],features:[16],featureSubText:[16],isMultiFund:[4,"is-multi-fund"],isPromotedDefault:[4,"is-promoted-default"]}],[4,"sss-loading-component",{header:[1]}],[0,"sss-dropdown-async",{placeholder:[1],searchFunction:[16],value:[16],required:[4],requiredValidationMessage:[1,"required-validation-message"],disabled:[4],minSearchStringLength:[2,"min-search-string-length"],showValidationErrors:[4,"show-validation-errors"],searchState:[32],inputValue:[32],isDropdownVisible:[32],filteredOptions:[32],highlightedOptionIndex:[32],selectedOption:[32]},[[2,"focus","handleFocus"],[2,"blur","handleBlur"],[2,"keydown","handleKeyDown"]]],[0,"sss-footer-section",{textOverride:[16]}],[4,"stencil-route-switch",{group:[513],scrollTopOffset:[2,"scroll-top-offset"],location:[16],routeViewsUpdated:[16]}],[4,"stencil-router",{root:[1],historyType:[1,"history-type"],titleSuffix:[1,"title-suffix"],scrollTopOffset:[2,"scroll-top-offset"],location:[32],history:[32]}],[4,"sss-custom-fund",{history:[16],currentCustomFund:[32],fundOptionsList:[32],showFundOptionsSelection:[32]}],[0,"sss-iframe-host",{build:[16]}],[0,"sss-prefill-warning-box",{notificationList:[16]}],[0,"sss-header-section",{currentPage:[1,"current-page"]}],[0,"sss-name-input",{value:[1],name:[1],readableName:[1,"readable-name"],showValidationErrors:[4,"show-validation-errors"],errorMessage:[32]}],[0,"sss-prefill-display-field",{field:[16]}],[0,"sss-prefill-error-box",{withHeader:[4,"with-header"],notificationList:[16]}],[4,"stencil-route-link",{url:[1],urlMatch:[1,"url-match"],activeClass:[1,"active-class"],exact:[4],strict:[4],custom:[1],anchorClass:[1,"anchor-class"],anchorRole:[1,"anchor-role"],anchorTitle:[1,"anchor-title"],anchorTabIndex:[1,"anchor-tab-index"],anchorId:[1,"anchor-id"],history:[16],location:[16],root:[1],ariaHaspopup:[1,"aria-haspopup"],ariaPosinset:[1,"aria-posinset"],ariaSetsize:[2,"aria-setsize"],ariaLabel:[1,"aria-label"],match:[32]}],[4,"sss-button",{fillWidth:[4,"fill-width"],fillWidthOnMobile:[4,"fill-width-on-mobile"],disabled:[4],variant:[1],size:[1],promiseFn:[16],state:[32]}],[0,"sss-loading-indicator",{theme:[1],size:[2]}],[0,"stencil-route",{group:[513],componentUpdated:[16],match:[1040],url:[1],component:[1],componentProps:[16],exact:[4],routeRender:[16],scrollTopOffset:[2,"scroll-top-offset"],routeViewsUpdated:[16],location:[16],history:[16],historyType:[1,"history-type"]}]]]],e)}))}}}));
|
|
@@ -264,7 +264,7 @@ class TapSubscriber extends datoramaAkita.Subscriber {
|
|
|
264
264
|
}
|
|
265
265
|
}
|
|
266
266
|
|
|
267
|
-
const AppVersion = '1.3.
|
|
267
|
+
const AppVersion = '1.3.40541';
|
|
268
268
|
|
|
269
269
|
// -------------------------------------------------------------------------------------
|
|
270
270
|
// guards
|
|
@@ -3347,6 +3347,8 @@ function getSuperChoiceUsi(dto) {
|
|
|
3347
3347
|
return some(dto.default.usi);
|
|
3348
3348
|
case 'PromotedDefault':
|
|
3349
3349
|
return some(dto.promotedDefault.usi);
|
|
3350
|
+
case 'DefinedBenefits':
|
|
3351
|
+
return some(dto.definedBenefits.usi);
|
|
3350
3352
|
default:
|
|
3351
3353
|
return none;
|
|
3352
3354
|
}
|
|
@@ -3383,6 +3385,8 @@ function getSuperChoiceMemberNumber(dto) {
|
|
|
3383
3385
|
return getPromotedFundMemberNumber(dto.promoted);
|
|
3384
3386
|
case 'MyOwnFund':
|
|
3385
3387
|
return some(dto.myOwnFund.memberNumber);
|
|
3388
|
+
case 'DefinedBenefits':
|
|
3389
|
+
return some(dto.definedBenefits.memberNumber);
|
|
3386
3390
|
case 'SMSF':
|
|
3387
3391
|
case 'Default':
|
|
3388
3392
|
case 'PromotedDefault':
|
|
@@ -3407,6 +3411,9 @@ function hydrateSuperChoiceDetailsDtoKind(dto) {
|
|
|
3407
3411
|
else if ('promotedDefault' in dto) {
|
|
3408
3412
|
dto.kind = 'PromotedDefault';
|
|
3409
3413
|
}
|
|
3414
|
+
else if ('definedBenefits' in dto) {
|
|
3415
|
+
dto.kind = 'DefinedBenefits';
|
|
3416
|
+
}
|
|
3410
3417
|
}
|
|
3411
3418
|
|
|
3412
3419
|
class SuperSelectionApi {
|
|
@@ -3588,6 +3595,9 @@ class SuperSelectionAppService {
|
|
|
3588
3595
|
get campaignConnectEnabled() {
|
|
3589
3596
|
return this._state.campaignConnectEnabled;
|
|
3590
3597
|
}
|
|
3598
|
+
get definedBenefitsEligibility() {
|
|
3599
|
+
return this._state.definedBenefitsEligibility;
|
|
3600
|
+
}
|
|
3591
3601
|
async loadAppStateAsync() {
|
|
3592
3602
|
const appStateResponse = await superSelectionApi.getAppStateAsync();
|
|
3593
3603
|
this._state.accountConfiguration = Option.fromNullable(appStateResponse.accountConfiguration);
|
|
@@ -4715,6 +4725,17 @@ class ExistingFundService {
|
|
|
4715
4725
|
lastNominatedAt: dateSubmitted
|
|
4716
4726
|
});
|
|
4717
4727
|
}
|
|
4728
|
+
case 'DefinedBenefits': {
|
|
4729
|
+
const defaultUsi = choiceDetails.definedBenefits.usi;
|
|
4730
|
+
const fund = await this.getFundByUsiAsync(defaultUsi);
|
|
4731
|
+
return some({
|
|
4732
|
+
type: 'Defined Benefits Fund',
|
|
4733
|
+
name: isSome(fund) ? fund.value.productName : defaultUsi,
|
|
4734
|
+
usi: usi,
|
|
4735
|
+
valid: this.toFundValidState(fund),
|
|
4736
|
+
lastNominatedAt: dateSubmitted
|
|
4737
|
+
});
|
|
4738
|
+
}
|
|
4718
4739
|
default:
|
|
4719
4740
|
return none;
|
|
4720
4741
|
}
|
|
@@ -4794,7 +4815,13 @@ const ExistingChoice = class {
|
|
|
4794
4815
|
const DefaultFundView = () => {
|
|
4795
4816
|
return (index.h("div", { class: "flex h-20 justify-center items-center relative" }, index.h("div", { class: "h-20 w-20 rounded-full bg-primary-base opacity-10" }), index.h("div", { class: "h-10 w-10 absolute" }, index.h("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 512 512", class: "fill-primary-base" }, index.h("path", { d: "M448 96h-64V48C384 21.53 362.5 0 336 0h-160C149.5 0 128 21.53 128 48V96H64C28.65 96 0 124.7 0 160v256c0 35.35 28.65 64 64 64h384c35.35 0 64-28.65 64-64V160C512 124.7 483.3 96 448 96zM160 48C160 39.17 167.2 32 176 32h160C344.8 32 352 39.17 352 48V96H160V48zM480 416c0 17.64-14.36 32-32 32H64c-17.64 0-32-14.36-32-32V288h144v64c0 8.844 7.156 16 16 16h128c8.844 0 16-7.156 16-16V288H480V416zM208 336V288h96v48H208zM480 256H32V160c0-17.64 14.36-32 32-32h384c17.64 0 32 14.36 32 32V256z" })))));
|
|
4796
4817
|
};
|
|
4797
|
-
|
|
4818
|
+
const DefinedBenefitsFundView = () => {
|
|
4819
|
+
return (index.h("div", { class: "flex h-20 justify-center items-center relative" }, index.h("div", { class: "h-20 w-20 rounded-full bg-primary-base opacity-10" }), index.h("div", { class: "h-10 w-10 absolute" }, index.h("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 576 512", class: "fill-primary-base" }, index.h("path", { d: "M174.7 111.8C165.1 110.3 160.1 102.1 161.5 93.35C170.4 40.37 216.5 0 272 0C320.8 0 362.3 31.19 377.6 74.67C380.6 82.1 376.2 92.14 367.9 95.09C359.5 98.03 350.4 93.66 347.5 85.33C336.5 54.24 306.8 32 272 32C232.4 32 199.5 60.82 193.1 98.65C191.6 107.4 183.4 113.2 174.7 111.8V111.8zM400 264C400 250.7 410.7 240 424 240C437.3 240 448 250.7 448 264C448 277.3 437.3 288 424 288C410.7 288 400 277.3 400 264zM488.5 125.8L480 159.1C501.1 176.5 519.6 198.5 530.7 224H544C561.7 224 576 238.3 576 256V352C576 369.7 561.7 384 544 384H512C495.5 405.1 473.5 423.6 448 434.7V464C448 490.5 426.5 512 400 512H368C341.5 512 320 490.5 320 464V448H256V464C256 490.5 234.5 512 208 512H176C149.5 512 128 490.5 128 464V416C89.14 386.8 64 340.3 64 288C28.52 287.2 0 258.2 0 222.6C0 197.8 14 175.1 36.18 164L40.84 161.7C48.75 157.7 58.36 160.9 62.31 168.8C66.26 176.7 63.06 186.4 55.16 190.3L50.49 192.6C39.16 198.3 31.1 209.9 31.1 222.6C31.1 241 46.97 256 65.44 256H67.2C82.02 182.1 146.6 128 223.1 128H376.4C394 108.4 419.6 96 448 96H465.3C480.9 96 492.3 110.7 488.5 125.8H488.5zM224 160C153.3 160 96 217.3 96 288C96 329.9 116.1 367 147.2 390.4L160 400V464C160 472.8 167.2 480 176 480H208C216.8 480 224 472.8 224 464V416H352V464C352 472.8 359.2 480 368 480H400C408.8 480 416 472.8 416 464V413.7L435.2 405.4C455.6 396.5 473.2 382.4 486.4 364.8L496 352H544V256H509.7L501.4 236.8C492.5 216.4 478.4 198.8 460.8 185.6L443.8 172.8L455 128H448C429 128 412.1 136.2 400.3 149.3L390.7 160H224z" })))));
|
|
4820
|
+
};
|
|
4821
|
+
const ChooseAnotherFundView = () => {
|
|
4822
|
+
return this.existingFund.type == 'Defined Benefits Fund' ? null : (index.h("div", { class: "mt-4" }, index.h("sss-button", { fillWidth: true, variant: "secondary", promiseFn: () => this.handleFundNominationDeclined() }, "Choose another fund")));
|
|
4823
|
+
};
|
|
4824
|
+
return (index.h("div", null, index.h("div", { class: "text-2xl sm:text-3xl font-bold text-center" }, "Your super nomination"), this.existingFund.type == 'Defined Benefits Fund' ? null : (index.h("div", { class: "sm:text-lg text-gray-600 mt-3 sm:mt-4 max-w-800 text-center leading-7" }, "Continue with your chosen fund or choose another fund below.")), index.h("div", { class: "flex justify-center mt-8 sm:mt-12" }, index.h("div", { class: "max-w-400 w-full" }, index.h("div", { class: "flex-col border shadow-sm p-6 pt-8 rounded-lg text-center" }, index.h("div", { class: "space-y-4" }, (() => {
|
|
4798
4825
|
switch (this.existingFund.type) {
|
|
4799
4826
|
case 'Promoted Fund':
|
|
4800
4827
|
case 'Promoted Default Fund':
|
|
@@ -4805,6 +4832,8 @@ const ExistingChoice = class {
|
|
|
4805
4832
|
return index.h(MyOwnFundView, null);
|
|
4806
4833
|
case 'Default Fund':
|
|
4807
4834
|
return index.h(DefaultFundView, null);
|
|
4835
|
+
case 'Defined Benefits Fund':
|
|
4836
|
+
return index.h(DefinedBenefitsFundView, null);
|
|
4808
4837
|
default:
|
|
4809
4838
|
return index.h("div", null);
|
|
4810
4839
|
}
|
|
@@ -4816,11 +4845,12 @@ const ExistingChoice = class {
|
|
|
4816
4845
|
case 'Promoted Fund':
|
|
4817
4846
|
case 'Self Managed Fund':
|
|
4818
4847
|
case 'Promoted Default Fund':
|
|
4848
|
+
case 'Defined Benefits Fund':
|
|
4819
4849
|
return this.existingFund.name;
|
|
4820
4850
|
default:
|
|
4821
4851
|
return '';
|
|
4822
4852
|
}
|
|
4823
|
-
})())), index.h("div", { class: "mt-6" }, index.h("sss-button", { fillWidth: true, promiseFn: () => this.handleFundNominationAccepted() }, "Continue with this fund"))), index.h(
|
|
4853
|
+
})())), index.h("div", { class: "mt-6" }, index.h("sss-button", { fillWidth: true, promiseFn: () => this.handleFundNominationAccepted() }, "Continue with this fund"))), index.h(ChooseAnotherFundView, null)))));
|
|
4824
4854
|
}
|
|
4825
4855
|
async handleFundNominationAccepted() {
|
|
4826
4856
|
const detail = this.createSuperFundNominationDetail(this.existingFund);
|
|
@@ -7999,7 +8029,11 @@ const SuperSelectionApp = class {
|
|
|
7999
8029
|
});
|
|
8000
8030
|
iframe.appReady();
|
|
8001
8031
|
const ignoreExistingSelectionOption = Option.fromNullable(this.ignoreExistingSelection);
|
|
8002
|
-
const
|
|
8032
|
+
const shouldIgnoreExistingDefinedBenefitsChoice = Option.isSome(chosenFundOption) &&
|
|
8033
|
+
chosenFundOption.value.type == 'Defined Benefits Fund' &&
|
|
8034
|
+
superSelectionAppService.definedBenefitsEligibility == false;
|
|
8035
|
+
const shouldIgnoreExistingChoice = (Option.isSome(ignoreExistingSelectionOption) && ignoreExistingSelectionOption.value) ||
|
|
8036
|
+
shouldIgnoreExistingDefinedBenefitsChoice;
|
|
8003
8037
|
if (Option.isSome(superSelectionAppService.state.superChoicePrefill)) {
|
|
8004
8038
|
navigationService.navigateInternally(this.history, SuperSelectionAppRoutes.Prefill);
|
|
8005
8039
|
}
|
|
@@ -71,6 +71,8 @@ export function getSuperChoiceUsi(dto) {
|
|
|
71
71
|
return some(dto.default.usi);
|
|
72
72
|
case 'PromotedDefault':
|
|
73
73
|
return some(dto.promotedDefault.usi);
|
|
74
|
+
case 'DefinedBenefits':
|
|
75
|
+
return some(dto.definedBenefits.usi);
|
|
74
76
|
default:
|
|
75
77
|
assertExhaustive(dto);
|
|
76
78
|
return none;
|
|
@@ -109,6 +111,8 @@ export function getSuperChoiceMemberNumber(dto) {
|
|
|
109
111
|
return getPromotedFundMemberNumber(dto.promoted);
|
|
110
112
|
case 'MyOwnFund':
|
|
111
113
|
return some(dto.myOwnFund.memberNumber);
|
|
114
|
+
case 'DefinedBenefits':
|
|
115
|
+
return some(dto.definedBenefits.memberNumber);
|
|
112
116
|
case 'SMSF':
|
|
113
117
|
case 'Default':
|
|
114
118
|
case 'PromotedDefault':
|
|
@@ -134,4 +138,7 @@ export function hydrateSuperChoiceDetailsDtoKind(dto) {
|
|
|
134
138
|
else if ('promotedDefault' in dto) {
|
|
135
139
|
dto.kind = 'PromotedDefault';
|
|
136
140
|
}
|
|
141
|
+
else if ('definedBenefits' in dto) {
|
|
142
|
+
dto.kind = 'DefinedBenefits';
|
|
143
|
+
}
|
|
137
144
|
}
|
package/dist/lib/collection/components/super-selection-app/existing-choice/existing-choice.js
CHANGED
|
@@ -71,9 +71,20 @@ export class ExistingChoice {
|
|
|
71
71
|
h("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 512 512", class: "fill-primary-base" },
|
|
72
72
|
h("path", { d: "M448 96h-64V48C384 21.53 362.5 0 336 0h-160C149.5 0 128 21.53 128 48V96H64C28.65 96 0 124.7 0 160v256c0 35.35 28.65 64 64 64h384c35.35 0 64-28.65 64-64V160C512 124.7 483.3 96 448 96zM160 48C160 39.17 167.2 32 176 32h160C344.8 32 352 39.17 352 48V96H160V48zM480 416c0 17.64-14.36 32-32 32H64c-17.64 0-32-14.36-32-32V288h144v64c0 8.844 7.156 16 16 16h128c8.844 0 16-7.156 16-16V288H480V416zM208 336V288h96v48H208zM480 256H32V160c0-17.64 14.36-32 32-32h384c17.64 0 32 14.36 32 32V256z" })))));
|
|
73
73
|
};
|
|
74
|
+
const DefinedBenefitsFundView = () => {
|
|
75
|
+
return (h("div", { class: "flex h-20 justify-center items-center relative" },
|
|
76
|
+
h("div", { class: "h-20 w-20 rounded-full bg-primary-base opacity-10" }),
|
|
77
|
+
h("div", { class: "h-10 w-10 absolute" },
|
|
78
|
+
h("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 576 512", class: "fill-primary-base" },
|
|
79
|
+
h("path", { d: "M174.7 111.8C165.1 110.3 160.1 102.1 161.5 93.35C170.4 40.37 216.5 0 272 0C320.8 0 362.3 31.19 377.6 74.67C380.6 82.1 376.2 92.14 367.9 95.09C359.5 98.03 350.4 93.66 347.5 85.33C336.5 54.24 306.8 32 272 32C232.4 32 199.5 60.82 193.1 98.65C191.6 107.4 183.4 113.2 174.7 111.8V111.8zM400 264C400 250.7 410.7 240 424 240C437.3 240 448 250.7 448 264C448 277.3 437.3 288 424 288C410.7 288 400 277.3 400 264zM488.5 125.8L480 159.1C501.1 176.5 519.6 198.5 530.7 224H544C561.7 224 576 238.3 576 256V352C576 369.7 561.7 384 544 384H512C495.5 405.1 473.5 423.6 448 434.7V464C448 490.5 426.5 512 400 512H368C341.5 512 320 490.5 320 464V448H256V464C256 490.5 234.5 512 208 512H176C149.5 512 128 490.5 128 464V416C89.14 386.8 64 340.3 64 288C28.52 287.2 0 258.2 0 222.6C0 197.8 14 175.1 36.18 164L40.84 161.7C48.75 157.7 58.36 160.9 62.31 168.8C66.26 176.7 63.06 186.4 55.16 190.3L50.49 192.6C39.16 198.3 31.1 209.9 31.1 222.6C31.1 241 46.97 256 65.44 256H67.2C82.02 182.1 146.6 128 223.1 128H376.4C394 108.4 419.6 96 448 96H465.3C480.9 96 492.3 110.7 488.5 125.8H488.5zM224 160C153.3 160 96 217.3 96 288C96 329.9 116.1 367 147.2 390.4L160 400V464C160 472.8 167.2 480 176 480H208C216.8 480 224 472.8 224 464V416H352V464C352 472.8 359.2 480 368 480H400C408.8 480 416 472.8 416 464V413.7L435.2 405.4C455.6 396.5 473.2 382.4 486.4 364.8L496 352H544V256H509.7L501.4 236.8C492.5 216.4 478.4 198.8 460.8 185.6L443.8 172.8L455 128H448C429 128 412.1 136.2 400.3 149.3L390.7 160H224z" })))));
|
|
80
|
+
};
|
|
81
|
+
const ChooseAnotherFundView = () => {
|
|
82
|
+
return this.existingFund.type == 'Defined Benefits Fund' ? null : (h("div", { class: "mt-4" },
|
|
83
|
+
h("sss-button", { fillWidth: true, variant: "secondary", promiseFn: () => this.handleFundNominationDeclined() }, "Choose another fund")));
|
|
84
|
+
};
|
|
74
85
|
return (h("div", null,
|
|
75
86
|
h("div", { class: "text-2xl sm:text-3xl font-bold text-center" }, "Your super nomination"),
|
|
76
|
-
h("div", { class: "sm:text-lg text-gray-600 mt-3 sm:mt-4 max-w-800 text-center leading-7" }, "Continue with your chosen fund or choose another fund below."),
|
|
87
|
+
this.existingFund.type == 'Defined Benefits Fund' ? null : (h("div", { class: "sm:text-lg text-gray-600 mt-3 sm:mt-4 max-w-800 text-center leading-7" }, "Continue with your chosen fund or choose another fund below.")),
|
|
77
88
|
h("div", { class: "flex justify-center mt-8 sm:mt-12" },
|
|
78
89
|
h("div", { class: "max-w-400 w-full" },
|
|
79
90
|
h("div", { class: "flex-col border shadow-sm p-6 pt-8 rounded-lg text-center" },
|
|
@@ -89,6 +100,8 @@ export class ExistingChoice {
|
|
|
89
100
|
return h(MyOwnFundView, null);
|
|
90
101
|
case 'Default Fund':
|
|
91
102
|
return h(DefaultFundView, null);
|
|
103
|
+
case 'Defined Benefits Fund':
|
|
104
|
+
return h(DefinedBenefitsFundView, null);
|
|
92
105
|
default:
|
|
93
106
|
assertExhaustive(this.existingFund);
|
|
94
107
|
return h("div", null);
|
|
@@ -102,6 +115,7 @@ export class ExistingChoice {
|
|
|
102
115
|
case 'Promoted Fund':
|
|
103
116
|
case 'Self Managed Fund':
|
|
104
117
|
case 'Promoted Default Fund':
|
|
118
|
+
case 'Defined Benefits Fund':
|
|
105
119
|
return this.existingFund.name;
|
|
106
120
|
default:
|
|
107
121
|
assertExhaustive(this.existingFund);
|
|
@@ -110,8 +124,7 @@ export class ExistingChoice {
|
|
|
110
124
|
})())),
|
|
111
125
|
h("div", { class: "mt-6" },
|
|
112
126
|
h("sss-button", { fillWidth: true, promiseFn: () => this.handleFundNominationAccepted() }, "Continue with this fund"))),
|
|
113
|
-
h(
|
|
114
|
-
h("sss-button", { fillWidth: true, variant: "secondary", promiseFn: () => this.handleFundNominationDeclined() }, "Choose another fund"))))));
|
|
127
|
+
h(ChooseAnotherFundView, null)))));
|
|
115
128
|
}
|
|
116
129
|
async handleFundNominationAccepted() {
|
|
117
130
|
const detail = this.createSuperFundNominationDetail(this.existingFund);
|
|
@@ -84,6 +84,17 @@ export class ExistingFundService {
|
|
|
84
84
|
lastNominatedAt: dateSubmitted
|
|
85
85
|
});
|
|
86
86
|
}
|
|
87
|
+
case 'DefinedBenefits': {
|
|
88
|
+
const defaultUsi = choiceDetails.definedBenefits.usi;
|
|
89
|
+
const fund = await this.getFundByUsiAsync(defaultUsi);
|
|
90
|
+
return some({
|
|
91
|
+
type: 'Defined Benefits Fund',
|
|
92
|
+
name: isSome(fund) ? fund.value.productName : defaultUsi,
|
|
93
|
+
usi: usi,
|
|
94
|
+
valid: this.toFundValidState(fund),
|
|
95
|
+
lastNominatedAt: dateSubmitted
|
|
96
|
+
});
|
|
97
|
+
}
|
|
87
98
|
default:
|
|
88
99
|
assertExhaustive(choiceDetails);
|
|
89
100
|
return none;
|
package/dist/lib/collection/components/super-selection-app/services/super-selection-app.service.js
CHANGED
|
@@ -101,6 +101,9 @@ export class SuperSelectionAppService {
|
|
|
101
101
|
get campaignConnectEnabled() {
|
|
102
102
|
return this._state.campaignConnectEnabled;
|
|
103
103
|
}
|
|
104
|
+
get definedBenefitsEligibility() {
|
|
105
|
+
return this._state.definedBenefitsEligibility;
|
|
106
|
+
}
|
|
104
107
|
async loadAppStateAsync() {
|
|
105
108
|
const appStateResponse = await superSelectionApi.getAppStateAsync();
|
|
106
109
|
this._state.accountConfiguration = O.fromNullable(appStateResponse.accountConfiguration);
|
|
@@ -52,7 +52,11 @@ export class SuperSelectionApp {
|
|
|
52
52
|
});
|
|
53
53
|
iframe.appReady();
|
|
54
54
|
const ignoreExistingSelectionOption = O.fromNullable(this.ignoreExistingSelection);
|
|
55
|
-
const
|
|
55
|
+
const shouldIgnoreExistingDefinedBenefitsChoice = isSome(chosenFundOption) &&
|
|
56
|
+
chosenFundOption.value.type == 'Defined Benefits Fund' &&
|
|
57
|
+
superSelectionAppService.definedBenefitsEligibility == false;
|
|
58
|
+
const shouldIgnoreExistingChoice = (isSome(ignoreExistingSelectionOption) && ignoreExistingSelectionOption.value) ||
|
|
59
|
+
shouldIgnoreExistingDefinedBenefitsChoice;
|
|
56
60
|
if (isSome(superSelectionAppService.state.superChoicePrefill)) {
|
|
57
61
|
navigationService.navigateInternally(this.history, SuperSelectionAppRoutes.Prefill);
|
|
58
62
|
}
|
|
@@ -260,7 +260,7 @@ class TapSubscriber extends Subscriber {
|
|
|
260
260
|
}
|
|
261
261
|
}
|
|
262
262
|
|
|
263
|
-
const AppVersion = '1.3.
|
|
263
|
+
const AppVersion = '1.3.40541';
|
|
264
264
|
|
|
265
265
|
// -------------------------------------------------------------------------------------
|
|
266
266
|
// guards
|
|
@@ -3343,6 +3343,8 @@ function getSuperChoiceUsi(dto) {
|
|
|
3343
3343
|
return some(dto.default.usi);
|
|
3344
3344
|
case 'PromotedDefault':
|
|
3345
3345
|
return some(dto.promotedDefault.usi);
|
|
3346
|
+
case 'DefinedBenefits':
|
|
3347
|
+
return some(dto.definedBenefits.usi);
|
|
3346
3348
|
default:
|
|
3347
3349
|
return none;
|
|
3348
3350
|
}
|
|
@@ -3379,6 +3381,8 @@ function getSuperChoiceMemberNumber(dto) {
|
|
|
3379
3381
|
return getPromotedFundMemberNumber(dto.promoted);
|
|
3380
3382
|
case 'MyOwnFund':
|
|
3381
3383
|
return some(dto.myOwnFund.memberNumber);
|
|
3384
|
+
case 'DefinedBenefits':
|
|
3385
|
+
return some(dto.definedBenefits.memberNumber);
|
|
3382
3386
|
case 'SMSF':
|
|
3383
3387
|
case 'Default':
|
|
3384
3388
|
case 'PromotedDefault':
|
|
@@ -3403,6 +3407,9 @@ function hydrateSuperChoiceDetailsDtoKind(dto) {
|
|
|
3403
3407
|
else if ('promotedDefault' in dto) {
|
|
3404
3408
|
dto.kind = 'PromotedDefault';
|
|
3405
3409
|
}
|
|
3410
|
+
else if ('definedBenefits' in dto) {
|
|
3411
|
+
dto.kind = 'DefinedBenefits';
|
|
3412
|
+
}
|
|
3406
3413
|
}
|
|
3407
3414
|
|
|
3408
3415
|
class SuperSelectionApi {
|
|
@@ -3584,6 +3591,9 @@ class SuperSelectionAppService {
|
|
|
3584
3591
|
get campaignConnectEnabled() {
|
|
3585
3592
|
return this._state.campaignConnectEnabled;
|
|
3586
3593
|
}
|
|
3594
|
+
get definedBenefitsEligibility() {
|
|
3595
|
+
return this._state.definedBenefitsEligibility;
|
|
3596
|
+
}
|
|
3587
3597
|
async loadAppStateAsync() {
|
|
3588
3598
|
const appStateResponse = await superSelectionApi.getAppStateAsync();
|
|
3589
3599
|
this._state.accountConfiguration = Option.fromNullable(appStateResponse.accountConfiguration);
|
|
@@ -4711,6 +4721,17 @@ class ExistingFundService {
|
|
|
4711
4721
|
lastNominatedAt: dateSubmitted
|
|
4712
4722
|
});
|
|
4713
4723
|
}
|
|
4724
|
+
case 'DefinedBenefits': {
|
|
4725
|
+
const defaultUsi = choiceDetails.definedBenefits.usi;
|
|
4726
|
+
const fund = await this.getFundByUsiAsync(defaultUsi);
|
|
4727
|
+
return some({
|
|
4728
|
+
type: 'Defined Benefits Fund',
|
|
4729
|
+
name: isSome(fund) ? fund.value.productName : defaultUsi,
|
|
4730
|
+
usi: usi,
|
|
4731
|
+
valid: this.toFundValidState(fund),
|
|
4732
|
+
lastNominatedAt: dateSubmitted
|
|
4733
|
+
});
|
|
4734
|
+
}
|
|
4714
4735
|
default:
|
|
4715
4736
|
return none;
|
|
4716
4737
|
}
|
|
@@ -4790,7 +4811,13 @@ const ExistingChoice = class {
|
|
|
4790
4811
|
const DefaultFundView = () => {
|
|
4791
4812
|
return (h("div", { class: "flex h-20 justify-center items-center relative" }, h("div", { class: "h-20 w-20 rounded-full bg-primary-base opacity-10" }), h("div", { class: "h-10 w-10 absolute" }, h("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 512 512", class: "fill-primary-base" }, h("path", { d: "M448 96h-64V48C384 21.53 362.5 0 336 0h-160C149.5 0 128 21.53 128 48V96H64C28.65 96 0 124.7 0 160v256c0 35.35 28.65 64 64 64h384c35.35 0 64-28.65 64-64V160C512 124.7 483.3 96 448 96zM160 48C160 39.17 167.2 32 176 32h160C344.8 32 352 39.17 352 48V96H160V48zM480 416c0 17.64-14.36 32-32 32H64c-17.64 0-32-14.36-32-32V288h144v64c0 8.844 7.156 16 16 16h128c8.844 0 16-7.156 16-16V288H480V416zM208 336V288h96v48H208zM480 256H32V160c0-17.64 14.36-32 32-32h384c17.64 0 32 14.36 32 32V256z" })))));
|
|
4792
4813
|
};
|
|
4793
|
-
|
|
4814
|
+
const DefinedBenefitsFundView = () => {
|
|
4815
|
+
return (h("div", { class: "flex h-20 justify-center items-center relative" }, h("div", { class: "h-20 w-20 rounded-full bg-primary-base opacity-10" }), h("div", { class: "h-10 w-10 absolute" }, h("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 576 512", class: "fill-primary-base" }, h("path", { d: "M174.7 111.8C165.1 110.3 160.1 102.1 161.5 93.35C170.4 40.37 216.5 0 272 0C320.8 0 362.3 31.19 377.6 74.67C380.6 82.1 376.2 92.14 367.9 95.09C359.5 98.03 350.4 93.66 347.5 85.33C336.5 54.24 306.8 32 272 32C232.4 32 199.5 60.82 193.1 98.65C191.6 107.4 183.4 113.2 174.7 111.8V111.8zM400 264C400 250.7 410.7 240 424 240C437.3 240 448 250.7 448 264C448 277.3 437.3 288 424 288C410.7 288 400 277.3 400 264zM488.5 125.8L480 159.1C501.1 176.5 519.6 198.5 530.7 224H544C561.7 224 576 238.3 576 256V352C576 369.7 561.7 384 544 384H512C495.5 405.1 473.5 423.6 448 434.7V464C448 490.5 426.5 512 400 512H368C341.5 512 320 490.5 320 464V448H256V464C256 490.5 234.5 512 208 512H176C149.5 512 128 490.5 128 464V416C89.14 386.8 64 340.3 64 288C28.52 287.2 0 258.2 0 222.6C0 197.8 14 175.1 36.18 164L40.84 161.7C48.75 157.7 58.36 160.9 62.31 168.8C66.26 176.7 63.06 186.4 55.16 190.3L50.49 192.6C39.16 198.3 31.1 209.9 31.1 222.6C31.1 241 46.97 256 65.44 256H67.2C82.02 182.1 146.6 128 223.1 128H376.4C394 108.4 419.6 96 448 96H465.3C480.9 96 492.3 110.7 488.5 125.8H488.5zM224 160C153.3 160 96 217.3 96 288C96 329.9 116.1 367 147.2 390.4L160 400V464C160 472.8 167.2 480 176 480H208C216.8 480 224 472.8 224 464V416H352V464C352 472.8 359.2 480 368 480H400C408.8 480 416 472.8 416 464V413.7L435.2 405.4C455.6 396.5 473.2 382.4 486.4 364.8L496 352H544V256H509.7L501.4 236.8C492.5 216.4 478.4 198.8 460.8 185.6L443.8 172.8L455 128H448C429 128 412.1 136.2 400.3 149.3L390.7 160H224z" })))));
|
|
4816
|
+
};
|
|
4817
|
+
const ChooseAnotherFundView = () => {
|
|
4818
|
+
return this.existingFund.type == 'Defined Benefits Fund' ? null : (h("div", { class: "mt-4" }, h("sss-button", { fillWidth: true, variant: "secondary", promiseFn: () => this.handleFundNominationDeclined() }, "Choose another fund")));
|
|
4819
|
+
};
|
|
4820
|
+
return (h("div", null, h("div", { class: "text-2xl sm:text-3xl font-bold text-center" }, "Your super nomination"), this.existingFund.type == 'Defined Benefits Fund' ? null : (h("div", { class: "sm:text-lg text-gray-600 mt-3 sm:mt-4 max-w-800 text-center leading-7" }, "Continue with your chosen fund or choose another fund below.")), h("div", { class: "flex justify-center mt-8 sm:mt-12" }, h("div", { class: "max-w-400 w-full" }, h("div", { class: "flex-col border shadow-sm p-6 pt-8 rounded-lg text-center" }, h("div", { class: "space-y-4" }, (() => {
|
|
4794
4821
|
switch (this.existingFund.type) {
|
|
4795
4822
|
case 'Promoted Fund':
|
|
4796
4823
|
case 'Promoted Default Fund':
|
|
@@ -4801,6 +4828,8 @@ const ExistingChoice = class {
|
|
|
4801
4828
|
return h(MyOwnFundView, null);
|
|
4802
4829
|
case 'Default Fund':
|
|
4803
4830
|
return h(DefaultFundView, null);
|
|
4831
|
+
case 'Defined Benefits Fund':
|
|
4832
|
+
return h(DefinedBenefitsFundView, null);
|
|
4804
4833
|
default:
|
|
4805
4834
|
return h("div", null);
|
|
4806
4835
|
}
|
|
@@ -4812,11 +4841,12 @@ const ExistingChoice = class {
|
|
|
4812
4841
|
case 'Promoted Fund':
|
|
4813
4842
|
case 'Self Managed Fund':
|
|
4814
4843
|
case 'Promoted Default Fund':
|
|
4844
|
+
case 'Defined Benefits Fund':
|
|
4815
4845
|
return this.existingFund.name;
|
|
4816
4846
|
default:
|
|
4817
4847
|
return '';
|
|
4818
4848
|
}
|
|
4819
|
-
})())), h("div", { class: "mt-6" }, h("sss-button", { fillWidth: true, promiseFn: () => this.handleFundNominationAccepted() }, "Continue with this fund"))), h(
|
|
4849
|
+
})())), h("div", { class: "mt-6" }, h("sss-button", { fillWidth: true, promiseFn: () => this.handleFundNominationAccepted() }, "Continue with this fund"))), h(ChooseAnotherFundView, null)))));
|
|
4820
4850
|
}
|
|
4821
4851
|
async handleFundNominationAccepted() {
|
|
4822
4852
|
const detail = this.createSuperFundNominationDetail(this.existingFund);
|
|
@@ -7995,7 +8025,11 @@ const SuperSelectionApp = class {
|
|
|
7995
8025
|
});
|
|
7996
8026
|
iframe.appReady();
|
|
7997
8027
|
const ignoreExistingSelectionOption = Option.fromNullable(this.ignoreExistingSelection);
|
|
7998
|
-
const
|
|
8028
|
+
const shouldIgnoreExistingDefinedBenefitsChoice = Option.isSome(chosenFundOption) &&
|
|
8029
|
+
chosenFundOption.value.type == 'Defined Benefits Fund' &&
|
|
8030
|
+
superSelectionAppService.definedBenefitsEligibility == false;
|
|
8031
|
+
const shouldIgnoreExistingChoice = (Option.isSome(ignoreExistingSelectionOption) && ignoreExistingSelectionOption.value) ||
|
|
8032
|
+
shouldIgnoreExistingDefinedBenefitsChoice;
|
|
7999
8033
|
if (Option.isSome(superSelectionAppService.state.superChoicePrefill)) {
|
|
8000
8034
|
navigationService.navigateInternally(this.history, SuperSelectionAppRoutes.Prefill);
|
|
8001
8035
|
}
|