Issue #SB-13773 fix:error message changes for auto and manual merge

src/app/client/src/app/modules/merge-account/components/merge-account-status/merge-account-status.component.html

@@ -7,10 +7,16 @@
     <div class="sb-merged-account-content text-center">
       <h3 class="sb-merged-account-body-header my-24 font-weight-bold f-18">
         {{resourceService.frmelmnts?.lbl?.mergeAccount}}</h3>
-        <p *ngIf="isMergeSuccess" class="sb-merged-account-body-para sb-color-success font-weight-bold py-8">
-            {{resourceService.messages?.imsg?.m0065}}. {{resourceService.messages?.imsg?.m0066}}</p>
-          <p *ngIf="!isMergeSuccess" class="sb-merged-account-body-para sb-color-error font-weight-bold py-8">
-            {{resourceService.messages?.imsg?.m0067}} </p>
+      <p *ngIf="isMergeSuccess" class="sb-merged-account-body-para sb-color-success font-weight-bold py-8">
+        {{resourceService.messages?.imsg?.m0065}}. {{resourceService.messages?.imsg?.m0066}}</p>
+      <div *ngIf="mergeType === 'manual'">
+        <p *ngIf="!isMergeSuccess" class="sb-merged-account-body-para sb-color-error font-weight-bold py-8">
+          {{resourceService.messages?.imsg?.m0067}} </p>
+      </div>
+      <div *ngIf="mergeType === 'auto'">
+        <p *ngIf="!isMergeSuccess" class="sb-merged-account-body-para sb-color-error font-weight-bold py-8">
+          {{resourceService.messages?.imsg?.m0080}} </p>
+      </div>
     </div>
     <div class="d-flex flex-jc-center mt-40">
         <button class="sb-btn sb-btn-secondary sb-btn-md w-100"

src/app/client/src/app/modules/merge-account/components/merge-account-status/merge-account-status.component.ts

@@ -11,6 +11,7 @@ export class MergeAccountStatusComponent implements OnInit {
   @ViewChild('modal') modal;
   isMergeSuccess: any = {};
   redirectUri: string;
+  mergeType: string;
 
   constructor(public activatedRoute: ActivatedRoute, public resourceService: ResourceService) {
   }
@@ -19,6 +20,7 @@ export class MergeAccountStatusComponent implements OnInit {
     this.activatedRoute.queryParams.subscribe((queryParams) => {
       const queryParam = {...queryParams};
       this.isMergeSuccess = queryParam.status === 'success';
+      this.mergeType = queryParam.merge_type;
       this.redirectUri = queryParam.redirect_uri || '/resources';
     });
   }

src/app/resourcebundles/data/consumption/en.properties

@@ -682,8 +682,9 @@ messages.imsg.m0063 = combine usage details of the both accounts, and
 messages.imsg.m0064 = delete the other account
 messages.imsg.m0065 = Account merge has been successfully initiated
 messages.imsg.m0066 = You will be notified once it is complete
-messages.imsg.m0067 = Account merge has not been initiated. Please try again later
+messages.imsg.m0067 = Account merge has not been initiated. Please retry from the profile menu.
 messages.imsg.m0070 = Account already exists On {instance}, If this is your account, click Merge to
+messages.imsg.m0080 = Account merge has not been initiated. Please retry by logging in to your state system
 messages.imsg.m0071 = Cancel to create new {instance} Account
 messages.imsg.m0072 = Could not merge accounts because the password entered is incorrect.
 messages.imsg.m0073 = Click OK to create a new {instance} account.

src/app/routes/accountMergeRoute.js

@@ -64,14 +64,14 @@ module.exports = (app) => {
       u2Token).catch(err => {
       console.log('error in initiateAccountMerge', JSON.stringify(err));
       console.log('error detals', err.statusCode, err.message);
-      const query = '?status=error&redirect_uri=' + req.session.mergeAccountInfo.initiatorAccountDetails.redirectUri;
+      const query = '?status=error&merge_type=manual&redirect_uri=' + req.session.mergeAccountInfo.initiatorAccountDetails.redirectUri;
       req.session.mergeAccountInfo = null;
       const redirectUri = `https://${req.get('host')}/accountMerge` + query;
       res.redirect(url + redirectUri);
     });
     if (_.get(mergeResponse, 'result.result.status') === 'SUCCESS' && mergeResponse.responseCode === 'OK') {
       console.log('mergeResponse coming from backend', JSON.stringify(mergeResponse));
-      const query = '?status=success&redirect_uri=' + req.session.mergeAccountInfo.initiatorAccountDetails.redirectUri;
+      const query = '?status=success&merge_type=manual&redirect_uri=' + req.session.mergeAccountInfo.initiatorAccountDetails.redirectUri;
       console.log('after final success', query);
       const redirectUri = `https://${req.get('host')}/accountMerge` + query;
       req.session.mergeAccountInfo = null;