Fix bug in async react component

This commit is contained in:
Alan Hamlett
2024-12-05 12:44:22 +01:00
parent 87d76c97cd
commit 6e55a43cb5

View File

@@ -2,9 +2,8 @@ import React from 'react';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import { ReduxSelector } from '../types/store'; import { ReduxSelector } from '../types/store';
import { User } from '../types/user'; import { User } from '../types/user';
import { getWebsiteUrl } from '../utils/settings';
export default async function NavBar(): Promise<Promise<JSX.Element>> { export default function NavBar(): JSX.Element {
const user: User | undefined = useSelector( const user: User | undefined = useSelector(
(selector: ReduxSelector) => selector.currentUser.user, (selector: ReduxSelector) => selector.currentUser.user,
); );
@@ -21,9 +20,9 @@ export default async function NavBar(): Promise<Promise<JSX.Element>> {
} }
}; };
const customRules = async () => { const customRules = () => {
if (user) { if (user) {
const url = await getWebsiteUrl(); const url = 'https://wakatime.com';
return ( return (
<li className="mb-2"> <li className="mb-2">
<a <a
@@ -42,9 +41,9 @@ export default async function NavBar(): Promise<Promise<JSX.Element>> {
} }
}; };
const dashboard = async () => { const dashboard = () => {
if (user) { if (user) {
const url = await getWebsiteUrl(); const url = 'https://wakatime.com';
return ( return (
<li className="mb-2"> <li className="mb-2">
<a <a
@@ -87,8 +86,8 @@ export default async function NavBar(): Promise<Promise<JSX.Element>> {
<div className="collapse navbar-collapse mt-4" id="userInfoCollapse"> <div className="collapse navbar-collapse mt-4" id="userInfoCollapse">
{signedInAs()} {signedInAs()}
<ul className="nav navbar-nav border-bottom pb-2"> <ul className="nav navbar-nav border-bottom pb-2">
{await customRules()} {customRules()}
{await dashboard()} {dashboard()}
<li className="dropdown"> <li className="dropdown">
<a <a
href="#" href="#"