toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Allow post option modal to close before opening app modal (#5383)

Browse source 
* Allow post option modal to close before opening app modal

* lint

* revert commits

25ea111d9ab1441094de2b27e1af18a22d863a33 and c0d9e2128610eb02123ccd7362597fd0499d11be

* wait for post options to close before kicking off request
This commit is contained in:
Michael Kochell 2021-05-11 12:32:49 -04:00 committed by GitHub
parent 71e0150d27
commit 7227675320
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
app/screens/post_options/bindings/bindings.tsx
View file

@ -22,7 +22,7 @@ type Props = {
post: Post,
currentUser: UserProfile,
teamID: string,
closeWithAnimation: () => void,
closeWithAnimation: (cb?: () => void) => void,
appsEnabled: boolean,
intl: typeof intlShape,
actions: {
@ -69,7 +69,7 @@ type OptionProps = {
post: Post,
currentUser: UserProfile,
teamID: string,
closeWithAnimation: () => void,
closeWithAnimation: (cb?: () => void) => void,
intl: typeof intlShape,
actions: {
doAppCall: DoAppCall;
@ -101,46 +101,48 @@ class Option extends React.PureComponent<OptionProps> {
},
);
closeWithAnimation();
const res = await doAppCall(call, AppCallTypes.SUBMIT, intl);
if (res.error) {
const errorResponse = res.error;
const title = intl.formatMessage({
id: 'mobile.general.error.title',
defaultMessage: 'Error',
});
const errorMessage = errorResponse.error || intl.formatMessage({
id: 'apps.error.unknown',
defaultMessage: 'Unknown error occurred.',
});
Alert.alert(title, errorMessage);
return;
}
const callResp = (res as {data: AppCallResponse}).data;
switch (callResp.type) {
case AppCallResponseTypes.OK:
if (callResp.markdown) {
postEphemeralCallResponseForPost(callResp, callResp.markdown, post);
closeWithAnimation(async () => {
const callPromise = doAppCall(call, AppCallTypes.SUBMIT, intl);
const res = await callPromise;
if (res.error) {
const errorResponse = res.error;
const title = intl.formatMessage({
id: 'mobile.general.error.title',
defaultMessage: 'Error',
});
const errorMessage = errorResponse.error || intl.formatMessage({
id: 'apps.error.unknown',
defaultMessage: 'Unknown error occurred.',
});
Alert.alert(title, errorMessage);
return;
}
break;
case AppCallResponseTypes.NAVIGATE:
case AppCallResponseTypes.FORM:
break;
default: {
const title = intl.formatMessage({
id: 'mobile.general.error.title',
defaultMessage: 'Error',
});
const errMessage = intl.formatMessage({
id: 'apps.error.responses.unknown_type',
defaultMessage: 'App response type not supported. Response type: {type}.',
}, {
type: callResp.type,
});
Alert.alert(title, errMessage);
}
}
const callResp = (res as {data: AppCallResponse}).data;
switch (callResp.type) {
case AppCallResponseTypes.OK:
if (callResp.markdown) {
postEphemeralCallResponseForPost(callResp, callResp.markdown, post);
}
break;
case AppCallResponseTypes.NAVIGATE:
case AppCallResponseTypes.FORM:
break;
default: {
const title = intl.formatMessage({
id: 'mobile.general.error.title',
defaultMessage: 'Error',
});
const errMessage = intl.formatMessage({
id: 'apps.error.responses.unknown_type',
defaultMessage: 'App response type not supported. Response type: {type}.',
}, {
type: callResp.type,
});
Alert.alert(title, errMessage);
}
}
});
};
render() {