diff --git a/src/assets/languages/en.json b/src/assets/languages/en.json
index e0a407576a242494dab7db78d3a5b47f7b1e7e74..927e25280a1805b68a0d35a83e622458e1ea8be1 100644
--- a/src/assets/languages/en.json
+++ b/src/assets/languages/en.json
@@ -1510,8 +1510,8 @@
"desc": "Description",
"location": "Location",
"timeZone": "Time Zone",
- "startDateTime": "Start Date/Time",
- "endDateTime": "End Date/Time",
+ "startDateTime": "Start Date & Time",
+ "endDateTime": "End Date & Time",
"addMultileSlot": "Add Multiple Time Slots"
},
"btns": {
diff --git a/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryLeftPanel/SignupEventHistoryLeftPanel.js b/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryLeftPanel/SignupEventHistoryLeftPanel.js
index a4713abfbb1a33c88566dbdeeee8a9b6b98416c4..54fcc8faf5231ef27da938ddb8c20d59b08fee7f 100644
--- a/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryLeftPanel/SignupEventHistoryLeftPanel.js
+++ b/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryLeftPanel/SignupEventHistoryLeftPanel.js
@@ -26,7 +26,7 @@ class SignupEventHistoryLeftPanel extends React.Component {
isShowParticipants: false,
isShowSlotDetail: false,
searchedHistory: "",
- sortingField: sortFieldNames[1],
+ sortingField: sortFieldNames[1],
activeEventIndex: -1
}
}
@@ -100,11 +100,11 @@ class SignupEventHistoryLeftPanel extends React.Component {
- - this.handleActiveTab(1, 0)}>{t('eventSignup.eventSignupHistory.tabs.all')}
- - this.handleActiveTab(2, 3)}>{t('eventSignup.eventSignupHistory.tabs.saved')}
- - this.handleActiveTab(3, 2)}>{t('eventSignup.eventSignupHistory.tabs.published')}
- - this.handleActiveTab(4, 1)}>{t('eventSignup.eventSignupHistory.tabs.scheduled')}
- - this.handleActiveTab(5, 4)}>{t('eventSignup.eventSignupHistory.tabs.canceled')}
+ - this.handleActiveTab(1, 0)}>{t('eventSignup.eventSignupHistory.tabs.all')}
+ - this.handleActiveTab(2, 3)}>{t('eventSignup.eventSignupHistory.tabs.saved')}
+ - this.handleActiveTab(3, 2)}>{t('eventSignup.eventSignupHistory.tabs.published')}
+ - this.handleActiveTab(4, 1)}>{t('eventSignup.eventSignupHistory.tabs.scheduled')}
+ - this.handleActiveTab(5, 4)}>{t('eventSignup.eventSignupHistory.tabs.canceled')}
{
diff --git a/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationLeftPanel/SignupEventInvitationLeftPanel.js b/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationLeftPanel/SignupEventInvitationLeftPanel.js
index 6f2a7597d511957e77e45110170ab595206deb84..a7bce84f18388be60b625a5cfaa389a9570f9ece 100644
--- a/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationLeftPanel/SignupEventInvitationLeftPanel.js
+++ b/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationLeftPanel/SignupEventInvitationLeftPanel.js
@@ -82,19 +82,18 @@ class SignupEventInvitationLeftPanel extends React.Component {
-
diff --git a/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js b/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js
index 8e5b90b07ba2e73c7e9c6c1b7363c890b699c99c..a64fe5d3ea22ad381eeb2b4908b68fd560bfd0d6 100644
--- a/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js
+++ b/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js
@@ -57,7 +57,7 @@ class SignupEventInvitationRightPanel extends React.Component {
{t('eventSignup.viewEventSlot')}
- {currentEventInvitation.slotIdList.length === 0 || currentEventInvitation.event.eventSlotsList.length === 1 ?
+ {currentEventInvitation.slotIdList.length === 0 && currentEventInvitation.event.eventSlotsList.length === 1 ?
diff --git a/src/layouts/EventSignupHistory/EventSignupHistory.styles.js b/src/layouts/EventSignupHistory/EventSignupHistory.styles.js
index a32a5e596c26095d9d6fecda219b1d29d162f935..fccef754dbb989bbc09f5ec53a484a816f477459 100644
--- a/src/layouts/EventSignupHistory/EventSignupHistory.styles.js
+++ b/src/layouts/EventSignupHistory/EventSignupHistory.styles.js
@@ -346,6 +346,10 @@ export default (theme, contactAvatarImg) => ({
}
},
+ liDisable:{
+ pointerEvents: 'none',
+ opacity: 0.6
+ },
historyInfoContent: {
fontWeight: "600",
diff --git a/src/layouts/EventSignupInvitation/EventSignupInvitation.styles.js b/src/layouts/EventSignupInvitation/EventSignupInvitation.styles.js
index b1cba513b6d3ad7c44d2597eb1cd8ee3a99f819a..346336d6722cbef3262fd71030d79aab03bccacf 100644
--- a/src/layouts/EventSignupInvitation/EventSignupInvitation.styles.js
+++ b/src/layouts/EventSignupInvitation/EventSignupInvitation.styles.js
@@ -325,6 +325,10 @@ export default (theme, contactAvatarImg) => ({
}
},
+ liDisable:{
+ pointerEvents: 'none',
+ opacity: 0.6
+ },
historyInfoContent: {
fontWeight: "600",
color: "#777",