diff --git a/packages/desktop/src/assets/1024x1024.ico b/packages/desktop/src/assets/1024x1024.ico new file mode 100644 index 0000000..f56b3c1 Binary files /dev/null and b/packages/desktop/src/assets/1024x1024.ico differ diff --git a/packages/desktop/src/assets/1024x1024.png b/packages/desktop/src/assets/1024x1024.png new file mode 100644 index 0000000..31b9278 Binary files /dev/null and b/packages/desktop/src/assets/1024x1024.png differ diff --git a/packages/desktop/src/components/User/userAvatarWithStatus.tsx b/packages/desktop/src/components/User/userAvatarWithStatus.tsx index 92aab57..9a5e7ba 100644 --- a/packages/desktop/src/components/User/userAvatarWithStatus.tsx +++ b/packages/desktop/src/components/User/userAvatarWithStatus.tsx @@ -18,19 +18,19 @@ export function UserStatusBubble(props: { status: UserStatus }) { switch (props.status) { case UserStatus.ONLINE: return ( - + ); case UserStatus.OFFLINE: return ( - + ); case UserStatus.FLOW_STATE: return ( - + ); default: return ( - + ); } } diff --git a/packages/desktop/src/index.ts b/packages/desktop/src/index.ts index 53eacf1..48e5e54 100644 --- a/packages/desktop/src/index.ts +++ b/packages/desktop/src/index.ts @@ -29,7 +29,7 @@ const createWindow = (): void => { preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY, sandbox: true, }, - icon: path.join(__dirname, "src/assets/1024x1024.icns"), + icon: "./assets/1024x1024.icns", }); // and load the index.html of the app. diff --git a/packages/desktop/src/pages/Home/conversations/index.tsx b/packages/desktop/src/pages/Home/conversations/index.tsx index b80550d..a5cb659 100644 --- a/packages/desktop/src/pages/Home/conversations/index.tsx +++ b/packages/desktop/src/pages/Home/conversations/index.tsx @@ -1,7 +1,7 @@ import { Add, LinkRounded } from "@mui/icons-material"; +import { Avatar, Tooltip } from "antd"; import { $selectedConversation } from "../../../controller/recoil"; -import { Avatar } from "antd"; import { ContactDetails } from "@nirvana/core/responses/getContacts.response"; import { FaVolumeUp } from "react-icons/fa"; import SkeletonLoader from "../../../components/loading/skeleton"; @@ -33,51 +33,36 @@ export default function Conversations() { return ( <> - {/* actions navbar */} -
- - - - - - - -
- {/* pinned conversations */}
- - - - Live + + + + + Live + - - - - Mark Conversations as Pinned to Hear Them Live - +
{isLoading ? ( ) : (
- - - Inbox - - - {contactDetailsListResponse?.contactsDetails.map( (contactDetail: ContactDetails) => { + const isSelected = + contactDetail.otherUser.googleId === selectedConvo; + return (
selectContact(contactDetail.otherUser.googleId) } - className="flex flex-row items-center hover:bg-slate-600 group border-t border-t-slate-500 - py-4 px-2 cursor-pointer" + className={`flex flex-row items-center hover:bg-slate-600 group py-4 px-2 cursor-pointer ${ + isSelected ? "bg-slate-600" : "" + } rounded`} > diff --git a/packages/desktop/src/pages/Home/index.tsx b/packages/desktop/src/pages/Home/index.tsx index 27d50dd..df83ddd 100644 --- a/packages/desktop/src/pages/Home/index.tsx +++ b/packages/desktop/src/pages/Home/index.tsx @@ -25,6 +25,8 @@ export default function Home() {
+ +
); }