ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-01 11:33:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2565 from urbit/groups/leave-group-text

Browse Source 
groups: two contact card changes
This commit is contained in:
ixv 2020-03-20 16:17:33 -07:00 committed by GitHub
commit fed93b1fe5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/interface/groups/src/js/components/lib/contact-card.js
View File

@ -486,14 +486,11 @@ export class ContactCard extends Component {
}
let ourOpt = (props.ship === window.ship) ? "dib" : "dn";
let localOpt =
((props.ship === window.ship) && (props.path === "/~/default"))
? "dib" : "dn";
let adminOpt =
( (props.path.includes(window.ship) || (props.ship === window.ship)) &&
!(props.path.includes('/~/default'))
) ? "dib" : "dn";
((props.path.includes(`~${window.ship}/`)) || ((props.ship === window.ship) &&
!(props.path.includes('/~/default'))))
? "dib" : "dn";
let meLink = (props.path === "/~/default")
? `/~groups` : `/~groups/detail${props.path}`;
@ -532,7 +529,7 @@ export class ContactCard extends Component {
`bg-gray0-d mv4 mh3 pa1 f9 red2 pointer flex-shrink-0 ` + adminOpt
}
onClick={this.removeFromGroup}>
{props.ship === window.ship && props.path.includes(window.ship)
{props.ship === window.ship
? "Leave Group"
: "Remove from Group"}
</button>