commit cd698c530322bff3a4c1952c5ca9b57d0b15dc6f
author simon <tran.simon2@gmail.com> Tue Nov 08 19:21:38 2022 -0500
committer Simon Tran <tran.simon2@gmail.com> Wed Nov 09 10:26:46 2022 -0500
tree b4e68323a823978cf7840177dedd63770fd8cc75
parent 7f9916bde46a5a8e153a1932ca46c0a9e352cb29

Fix audio and video call buttons in conversation

GitLab: #105
Change-Id: Ic1fcd4143abbc77588c8eb41936aac7b27c67c35

client/src/components/Button.tsx

diff --git a/client/src/components/Button.tsx b/client/src/components/Button.tsx
index 4937c0b..8e695cb 100644
--- a/client/src/components/Button.tsx
+++ b/client/src/components/Button.tsx
@@ -351,11 +351,11 @@
 };
 
 export const StartVideoCallButton = (props: IconButtonProps) => {
-  return <SquareButton {...props} aria-label="start audio call" Icon={AudioCallIcon} />;
+  return <SquareButton {...props} aria-label="start audio call" Icon={VideoCallIcon} />;
 };
 
 export const StartAudioCallButton = (props: IconButtonProps) => {
-  return <SquareButton {...props} aria-label="start video call" Icon={VideoCallIcon} />;
+  return <SquareButton {...props} aria-label="start video call" Icon={AudioCallIcon} />;
 };
 
 export const UploadFileButton = (props: IconButtonProps) => {

client/src/components/ConversationView.tsx

diff --git a/client/src/components/ConversationView.tsx b/client/src/components/ConversationView.tsx
index fc0ee9b..4ecffe8 100644
--- a/client/src/components/ConversationView.tsx
+++ b/client/src/components/ConversationView.tsx
@@ -134,7 +134,7 @@
   }, [account, members, adminTitle, t]);
 
   const startCall = (withVideo = false) => {
-    let url = `/deprecated-account/${account.getId()}/call/${conversationId}`;
+    let url = `/account/call/${conversationId}`;
     if (withVideo) {
       url += '?video=true';
     }

client/src/index.tsx

diff --git a/client/src/index.tsx b/client/src/index.tsx
index 49ed2ef..ef5e5d4 100644
--- a/client/src/index.tsx
+++ b/client/src/index.tsx
@@ -68,7 +68,7 @@
           </AuthProvider>
         }
       >
-        <Route path="account" element={<JamiMessenger />} />
+        <Route path="account/*" element={<JamiMessenger />} />
         <Route path="settings" element={<AccountSettings />} />
         <Route path="contacts" element={<ContactList />} />
       </Route>