diff --git a/app/containers/FormContainer.tsx b/app/containers/FormContainer.tsx
index 522bf489e..46522508b 100644
--- a/app/containers/FormContainer.tsx
+++ b/app/containers/FormContainer.tsx
@@ -22,11 +22,11 @@ const styles = StyleSheet.create({
}
});
-export const FormContainerInner = ({ children }: { children: JSX.Element }) => (
+export const FormContainerInner = ({ children }: { children: React.ReactNode }): JSX.Element => (
{children}
);
-const FormContainer = ({ children, theme, testID, ...props }: IFormContainer) => (
+const FormContainer = ({ children, theme, testID, ...props }: IFormContainer): JSX.Element => (
// @ts-ignore
url && url.replace(/http(s?):\/\//, '').slice(0, 1);
+const getInitial = (url: string) => url && url.replace(/http(s?):\/\//, '').slice(0, 1);
-const Fallback = ({ theme, initial }) => (
+interface IFallback {
+ theme: string;
+ initial: string;
+}
+const Fallback = ({ theme, initial }: IFallback) => (
{initial}
);
-const ServerAvatar = React.memo(({ theme, url, image }) => (
+interface IServerAvatar {
+ theme: string;
+ url: string;
+ image: string;
+}
+const ServerAvatar = React.memo(({ theme, url, image }: IServerAvatar) => (
{image && (
(
));
-ServerAvatar.propTypes = {
- theme: PropTypes.string,
- url: PropTypes.string,
- image: PropTypes.string
-};
ServerAvatar.displayName = 'ServerAvatar';
-Fallback.propTypes = {
- theme: PropTypes.string,
- initial: PropTypes.string
-};
-
export default ServerAvatar;
diff --git a/app/views/WorkspaceView/index.js b/app/views/WorkspaceView/index.tsx
similarity index 81%
rename from app/views/WorkspaceView/index.js
rename to app/views/WorkspaceView/index.tsx
index dbd1c69e0..68ac5157b 100644
--- a/app/views/WorkspaceView/index.js
+++ b/app/views/WorkspaceView/index.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { Text, View } from 'react-native';
-import PropTypes from 'prop-types';
+import { StackNavigationProp, StackNavigationOptions } from '@react-navigation/stack';
import { connect } from 'react-redux';
import I18n from '../../i18n';
@@ -12,23 +12,27 @@ import { getShowLoginButton } from '../../selectors/login';
import ServerAvatar from './ServerAvatar';
import styles from './styles';
-class WorkspaceView extends React.Component {
- static navigationOptions = () => ({
- title: I18n.t('Your_workspace')
- });
+interface IWorkSpaceProp {
+ // TODO: waiting for the RootStackParamList https://reactnavigation.org/docs/typescript/#type-checking-screens
+ navigation: StackNavigationProp;
+ theme: string;
+ Site_Name: string;
+ Site_Url: string;
+ server: string;
+ Assets_favicon_512: {
+ url?: string;
+ defaultUrl: string;
+ };
+ registrationForm: string;
+ registrationText: string;
+ showLoginButton: boolean;
+ Accounts_iframe_enabled: boolean;
+ inviteLinkToken: string;
+}
- static propTypes = {
- navigation: PropTypes.object,
- theme: PropTypes.string,
- Site_Name: PropTypes.string,
- Site_Url: PropTypes.string,
- server: PropTypes.string,
- Assets_favicon_512: PropTypes.object,
- registrationForm: PropTypes.string,
- registrationText: PropTypes.string,
- showLoginButton: PropTypes.bool,
- Accounts_iframe_enabled: PropTypes.bool,
- inviteLinkToken: PropTypes.string
+class WorkspaceView extends React.Component {
+ static navigationOptions: StackNavigationOptions = {
+ title: I18n.t('Your_workspace')
};
get showRegistrationButton() {
@@ -94,7 +98,7 @@ class WorkspaceView extends React.Component {
}
}
-const mapStateToProps = state => ({
+const mapStateToProps = (state: any) => ({
server: state.server.server,
Site_Name: state.settings.Site_Name,
Site_Url: state.settings.Site_Url,
diff --git a/app/views/WorkspaceView/styles.js b/app/views/WorkspaceView/styles.ts
similarity index 100%
rename from app/views/WorkspaceView/styles.js
rename to app/views/WorkspaceView/styles.ts