Skip to content

Commit

Permalink
chore: merge conflicts sorted
Browse files Browse the repository at this point in the history
  • Loading branch information
atepem committed Oct 1, 2024
1 parent 9be0a89 commit 2dd2aca
Showing 1 changed file with 4 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,8 @@ export const MinimizedStatus = ({
}}
onClick={() => window.open('https://autonolas.network')}
/>
{showStatus && (
<rect x="38" y="10" width="30" height="30" fill="#D9D9D9" />
)}
<rect
width={108 - (showStatus ? 0 : 30)}
height="50"
rx="11.1872"
fill="black"
/>
{showStatus && <rect x="38" y="10" width="30" height="30" fill="#D9D9D9" />}
<rect width={108 - (showStatus ? 0 : 30)} height="50" rx="11.1872" fill="black" />
<rect
x={66 - (showStatus ? 0 : 30)}
y="8"
Expand All @@ -65,9 +58,7 @@ export const MinimizedStatus = ({
style={{
cursor: 'pointer',
pointerEvents: 'all',
transform: showStatus
? 'translate(0px, 0px)'
: 'translate(-24px, 0px)',
transform: showStatus ? 'translate(0px, 0px)' : 'translate(-24px, 0px)',
}}
/>
{showStatus && (
Expand All @@ -78,9 +69,7 @@ export const MinimizedStatus = ({
r="4"
fill={isOperational ? COLOR.GREEN_2 : COLOR.ORANGE}
/>
<div style={{ height: 0, width: 0, visibility: 'hidden' }}>
{timerCountdown}
</div>
<div style={{ height: 0, width: 0, visibility: 'hidden' }}>{timerCountdown}</div>
</>
)}

Expand Down

0 comments on commit 2dd2aca

Please sign in to comment.