Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issues with the auto signout components - Closes #3667 #3682

Merged
merged 1 commit into from
Jul 13, 2021
Merged

Fix issues with the auto signout components - Closes #3667 #3682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions i18n/locales/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@
"Send {{token}}": "Send {{token}}",
"Send {{token}} here": "Send {{token}} here",
"Sender": "Sender",
"Session timeout": "Your session was timed out after 10 minutes of no network activity. Please sign in to continue using your account.",
"Session timed out": "Your session was timed out after 10 minutes of no network activity. Please sign in to continue using your account.",
"Settings": "Settings",
"Settings saved!": "Settings saved!",
"Share": "Share",
Expand Down Expand Up @@ -561,7 +561,7 @@
"Wallet address": "Wallet address",
"Wallet address:": "Wallet address:",
"Wallet details": "Wallet details",
"Warning session timeout": "Warning session timeout",
"Warning: Session Timeout": "Warning: Session Timeout",
"Watched": "Watched",
"We are proud to announce that Lisk Core v3 now contains new improved robust security features.": "We are proud to announce that Lisk Core v3 now contains new improved robust security features.",
"We kindly ask you to transfer your balance to the new account.": "We kindly ask you to transfer your balance to the new account.",
Expand Down Expand Up @@ -601,7 +601,7 @@
"Your balance will be transferred in a few seconds.": "Your balance will be transferred in a few seconds.",
"Your multisignatures groups": "Your multisignatures groups",
"Your nickname": "Your nickname",
"Your session will timed out in {{time}} if no network activity occur.": "Your session will timed out in {{time}} if no network activity occur.",
"Your session will be timed out in {{time}} if no network activity occurs.": "Your session will be timed out in {{time}} if no network activity occurs.",
"Your tokens and passphrase are safe.": "Your tokens and passphrase are safe.",
"Your transaction has been submitted and will be confirmed in a few moments.": "Your transaction has been submitted and will be confirmed in a few moments.",
"Your transaction is being submitted to the blockchain.": "Your transaction is being submitted to the blockchain.",
Expand Down
6 changes: 5 additions & 1 deletion src/components/shared/navigationBars/sideBar/autoSignOut/autoSignOut.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,12 @@
}

.title {
text-decoration: underline;
margin-bottom: 0;
margin-top: 20px;
}

.content {
margin-bottom: 45px;
}

button {
Expand Down
2 changes: 1 addition & 1 deletion src/components/shared/navigationBars/sideBar/autoSignOut/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import styles from './autoSignOut.css';

const TimeOutToast = ({ t, completed }) => (
completed && toast(
<div className={styles.toastText}>{t('Session timeout')}</div>, {
<div className={styles.toastText}>{t('Session timed out')}</div>, {
toastId: 'time-out',
autoClose: false,
closeButton: <span
Expand Down
4 changes: 2 additions & 2 deletions src/components/shared/navigationBars/sideBar/autoSignOut/warning.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ const TimeOutToast = ({
return (
completed && toast(
<div className={styles.toastText}>
<p className={styles.title}>{t('Warning session timeout')}</p>
<p>{t('Your session will timed out in {{time}} if no network activity occur.', { time: `${minutes}${seconds}` })}</p>
<h5 className={styles.title}>{t('Warning: Session Timeout')}</h5>
<p className={styles.content}>{t('Your session will be timed out in {{time}} if no network activity occurs.', { time: `${minutes}${seconds}` })}</p>
<button
className={`${styles.button} reset-time-button`}
onClick={onResetTime}
Expand Down