changed styling

This commit is contained in:
PhilReact 2024-11-11 18:35:00 +02:00
parent 4d561b050b
commit f705886d41
7 changed files with 47 additions and 30 deletions

View File

@ -77,7 +77,7 @@ display: flex;
border: 1px solid var(--50-white, rgba(255, 255, 255, 0.5)); border: 1px solid var(--50-white, rgba(255, 255, 255, 0.5));
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
width: 140px; width: auto;
height: 25px; height: 25px;
padding: 5px 15px 5px 15px; padding: 5px 15px 5px 15px;
gap: 5px; gap: 5px;

View File

@ -1244,7 +1244,8 @@ function App() {
<AuthenticatedContainerInnerLeft <AuthenticatedContainerInnerLeft
sx={{ sx={{
overflowY: isMobile && "auto", overflowY: isMobile && "auto",
padding: '0px 20px' padding: '0px 20px',
minWidth: '225px'
}} }}
> >
<Spacer height="48px" /> <Spacer height="48px" />
@ -1391,10 +1392,11 @@ function App() {
textDecoration: "underline", textDecoration: "underline",
}} }}
onClick={async () => { onClick={async () => {
window.electronAPI.openExternal("https://www.qort.trade"); executeEvent("addTab", { data: { service: 'APP', name: 'q-trade' } });
executeEvent("open-apps-mode", { });
}} }}
> >
Get QORT at qort.trade Get QORT at Q-Trade
</TextP> </TextP>
</AuthenticatedContainerInnerLeft> </AuthenticatedContainerInnerLeft>
)} )}

View File

@ -1424,6 +1424,16 @@ async function sendChatForBuyOrder({ qortAddress, recipientPublicKey, message, a
const _encryptedMessage = tx._encryptedMessage; const _encryptedMessage = tx._encryptedMessage;
const encryptedMessageToBase58 = Base58.encode(_encryptedMessage); const encryptedMessageToBase58 = Base58.encode(_encryptedMessage);
const signature = "id-" + Date.now() + "-" + Math.floor(Math.random() * 1000) const signature = "id-" + Date.now() + "-" + Math.floor(Math.random() * 1000)
const checkGatewayStatusRes = await fetch(`${buyTradeNodeBaseUrl}/admin/status`)
const checkGatewayStatusData = await checkGatewayStatusRes.json()
if(+checkGatewayStatusData?.syncPercent !== 100 || checkGatewayStatusData?.isSynchronizing !== false){
throw new Error("Cannot make trade. Gateway node is synchronizing")
}
const healthCheckRes = await fetch('https://www.qort.trade/api/transaction/healthcheck')
const healthcheckData = await healthCheckRes.json()
if(healthcheckData?.dbConnection !== 'healthy'){
throw new Error('Could not connect to db. Try again later.')
}
const res = await axios.post( const res = await axios.post(
`https://www.qort.trade/api/transaction/updatetxgateway`, `https://www.qort.trade/api/transaction/updatetxgateway`,
{ {

View File

@ -92,7 +92,7 @@ export const MessageDisplay = ({ htmlContent, isReply }) => {
if (res) { if (res) {
const { service, name, identifier, path } = res; const { service, name, identifier, path } = res;
executeEvent("addTab", { data: { service, name, identifier, path } }); executeEvent("addTab", { data: { service, name, identifier, path } });
executeEvent("open-dev-mode", { }); executeEvent("open-apps-mode", { });
} }
} }

View File

@ -1303,7 +1303,7 @@ export const Group = ({
}; };
}, []); }, []);
const openDevModeFunc = () => { const openAppsMode = () => {
if (isMobile) { if (isMobile) {
setMobileViewMode("apps"); setMobileViewMode("apps");
} }
@ -1311,6 +1311,7 @@ export const Group = ({
setDesktopViewMode('apps') setDesktopViewMode('apps')
} }
if(isMobile){
setIsOpenSideViewDirects(false) setIsOpenSideViewDirects(false)
setIsOpenSideViewGroups(false) setIsOpenSideViewGroups(false)
setGroupSection("default"); setGroupSection("default");
@ -1331,14 +1332,16 @@ export const Group = ({
setFirstSecretKeyInCreation(false); setFirstSecretKeyInCreation(false);
setIsOpenSideViewDirects(false) setIsOpenSideViewDirects(false)
setIsOpenSideViewGroups(false) setIsOpenSideViewGroups(false)
}
}; };
useEffect(() => { useEffect(() => {
subscribeToEvent("open-dev-mode", openDevModeFunc); subscribeToEvent("open-apps-mode", openAppsMode);
return () => { return () => {
unsubscribeFromEvent("open-dev-mode", openDevModeFunc); unsubscribeFromEvent("open-apps-mode", openAppsMode);
}; };
}, []); }, []);

View File

@ -212,7 +212,7 @@ export const ThingsToDoInitial = ({ myAddress, name, hasGroups, balance }) => {
fontSize: "13px", fontSize: "13px",
fontWeight: 400, fontWeight: 400,
}, },
}} primary={`Join a group hub`} /> }} primary={`Join a group`} />
<ListItemIcon sx={{ <ListItemIcon sx={{
justifyContent: "flex-end", justifyContent: "flex-end",
}}> }}>

View File

@ -16,6 +16,7 @@ import { WalletIcon } from "../../assets/Icons/WalletIcon";
import { HubsIcon } from "../../assets/Icons/HubsIcon"; import { HubsIcon } from "../../assets/Icons/HubsIcon";
import { TradingIcon } from "../../assets/Icons/TradingIcon"; import { TradingIcon } from "../../assets/Icons/TradingIcon";
import { MessagingIcon } from "../../assets/Icons/MessagingIcon"; import { MessagingIcon } from "../../assets/Icons/MessagingIcon";
import { executeEvent } from "../../utils/events";
const IconWrapper = ({ children, label, color }) => { const IconWrapper = ({ children, label, color }) => {
return ( return (
@ -185,7 +186,8 @@ export const MobileFooter = ({
/> />
<BottomNavigationAction <BottomNavigationAction
onClick={async () => { onClick={async () => {
await Browser.open({ url: 'https://www.qort.trade' }); executeEvent("addTab", { data: { service: 'APP', name: 'q-trade' } });
executeEvent("open-apps-mode", { });
}} }}
icon={ icon={