Skip to content

Commit

Permalink
Merge pull request #77 from DarshitJain04/master
Browse files Browse the repository at this point in the history
Minor changes in upcoming alarms
  • Loading branch information
hirenchalodiya1 authored Oct 12, 2020
2 parents 18b5906 + ed05ac1 commit 22274f3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/pages/Popup/components/AlarmUp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ class Alarmview extends Component {
primary={
alarm.custom
? `${this.trunc(alarm.data.Name, 22)}`
: `${alarm.data.A} ${this.trunc(alarm.data.B, 16)}`
: `${alarm.data.A} ${this.trunc(alarm.data.B, 13)}`
}
secondary={`${alarm.time}`}
/>
Expand Down Expand Up @@ -294,7 +294,7 @@ class Alarmview extends Component {
<div
style={{ padding: '1rem', textAlign: 'center', width: '100%' }}
>
<Typography>No alarms Present</Typography>
<Typography>No alarms</Typography>
</div>
)}
</AccordionDetails>
Expand Down Expand Up @@ -324,7 +324,7 @@ class Alarmview extends Component {
<div
style={{ padding: '1rem', textAlign: 'center', width: '100%' }}
>
<Typography>No alarms Present</Typography>
<Typography>No alarms</Typography>
</div>
)}
</AccordionDetails>
Expand Down Expand Up @@ -354,7 +354,7 @@ class Alarmview extends Component {
<div
style={{ padding: '1rem', textAlign: 'center', width: '100%' }}
>
<Typography>No alarms Present</Typography>
<Typography>No alarms</Typography>
</div>
)}
</AccordionDetails>
Expand Down

0 comments on commit 22274f3

Please sign in to comment.