Skip to content

Commit 1fb1d5f

Browse files
useEffect fix
1 parent 4629a77 commit 1fb1d5f

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

.eslintrc.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,11 @@ module.exports = {
3535
'no-minusminus': 0,
3636
'no-param-reassign': 0,
3737
'prefer-destructuring': 0,
38+
'consistent-return': 0,
3839
"no-shadow": "off",
3940

41+
'jsx-a11y/anchor-is-valid': 0,
42+
4043
"import/prefer-default-export": "off",
4144
"import/extensions": "off",
4245
"import/no-unresolved": "off",

src/app/hooks/useCrossSigningStatus.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export function useCrossSigningStatus() {
99
const [isCSEnabled, setIsCSEnabled] = useState(hasCrossSigningAccountData());
1010

1111
useEffect(() => {
12-
if (isCSEnabled) return null;
12+
if (isCSEnabled) return;
1313
const handleAccountData = (event) => {
1414
if (event.getType() === 'm.cross_signing.master') {
1515
setIsCSEnabled(true);

src/app/organisms/navigation/ProfileAvatarMenu.jsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function ProfileAvatarMenu() {
3333
useEffect(() => {
3434

3535
// Get User and update data
36-
const user = mx.getUser(mx.getUserId());
36+
const user2 = mx.getUser(mx.getUserId());
3737

3838
// Set New User Status
3939
const onProfileUpdate = (event = {}) => {
@@ -42,7 +42,7 @@ function ProfileAvatarMenu() {
4242
const tinyEvent = event;
4343
const eventJSON = JSON.stringify(tinyEvent);
4444

45-
if (eventJSON.length > 0 /* && (typeof user.presenceStatusMsg !== 'string' || user.presenceStatusMsg !== eventJSON) */) {
45+
if (eventJSON.length > 0 /* && (typeof user2.presenceStatusMsg !== 'string' || user2.presenceStatusMsg !== eventJSON) */) {
4646

4747
let presenceStatus = 'online';
4848
if (typeof tinyEvent.status === 'string') {
@@ -60,13 +60,13 @@ function ProfileAvatarMenu() {
6060
if (customStatusRef && customStatusRef.current && typeof event.msg === 'string' && event.msg.length > 0) {
6161
customStatusRef.current.innerHTML = ReactDOMServer.renderToStaticMarkup(twemojify(event.msg.substring(0, 100)));
6262
} else {
63-
customStatusRef.current.innerHTML = ReactDOMServer.renderToStaticMarkup(twemojify(user.userId));
63+
customStatusRef.current.innerHTML = ReactDOMServer.renderToStaticMarkup(twemojify(user2.userId));
6464
}
6565

6666
if (statusRef && statusRef.current && typeof event.status === 'string' && event.status.length > 0) {
6767
const tinyUser = mx.getUser(mx.getUserId());
6868
tinyUser.presenceStatusMsg = JSON.stringify(event);
69-
statusRef.current.className = getUserStatus(user);
69+
statusRef.current.className = getUserStatus(user2);
7070
}
7171

7272
}
@@ -88,10 +88,10 @@ function ProfileAvatarMenu() {
8888
});
8989

9090
// Socket
91-
user.on('User.avatarUrl', onAvatarChange);
91+
user2.on('User.avatarUrl', onAvatarChange);
9292
navigation.on(cons.events.navigation.PROFILE_UPDATED, onProfileUpdate);
9393
return () => {
94-
user.removeListener('User.avatarUrl', onAvatarChange);
94+
user2.removeListener('User.avatarUrl', onAvatarChange);
9595
navigation.removeListener(
9696
cons.events.navigation.PROFILE_UPDATED,
9797
onProfileUpdate,

0 commit comments

Comments
 (0)