From 21a6fcee87c6982d925bf07cd2bc6b77de391117 Mon Sep 17 00:00:00 2001 From: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com> Date: Mon, 2 May 2022 22:13:03 -0300 Subject: [PATCH] Chore: Evaluate SelectServerView - TypeScript (#4118) --- app/views/SelectServerView.tsx | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/app/views/SelectServerView.tsx b/app/views/SelectServerView.tsx index 4040e7f27..de73b4bc4 100644 --- a/app/views/SelectServerView.tsx +++ b/app/views/SelectServerView.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { FlatList } from 'react-native'; import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack'; import { connect } from 'react-redux'; -import { Q, Model } from '@nozbe/watermelondb'; +import { Q } from '@nozbe/watermelondb'; import I18n from '../i18n'; import StatusBar from '../containers/StatusBar'; @@ -12,23 +12,18 @@ import database from '../lib/database'; import SafeAreaView from '../containers/SafeAreaView'; import * as List from '../containers/List'; import { ShareInsideStackParamList } from '../definitions/navigationTypes'; +import { IApplicationState, TServerModel } from '../definitions'; const getItemLayout = (data: any, index: number) => ({ length: ROW_HEIGHT, offset: ROW_HEIGHT * index, index }); -const keyExtractor = (item: IServer) => item.id; - -interface IServer extends Model { - id: string; - iconURL: string; - name: string; -} +const keyExtractor = (item: TServerModel) => item.id; interface ISelectServerViewState { - servers: IServer[]; + servers: TServerModel[]; } interface ISelectServerViewProps { navigation: StackNavigationProp; - server: string; + server?: string; } class SelectServerView extends React.Component { @@ -36,12 +31,12 @@ class SelectServerView extends React.Component { + renderItem = ({ item }: { item: TServerModel }) => { const { server } = this.props; return this.select(item.id)} item={item} hasCheck={item.id === server} />; }; @@ -81,7 +76,7 @@ class SelectServerView extends React.Component ({ +const mapStateToProps = ({ share }: IApplicationState) => ({ server: share.server.server });