Page MenuHomePhabricator
Differential D8932

[keyserver][lib][native][web] Remove connection field from redux
ClosedPublic
Actions

Authored by inka on Aug 23 2023, 9:01 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 23, 7:09 AM
Unknown Object (File)
Mon, Mar 3, 7:01 PM
Unknown Object (File)
Sat, Mar 1, 3:25 PM
Unknown Object (File)
Sat, Mar 1, 3:25 PM
Unknown Object (File)
Sat, Mar 1, 3:23 PM
Unknown Object (File)
Sat, Mar 1, 3:00 PM
Unknown Object (File)
Wed, Feb 26, 11:43 AM
Unknown Object (File)
Wed, Feb 26, 11:43 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
michal
kamil
Commits
rCOMM00120343a38d: [keyserver][lib][native][web] Remove connection field from redux
Summary

issue: https://linear.app/comm/issue/ENG-4460/refactor-connection-field
Last step is to remove now not used connection filed from top level of redux

Test Plan

ran yarn flow-all. checked that the migration was succesful.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
responders/
18 lines
lib/
reducers/
4 lines
types/
2 lines
native/
redux/
25 lines
1 line
2 lines
web/
redux/
2 lines

Diff 30304

View Options

keyserver/src/responders/website-responders.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { Text } from 'react-native'; import { Text, View, Image, Linking } from 'react-native';
import RegistrationButtonContainer from './registration-button-container.react.js'; import RegistrationButtonContainer from './registration-button-container.react.js';
import RegistrationButton from './registration-button.react.js'; import RegistrationButton from './registration-button.react.js';
import RegistrationContainer from './registration-container.react.js'; import RegistrationContainer from './registration-container.react.js';
import RegistrationContentContainer from './registration-content-container.react.js'; import RegistrationContentContainer from './registration-content-container.react.js';
import { RegistrationContext } from './registration-context.js'; import { RegistrationContext } from './registration-context.js';
import type { RegistrationNavigationProp } from './registration-navigator.react.js'; import type { RegistrationNavigationProp } from './registration-navigator.react.js';
import type { import type {
CoolOrNerdMode, CoolOrNerdMode,
AccountSelection, AccountSelection,
AvatarData, AvatarData,
} from './registration-types.js'; } from './registration-types.js';
import commSwooshSource from '../../img/comm-swoosh.png';
import type { NavigationRoute } from '../../navigation/route-names.js'; import type { NavigationRoute } from '../../navigation/route-names.js';
import { useStyles } from '../../themes/colors.js'; import { useStyles } from '../../themes/colors.js';
export type RegistrationTermsParams = { export type RegistrationTermsParams = {
+userSelections: { +userSelections: {
+coolOrNerdMode: CoolOrNerdMode, +coolOrNerdMode: CoolOrNerdMode,
+keyserverUsername: string, +keyserverUsername: string,
+accountSelection: AccountSelection, +accountSelection: AccountSelection,
+avatarData: ?AvatarData, +avatarData: ?AvatarData,
}, },
}; };
const onTermsOfUsePressed = () => {
Linking.openURL('https://comm.app/terms');
};
const onPrivacyPolicyPressed = () => {
Linking.openURL('https://comm.app/privacy');
};
type Props = { type Props = {
+navigation: RegistrationNavigationProp<'RegistrationTerms'>, +navigation: RegistrationNavigationProp<'RegistrationTerms'>,
+route: NavigationRoute<'RegistrationTerms'>, +route: NavigationRoute<'RegistrationTerms'>,
}; };
function RegistrationTerms(props: Props): React.Node { function RegistrationTerms(props: Props): React.Node {
const registrationContext = React.useContext(RegistrationContext); const registrationContext = React.useContext(RegistrationContext);
invariant(registrationContext, 'registrationContext should be set'); invariant(registrationContext, 'registrationContext should be set');
const { register } = registrationContext; const { register } = registrationContext;
const [registrationInProgress, setRegistrationInProgress] = const [registrationInProgress, setRegistrationInProgress] =
React.useState(false); React.useState(false);
const { userSelections } = props.route.params; const { userSelections } = props.route.params;
const onProceed = React.useCallback(async () => { const onProceed = React.useCallback(async () => {
setRegistrationInProgress(true); setRegistrationInProgress(true);
try { try {
await register(userSelections); await register(userSelections);
} finally { } finally {
setRegistrationInProgress(false); setRegistrationInProgress(false);
} }
}, [register, userSelections]); }, [register, userSelections]);
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
/* eslint-disable react-native/no-raw-text */
const termsNotice = (
<Text style={styles.body}>
By registering, you are agreeing to our{' '}
<Text style={styles.hyperlinkText} onPress={onTermsOfUsePressed}>
Terms of Use
</Text>
{' and '}
<Text style={styles.hyperlinkText} onPress={onPrivacyPolicyPressed}>
Privacy Policy
</Text>
.
</Text>
);
/* eslint-enable react-native/no-raw-text */
return ( return (
<RegistrationContainer> <RegistrationContainer>
<RegistrationContentContainer> <RegistrationContentContainer style={styles.scrollViewContentContainer}>
<Text style={styles.header}>Finish registration</Text> <Text style={styles.header}>Finish registration</Text>
{termsNotice}
<View style={styles.commSwooshContainer}>
<Image source={commSwooshSource} style={styles.commSwoosh} />
</View>
</RegistrationContentContainer> </RegistrationContentContainer>
<RegistrationButtonContainer> <RegistrationButtonContainer>
<RegistrationButton <RegistrationButton
onPress={onProceed} onPress={onProceed}
label="Register" label="Register"
variant={registrationInProgress ? 'loading' : 'enabled'} variant={registrationInProgress ? 'loading' : 'enabled'}
/> />
</RegistrationButtonContainer> </RegistrationButtonContainer>
</RegistrationContainer> </RegistrationContainer>
); );
} }
const unboundStyles = { const unboundStyles = {
scrollViewContentContainer: {
flexGrow: 1,
},
header: { header: {
fontSize: 24, fontSize: 24,
color: 'panelForegroundLabel', color: 'panelForegroundLabel',
paddingBottom: 16, paddingBottom: 16,
}, },
body: {
fontFamily: 'Arial',
fontSize: 15,
lineHeight: 20,
color: 'panelForegroundSecondaryLabel',
paddingBottom: 16,
},
commSwooshContainer: {
flexGrow: 1,
flexShrink: 1,
alignItems: 'center',
justifyContent: 'center',
},
commSwoosh: {
resizeMode: 'center',
width: '100%',
height: '100%',
},
hyperlinkText: {
color: 'purpleLink',
},
}; };
export default RegistrationTerms; export default RegistrationTerms;
View Options

lib/reducers/master-reducer.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { Text } from 'react-native'; import { Text, View, Image, Linking } from 'react-native';
import RegistrationButtonContainer from './registration-button-container.react.js'; import RegistrationButtonContainer from './registration-button-container.react.js';
import RegistrationButton from './registration-button.react.js'; import RegistrationButton from './registration-button.react.js';
import RegistrationContainer from './registration-container.react.js'; import RegistrationContainer from './registration-container.react.js';
import RegistrationContentContainer from './registration-content-container.react.js'; import RegistrationContentContainer from './registration-content-container.react.js';
import { RegistrationContext } from './registration-context.js'; import { RegistrationContext } from './registration-context.js';
import type { RegistrationNavigationProp } from './registration-navigator.react.js'; import type { RegistrationNavigationProp } from './registration-navigator.react.js';
import type { import type {
CoolOrNerdMode, CoolOrNerdMode,
AccountSelection, AccountSelection,
AvatarData, AvatarData,
} from './registration-types.js'; } from './registration-types.js';
import commSwooshSource from '../../img/comm-swoosh.png';
import type { NavigationRoute } from '../../navigation/route-names.js'; import type { NavigationRoute } from '../../navigation/route-names.js';
import { useStyles } from '../../themes/colors.js'; import { useStyles } from '../../themes/colors.js';
export type RegistrationTermsParams = { export type RegistrationTermsParams = {
+userSelections: { +userSelections: {
+coolOrNerdMode: CoolOrNerdMode, +coolOrNerdMode: CoolOrNerdMode,
+keyserverUsername: string, +keyserverUsername: string,
+accountSelection: AccountSelection, +accountSelection: AccountSelection,
+avatarData: ?AvatarData, +avatarData: ?AvatarData,
}, },
}; };
const onTermsOfUsePressed = () => {
Linking.openURL('https://comm.app/terms');
};
const onPrivacyPolicyPressed = () => {
Linking.openURL('https://comm.app/privacy');
};
type Props = { type Props = {
+navigation: RegistrationNavigationProp<'RegistrationTerms'>, +navigation: RegistrationNavigationProp<'RegistrationTerms'>,
+route: NavigationRoute<'RegistrationTerms'>, +route: NavigationRoute<'RegistrationTerms'>,
}; };
function RegistrationTerms(props: Props): React.Node { function RegistrationTerms(props: Props): React.Node {
const registrationContext = React.useContext(RegistrationContext); const registrationContext = React.useContext(RegistrationContext);
invariant(registrationContext, 'registrationContext should be set'); invariant(registrationContext, 'registrationContext should be set');
const { register } = registrationContext; const { register } = registrationContext;
const [registrationInProgress, setRegistrationInProgress] = const [registrationInProgress, setRegistrationInProgress] =
React.useState(false); React.useState(false);
const { userSelections } = props.route.params; const { userSelections } = props.route.params;
const onProceed = React.useCallback(async () => { const onProceed = React.useCallback(async () => {
setRegistrationInProgress(true); setRegistrationInProgress(true);
try { try {
await register(userSelections); await register(userSelections);
} finally { } finally {
setRegistrationInProgress(false); setRegistrationInProgress(false);
} }
}, [register, userSelections]); }, [register, userSelections]);
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
/* eslint-disable react-native/no-raw-text */
const termsNotice = (
<Text style={styles.body}>
By registering, you are agreeing to our{' '}
<Text style={styles.hyperlinkText} onPress={onTermsOfUsePressed}>
Terms of Use
</Text>
{' and '}
<Text style={styles.hyperlinkText} onPress={onPrivacyPolicyPressed}>
Privacy Policy
</Text>
.
</Text>
);
/* eslint-enable react-native/no-raw-text */
return ( return (
<RegistrationContainer> <RegistrationContainer>
<RegistrationContentContainer> <RegistrationContentContainer style={styles.scrollViewContentContainer}>
<Text style={styles.header}>Finish registration</Text> <Text style={styles.header}>Finish registration</Text>
{termsNotice}
<View style={styles.commSwooshContainer}>
<Image source={commSwooshSource} style={styles.commSwoosh} />
</View>
</RegistrationContentContainer> </RegistrationContentContainer>
<RegistrationButtonContainer> <RegistrationButtonContainer>
<RegistrationButton <RegistrationButton
onPress={onProceed} onPress={onProceed}
label="Register" label="Register"
variant={registrationInProgress ? 'loading' : 'enabled'} variant={registrationInProgress ? 'loading' : 'enabled'}
/> />
</RegistrationButtonContainer> </RegistrationButtonContainer>
</RegistrationContainer> </RegistrationContainer>
); );
} }
const unboundStyles = { const unboundStyles = {
scrollViewContentContainer: {
flexGrow: 1,
},
header: { header: {
fontSize: 24, fontSize: 24,
color: 'panelForegroundLabel', color: 'panelForegroundLabel',
paddingBottom: 16, paddingBottom: 16,
}, },
body: {
fontFamily: 'Arial',
fontSize: 15,
lineHeight: 20,
color: 'panelForegroundSecondaryLabel',
paddingBottom: 16,
},
commSwooshContainer: {
flexGrow: 1,
flexShrink: 1,
alignItems: 'center',
justifyContent: 'center',
},
commSwoosh: {
resizeMode: 'center',
width: '100%',
height: '100%',
},
hyperlinkText: {
color: 'purpleLink',
},
}; };
export default RegistrationTerms; export default RegistrationTerms;
View Options

lib/types/redux-types.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { Text } from 'react-native'; import { Text, View, Image, Linking } from 'react-native';
import RegistrationButtonContainer from './registration-button-container.react.js'; import RegistrationButtonContainer from './registration-button-container.react.js';
import RegistrationButton from './registration-button.react.js'; import RegistrationButton from './registration-button.react.js';
import RegistrationContainer from './registration-container.react.js'; import RegistrationContainer from './registration-container.react.js';
import RegistrationContentContainer from './registration-content-container.react.js'; import RegistrationContentContainer from './registration-content-container.react.js';
import { RegistrationContext } from './registration-context.js'; import { RegistrationContext } from './registration-context.js';
import type { RegistrationNavigationProp } from './registration-navigator.react.js'; import type { RegistrationNavigationProp } from './registration-navigator.react.js';
import type { import type {
CoolOrNerdMode, CoolOrNerdMode,
AccountSelection, AccountSelection,
AvatarData, AvatarData,
} from './registration-types.js'; } from './registration-types.js';
import commSwooshSource from '../../img/comm-swoosh.png';
import type { NavigationRoute } from '../../navigation/route-names.js'; import type { NavigationRoute } from '../../navigation/route-names.js';
import { useStyles } from '../../themes/colors.js'; import { useStyles } from '../../themes/colors.js';
export type RegistrationTermsParams = { export type RegistrationTermsParams = {
+userSelections: { +userSelections: {
+coolOrNerdMode: CoolOrNerdMode, +coolOrNerdMode: CoolOrNerdMode,
+keyserverUsername: string, +keyserverUsername: string,
+accountSelection: AccountSelection, +accountSelection: AccountSelection,
+avatarData: ?AvatarData, +avatarData: ?AvatarData,
}, },
}; };
const onTermsOfUsePressed = () => {
Linking.openURL('https://comm.app/terms');
};
const onPrivacyPolicyPressed = () => {
Linking.openURL('https://comm.app/privacy');
};
type Props = { type Props = {
+navigation: RegistrationNavigationProp<'RegistrationTerms'>, +navigation: RegistrationNavigationProp<'RegistrationTerms'>,
+route: NavigationRoute<'RegistrationTerms'>, +route: NavigationRoute<'RegistrationTerms'>,
}; };
function RegistrationTerms(props: Props): React.Node { function RegistrationTerms(props: Props): React.Node {
const registrationContext = React.useContext(RegistrationContext); const registrationContext = React.useContext(RegistrationContext);
invariant(registrationContext, 'registrationContext should be set'); invariant(registrationContext, 'registrationContext should be set');
const { register } = registrationContext; const { register } = registrationContext;
const [registrationInProgress, setRegistrationInProgress] = const [registrationInProgress, setRegistrationInProgress] =
React.useState(false); React.useState(false);
const { userSelections } = props.route.params; const { userSelections } = props.route.params;
const onProceed = React.useCallback(async () => { const onProceed = React.useCallback(async () => {
setRegistrationInProgress(true); setRegistrationInProgress(true);
try { try {
await register(userSelections); await register(userSelections);
} finally { } finally {
setRegistrationInProgress(false); setRegistrationInProgress(false);
} }
}, [register, userSelections]); }, [register, userSelections]);
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
/* eslint-disable react-native/no-raw-text */
const termsNotice = (
<Text style={styles.body}>
By registering, you are agreeing to our{' '}
<Text style={styles.hyperlinkText} onPress={onTermsOfUsePressed}>
Terms of Use
</Text>
{' and '}
<Text style={styles.hyperlinkText} onPress={onPrivacyPolicyPressed}>
Privacy Policy
</Text>
.
</Text>
);
/* eslint-enable react-native/no-raw-text */
return ( return (
<RegistrationContainer> <RegistrationContainer>
<RegistrationContentContainer> <RegistrationContentContainer style={styles.scrollViewContentContainer}>
<Text style={styles.header}>Finish registration</Text> <Text style={styles.header}>Finish registration</Text>
{termsNotice}
<View style={styles.commSwooshContainer}>
<Image source={commSwooshSource} style={styles.commSwoosh} />
</View>
</RegistrationContentContainer> </RegistrationContentContainer>
<RegistrationButtonContainer> <RegistrationButtonContainer>
<RegistrationButton <RegistrationButton
onPress={onProceed} onPress={onProceed}
label="Register" label="Register"
variant={registrationInProgress ? 'loading' : 'enabled'} variant={registrationInProgress ? 'loading' : 'enabled'}
/> />
</RegistrationButtonContainer> </RegistrationButtonContainer>
</RegistrationContainer> </RegistrationContainer>
); );
} }
const unboundStyles = { const unboundStyles = {
scrollViewContentContainer: {
flexGrow: 1,
},
header: { header: {
fontSize: 24, fontSize: 24,
color: 'panelForegroundLabel', color: 'panelForegroundLabel',
paddingBottom: 16, paddingBottom: 16,
}, },
body: {
fontFamily: 'Arial',
fontSize: 15,
lineHeight: 20,
color: 'panelForegroundSecondaryLabel',
paddingBottom: 16,
},
commSwooshContainer: {
flexGrow: 1,
flexShrink: 1,
alignItems: 'center',
justifyContent: 'center',
},
commSwoosh: {
resizeMode: 'center',
width: '100%',
height: '100%',
},
hyperlinkText: {
color: 'purpleLink',
},
}; };
export default RegistrationTerms; export default RegistrationTerms;
View Options

native/redux/persist.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { Text } from 'react-native'; import { Text, View, Image, Linking } from 'react-native';
import RegistrationButtonContainer from './registration-button-container.react.js'; import RegistrationButtonContainer from './registration-button-container.react.js';
import RegistrationButton from './registration-button.react.js'; import RegistrationButton from './registration-button.react.js';
import RegistrationContainer from './registration-container.react.js'; import RegistrationContainer from './registration-container.react.js';
import RegistrationContentContainer from './registration-content-container.react.js'; import RegistrationContentContainer from './registration-content-container.react.js';
import { RegistrationContext } from './registration-context.js'; import { RegistrationContext } from './registration-context.js';
import type { RegistrationNavigationProp } from './registration-navigator.react.js'; import type { RegistrationNavigationProp } from './registration-navigator.react.js';
import type { import type {
CoolOrNerdMode, CoolOrNerdMode,
AccountSelection, AccountSelection,
AvatarData, AvatarData,
} from './registration-types.js'; } from './registration-types.js';
import commSwooshSource from '../../img/comm-swoosh.png';
import type { NavigationRoute } from '../../navigation/route-names.js'; import type { NavigationRoute } from '../../navigation/route-names.js';
import { useStyles } from '../../themes/colors.js'; import { useStyles } from '../../themes/colors.js';
export type RegistrationTermsParams = { export type RegistrationTermsParams = {
+userSelections: { +userSelections: {
+coolOrNerdMode: CoolOrNerdMode, +coolOrNerdMode: CoolOrNerdMode,
+keyserverUsername: string, +keyserverUsername: string,
+accountSelection: AccountSelection, +accountSelection: AccountSelection,
+avatarData: ?AvatarData, +avatarData: ?AvatarData,
}, },
}; };
const onTermsOfUsePressed = () => {
Linking.openURL('https://comm.app/terms');
};
const onPrivacyPolicyPressed = () => {
Linking.openURL('https://comm.app/privacy');
};
type Props = { type Props = {
+navigation: RegistrationNavigationProp<'RegistrationTerms'>, +navigation: RegistrationNavigationProp<'RegistrationTerms'>,
+route: NavigationRoute<'RegistrationTerms'>, +route: NavigationRoute<'RegistrationTerms'>,
}; };
function RegistrationTerms(props: Props): React.Node { function RegistrationTerms(props: Props): React.Node {
const registrationContext = React.useContext(RegistrationContext); const registrationContext = React.useContext(RegistrationContext);
invariant(registrationContext, 'registrationContext should be set'); invariant(registrationContext, 'registrationContext should be set');
const { register } = registrationContext; const { register } = registrationContext;
const [registrationInProgress, setRegistrationInProgress] = const [registrationInProgress, setRegistrationInProgress] =
React.useState(false); React.useState(false);
const { userSelections } = props.route.params; const { userSelections } = props.route.params;
const onProceed = React.useCallback(async () => { const onProceed = React.useCallback(async () => {
setRegistrationInProgress(true); setRegistrationInProgress(true);
try { try {
await register(userSelections); await register(userSelections);
} finally { } finally {
setRegistrationInProgress(false); setRegistrationInProgress(false);
} }
}, [register, userSelections]); }, [register, userSelections]);
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
/* eslint-disable react-native/no-raw-text */
const termsNotice = (
<Text style={styles.body}>
By registering, you are agreeing to our{' '}
<Text style={styles.hyperlinkText} onPress={onTermsOfUsePressed}>
Terms of Use
</Text>
{' and '}
<Text style={styles.hyperlinkText} onPress={onPrivacyPolicyPressed}>
Privacy Policy
</Text>
.
</Text>
);
/* eslint-enable react-native/no-raw-text */
return ( return (
<RegistrationContainer> <RegistrationContainer>
<RegistrationContentContainer> <RegistrationContentContainer style={styles.scrollViewContentContainer}>
<Text style={styles.header}>Finish registration</Text> <Text style={styles.header}>Finish registration</Text>
{termsNotice}
<View style={styles.commSwooshContainer}>
<Image source={commSwooshSource} style={styles.commSwoosh} />
</View>
</RegistrationContentContainer> </RegistrationContentContainer>
<RegistrationButtonContainer> <RegistrationButtonContainer>
<RegistrationButton <RegistrationButton
onPress={onProceed} onPress={onProceed}
label="Register" label="Register"
variant={registrationInProgress ? 'loading' : 'enabled'} variant={registrationInProgress ? 'loading' : 'enabled'}
/> />
</RegistrationButtonContainer> </RegistrationButtonContainer>
</RegistrationContainer> </RegistrationContainer>
); );
} }
const unboundStyles = { const unboundStyles = {
scrollViewContentContainer: {
flexGrow: 1,
},
header: { header: {
fontSize: 24, fontSize: 24,
color: 'panelForegroundLabel', color: 'panelForegroundLabel',
paddingBottom: 16, paddingBottom: 16,
}, },
body: {
fontFamily: 'Arial',
fontSize: 15,
lineHeight: 20,
color: 'panelForegroundSecondaryLabel',
paddingBottom: 16,
},
commSwooshContainer: {
flexGrow: 1,
flexShrink: 1,
alignItems: 'center',
justifyContent: 'center',
},
commSwoosh: {
resizeMode: 'center',
width: '100%',
height: '100%',
},
hyperlinkText: {
color: 'purpleLink',
},
}; };
export default RegistrationTerms; export default RegistrationTerms;
View Options

native/redux/redux-setup.js

Loading...
View Options

native/redux/state-types.js

Loading...
View Options

web/redux/redux-setup.js

Loading...