colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show 'Off' text when disappearing messages are turned off

Browse Source
This commit is contained in:
Scott Nonnenberg
2018-08-01 09:24:05 -07:00
parent 0d13d437fe
commit 19ff050b3a
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ts/components/conversation/TimerNotification.md
View File

@@ -14,7 +14,7 @@
phoneNumber="(202) 555-1000" phoneNumber="(202) 555-1000"
profileName="Mr. Fire" profileName="Mr. Fire"
disabled={true} disabled={true}
timespan="1 hour" timespan="Off"
i18n={util.i18n} i18n={util.i18n}
/> />
</util.ConversationContext> </util.ConversationContext>
@@ -34,7 +34,7 @@
type="fromMe" type="fromMe"
phoneNumber="(202) 555-1000" phoneNumber="(202) 555-1000"
disabled={true} disabled={true}
timespan="1 hour" timespan="Off"
i18n={util.i18n} i18n={util.i18n}
/> />
</util.ConversationContext> </util.ConversationContext>
@@ -54,7 +54,7 @@
type="fromSync" type="fromSync"
phoneNumber="(202) 555-1000" phoneNumber="(202) 555-1000"
disabled={true} disabled={true}
timespan="1 hour" timespan="Off"
i18n={util.i18n} i18n={util.i18n}
/> />
</util.ConversationContext> </util.ConversationContext>

8
ts/components/conversation/TimerNotification.tsx
View File

@@ -74,11 +74,9 @@ export class TimerNotification extends React.Component<Props> {
disabled ? 'module-timer-notification__icon--disabled' : null disabled ? 'module-timer-notification__icon--disabled' : null
)} )}
/> />
{disabled ? null : ( <div className="module-timer-notification__icon-label">
<div className="module-timer-notification__icon-label"> {timespan}
{timespan} </div>
</div>
)}
</div> </div>
<div className="module-timer-notification__message"> <div className="module-timer-notification__message">
{this.renderContents()} {this.renderContents()}