Page MenuHomePhabricator
Differential D5219

[native] Unify thread settings accessibility
ClosedPublic
Actions

Authored by michal on Sep 23 2022, 5:49 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 18, 8:55 PM
Unknown Object (File)
Tue, Mar 18, 8:55 PM
Unknown Object (File)
Tue, Mar 18, 8:55 PM
Unknown Object (File)
Tue, Mar 18, 1:56 AM
Unknown Object (File)
Tue, Mar 18, 1:55 AM
Unknown Object (File)
Tue, Mar 18, 1:55 AM
Unknown Object (File)
Sat, Mar 15, 10:09 PM
Unknown Object (File)
Tue, Mar 11, 3:08 PM
View All Files
Subscribers
ashoat

Details

Reviewers
tomek
atul
• abosh
ashoat
Commits
rCOMMc043108ce2c9: [native] Unify thread settings accessibility
Summary

ENG-1827
Makes sure that both ios and android use the same logic for determining whether the thread settings should be accessible.

Test Plan

Test on both android and ios

  1. Start creating a new thread, the settings should be unavailable
  2. Add new users, send a message. Settings should be available when the thread stops being pending.

Diff Detail

Repository
rCOMM Comm
Branch
eng1827
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

michal created this revision.Sep 23 2022, 5:49 AM
Herald added a subscriber: ashoat. · View Herald TranscriptSep 23 2022, 5:49 AM
Harbormaster returned this revision to the author for changes because remote builds failed.Sep 23 2022, 5:54 AM
Harbormaster failed remote builds in B12401: Diff 17020!
michal edited the summary of this revision. (Show Details)Sep 23 2022, 6:05 AM
michal added a parent revision: D5218: [native] Fix wrong title during thread creation.
michal updated this revision to Diff 17022.Sep 23 2022, 6:06 AM
michal edited the summary of this revision. (Show Details)

update

Harbormaster returned this revision to the author for changes because remote builds failed.Sep 23 2022, 6:11 AM
Harbormaster failed remote builds in B12403: Diff 17022!
Harbormaster completed remote builds in B12401: Diff 17020.Sep 23 2022, 7:36 AM
Harbormaster completed remote builds in B12403: Diff 17022.
michal requested review of this revision.Sep 23 2022, 7:37 AM
michal planned changes to this revision.Sep 26 2022, 1:42 AM
michal edited the summary of this revision. (Show Details)Sep 27 2022, 1:46 AM
michal edited the summary of this revision. (Show Details)
michal updated this revision to Diff 17097.Sep 27 2022, 3:01 AM

Update

Harbormaster completed remote builds in B12450: Diff 17097.Sep 27 2022, 3:11 AM
atul added a reviewer: ashoat. atul added 1 blocking reviewer(s): tomek.Sep 27 2022, 6:42 AM

Adding @tomek as blocking since he initially introduced the logic: https://phab.comm.dev/D545
Adding @ashoat as blocking since he pointed out the "discrepancy" between platforms: https://phab.comm.dev/D5082#150392

atul accepted this revision.Sep 27 2022, 6:59 AM
atul added inline comments.
native/chat/chat.react.js
202 ↗(On Diff #17097)

Outside the scope of this diff, but might be easier to comprehend if it was more explicit that the one member is the viewer instead of member list sans ashoat having a length of 1

tomek accepted this revision.Sep 27 2022, 8:24 AM

Regarding the test plan, have you checked if the behavior is the same on both platforms?

michal edited the test plan for this revision. (Show Details)Sep 27 2022, 8:28 AM

Yes, I've checked. I will amend the test plan right now.

ashoat accepted this revision.Sep 29 2022, 5:30 AM
This revision is now accepted and ready to land.Sep 29 2022, 5:30 AM
michal updated this revision to Diff 17187.Sep 29 2022, 6:03 AM

Rebase

Harbormaster completed remote builds in B12525: Diff 17187.Sep 29 2022, 6:14 AM
Closed by commit rCOMMc043108ce2c9: [native] Unify thread settings accessibility (authored by Michal Gniadek <michal.gniadek@swmansion.com>). · Explain WhySep 29 2022, 6:15 AM
This revision was automatically updated to reflect the committed changes.
Michal Gniadek <michal.gniadek@swmansion.com> added a commit: rCOMMc043108ce2c9: [native] Unify thread settings accessibility.

Revision Contents
Changeset List

PathSize
native/
chat/
64 lines
18 lines

Diff 17020

View Options

native/chat/chat.react.js

// @flow // @flow
import { HeaderBackButton as BaseHeaderBackButton } from '@react-navigation/elements'; import { HeaderBackButton as BaseHeaderBackButton } from '@react-navigation/elements';
import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { Text } from 'react-native'; import { Alert, Text } from 'react-native';
import { TouchableOpacity } from 'react-native-gesture-handler'; import { TouchableOpacity } from 'react-native-gesture-handler';
import type { NavigationRoute } from '../navigation/route-names';
import { useColors } from '../themes/colors.js'; import { useColors } from '../themes/colors.js';
type Props = React.ElementConfig<typeof BaseHeaderBackButton>; type ChangeRolesHeaderLeftButtonProps = {
function ChangeRolesHeaderLeftButton(props: Props): React.Node { +route: NavigationRoute<'ChangeRolesScreen'>,
...React.ElementConfig<typeof BaseHeaderBackButton>,
};
function ChangeRolesHeaderLeftButton(
props: ChangeRolesHeaderLeftButtonProps,
): React.Node {
const { memberInfo, role: selectedRole } = props.route.params;
const { role: memberRole } = memberInfo;
const onCancel = React.useCallback(() => {
const { onPress } = props;
invariant(onPress, 'onPress must be defined');
if (selectedRole === memberRole) {
onPress();
return;
}
Alert.alert(
'Unsaved Changes',
'You have unsaved changes, are you sure you want to cancel? You will lose all your progress',
[
{ text: 'Cancel', onPress },
{ text: 'Stay', style: 'cancel' },
],
{ cancelable: true },
);
}, [memberRole, props, selectedRole]);
rohanAuthorUnsubmitted
Done
Inline Actions

I think the wording here may be a bit confusing. In my experience, 'cancel' typically means close the alert, and there's another option like 'confirm' or something that will mean you're ok with discarding changes.

Here it seems like 'cancel' means we're ok with discarding changes. Not sure if it's just me though (cc @ted)

rohan: I think the wording here may be a bit confusing. In my experience, 'cancel' typically means…
ashoatUnsubmitted
Not Done
Inline Actions

What do we do in the current edit-message workflow? Heads-up I generally handle copy, not @ted

ashoat: What do we do in the current edit-message workflow? Heads-up I generally handle copy, not @ted
rohanAuthorUnsubmitted
Done
Inline Actions

Ah my bad. It looks like in message editing: Continue editing closes the alert and continues editing while Discard edit closes the alert and exits editing

rohan: Ah my bad. It looks like in message editing: `Continue editing` closes the alert and continues…
ashoatUnsubmitted
Not Done
Inline Actions
  1. I agree we shouldn't use the term Cancel here... how about Leave?
  2. I don't think we need { cancelable: true }... we can just default to Stay if the user dismisses the Alert
  3. Can we try to match copy for title / description with the edit-message workflow?
ashoat: 1. I agree we shouldn't use the term `Cancel` here... how about `Leave`? 2. I don't think we…
rohanAuthorUnsubmitted
Done
Inline Actions

Yeah that makes sense, I'll update the diff

rohan: Yeah that makes sense, I'll update the diff
const { panelForegroundSecondaryLabel } = useColors(); const { panelForegroundSecondaryLabel } = useColors();
const labelStyle = React.useMemo( const labelStyle = React.useMemo(
() => ({ () => ({
color: panelForegroundSecondaryLabel, color: panelForegroundSecondaryLabel,
marginLeft: 10, marginLeft: 10,
}), }),
[panelForegroundSecondaryLabel], [panelForegroundSecondaryLabel],
); );
return ( return (
<TouchableOpacity onPress={props.onPress}> <TouchableOpacity onPress={onCancel}>
<Text style={labelStyle}>Cancel</Text> <Text style={labelStyle}>Cancel</Text>
</TouchableOpacity> </TouchableOpacity>
); );
} }
export default ChangeRolesHeaderLeftButton; export default ChangeRolesHeaderLeftButton;
View Options

native/chat/message-list-header-title.react.js

// @flow // @flow
import { HeaderBackButton as BaseHeaderBackButton } from '@react-navigation/elements'; import { HeaderBackButton as BaseHeaderBackButton } from '@react-navigation/elements';
import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { Text } from 'react-native'; import { Alert, Text } from 'react-native';
import { TouchableOpacity } from 'react-native-gesture-handler'; import { TouchableOpacity } from 'react-native-gesture-handler';
import type { NavigationRoute } from '../navigation/route-names';
import { useColors } from '../themes/colors.js'; import { useColors } from '../themes/colors.js';
type Props = React.ElementConfig<typeof BaseHeaderBackButton>; type ChangeRolesHeaderLeftButtonProps = {
function ChangeRolesHeaderLeftButton(props: Props): React.Node { +route: NavigationRoute<'ChangeRolesScreen'>,
...React.ElementConfig<typeof BaseHeaderBackButton>,
};
function ChangeRolesHeaderLeftButton(
props: ChangeRolesHeaderLeftButtonProps,
): React.Node {
const { memberInfo, role: selectedRole } = props.route.params;
const { role: memberRole } = memberInfo;
const onCancel = React.useCallback(() => {
const { onPress } = props;
invariant(onPress, 'onPress must be defined');
if (selectedRole === memberRole) {
onPress();
return;
}
Alert.alert(
'Unsaved Changes',
'You have unsaved changes, are you sure you want to cancel? You will lose all your progress',
[
{ text: 'Cancel', onPress },
{ text: 'Stay', style: 'cancel' },
],
{ cancelable: true },
);
}, [memberRole, props, selectedRole]);
rohanAuthorUnsubmitted
Done
Inline Actions

I think the wording here may be a bit confusing. In my experience, 'cancel' typically means close the alert, and there's another option like 'confirm' or something that will mean you're ok with discarding changes.

Here it seems like 'cancel' means we're ok with discarding changes. Not sure if it's just me though (cc @ted)

rohan: I think the wording here may be a bit confusing. In my experience, 'cancel' typically means…
ashoatUnsubmitted
Not Done
Inline Actions

What do we do in the current edit-message workflow? Heads-up I generally handle copy, not @ted

ashoat: What do we do in the current edit-message workflow? Heads-up I generally handle copy, not @ted
rohanAuthorUnsubmitted
Done
Inline Actions

Ah my bad. It looks like in message editing: Continue editing closes the alert and continues editing while Discard edit closes the alert and exits editing

rohan: Ah my bad. It looks like in message editing: `Continue editing` closes the alert and continues…
ashoatUnsubmitted
Not Done
Inline Actions
  1. I agree we shouldn't use the term Cancel here... how about Leave?
  2. I don't think we need { cancelable: true }... we can just default to Stay if the user dismisses the Alert
  3. Can we try to match copy for title / description with the edit-message workflow?
ashoat: 1. I agree we shouldn't use the term `Cancel` here... how about `Leave`? 2. I don't think we…
rohanAuthorUnsubmitted
Done
Inline Actions

Yeah that makes sense, I'll update the diff

rohan: Yeah that makes sense, I'll update the diff
const { panelForegroundSecondaryLabel } = useColors(); const { panelForegroundSecondaryLabel } = useColors();
const labelStyle = React.useMemo( const labelStyle = React.useMemo(
() => ({ () => ({
color: panelForegroundSecondaryLabel, color: panelForegroundSecondaryLabel,
marginLeft: 10, marginLeft: 10,
}), }),
[panelForegroundSecondaryLabel], [panelForegroundSecondaryLabel],
); );
return ( return (
<TouchableOpacity onPress={props.onPress}> <TouchableOpacity onPress={onCancel}>
<Text style={labelStyle}>Cancel</Text> <Text style={labelStyle}>Cancel</Text>
</TouchableOpacity> </TouchableOpacity>
); );
} }
export default ChangeRolesHeaderLeftButton; export default ChangeRolesHeaderLeftButton;