-
{{"JOIN" | translate}}
+
+ {{"JOIN" | translate}}
\ No newline at end of file
diff --git a/src/app/pages/session-detail/session-detail.page.scss b/src/app/pages/session-detail/session-detail.page.scss
index 26f542ba8..0db0c3191 100644
--- a/src/app/pages/session-detail/session-detail.page.scss
+++ b/src/app/pages/session-detail/session-detail.page.scss
@@ -48,4 +48,7 @@ ion-item {
--padding-end: 0px;
--inner-padding-end: 0px;
--padding-start: 0px;
- }
\ No newline at end of file
+ }
+.join-button{
+ background: var(--white);
+}
\ No newline at end of file
diff --git a/src/app/pages/session-detail/session-detail.page.ts b/src/app/pages/session-detail/session-detail.page.ts
index 7685657f0..b9fa985d5 100644
--- a/src/app/pages/session-detail/session-detail.page.ts
+++ b/src/app/pages/session-detail/session-detail.page.ts
@@ -262,8 +262,8 @@ export class SessionDetailPage implements OnInit {
let msg = {
header: 'CANCEL_SESSION',
message: 'CANCEL_CONFIRM_MESSAGE',
- cancel: 'CLOSE',
- submit: 'CANCEL'
+ cancel: 'CANCEL',
+ submit: 'UN_ENROLL'
}
this.utilService.alertPopup(msg).then(async data => {
if (data) {
diff --git a/src/app/pages/tabs/profile/profile.page.ts b/src/app/pages/tabs/profile/profile.page.ts
index cd1aa6458..cd244c722 100644
--- a/src/app/pages/tabs/profile/profile.page.ts
+++ b/src/app/pages/tabs/profile/profile.page.ts
@@ -81,6 +81,7 @@ export class ProfilePage implements OnInit {
this.visited=true;
}
this.gotToTop();
+ this.profileDetailsApi();
}
gotToTop() {
@@ -89,15 +90,18 @@ export class ProfilePage implements OnInit {
async doRefresh(event){
- var result = await this.profileService.getProfileDetailsFromAPI(this.user?.isAMentor,this.user?._id);
- if(result){
- this.formData.data = result;
- this.formData.data.emailId = result.email.address;
- }
+ this.profileDetailsApi();
event.target.complete();
}
feedback() {
this.navCtrl.navigateForward([CommonRoutes.FEEDBACK]);
}
+ async profileDetailsApi(){
+ var result = await this.profileService.getProfileDetailsFromAPI(this.user?.isAMentor,this.user?._id);
+ if(result){
+ this.formData.data = result;
+ this.formData.data.emailId = result.email.address;
+ }
+ }
}
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 5769ef9f1..39d6ce83e 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -47,7 +47,7 @@
"SIGN_UP_TO_MENTOR_ED":"Sign up to AP-MentorED",
"ADD":"Add",
"CANCEL": "Cancel",
- "CANCEL_SESSION":"Cancel Session",
+ "CANCEL_SESSION":"Unenroll session",
"OK": "Ok",
"LOG_IN":"Log In",
"SHOW_PASSWORD":"Show password",
@@ -96,7 +96,7 @@
"NO_DATA_AVAILABLE": "No data available",
"CONFIRM":"Confirm",
"FORM_UNSAVED_DATA":"You have unsaved data, please save your data before closing.",
- "SESSION_FORM_UNSAVED_DATA": "Are you sure you want to exit? You will lose all data if you leave this page?",
+ "SESSION_FORM_UNSAVED_DATA": "Are you sure you want to exit? Your data will not be saved.",
"SAVE":"Save",
"TERMS_OF_USE": "Terms of use",
"SOMETHING_WENT_WRONG":"Something went wrong",