diff --git a/src/components/Lists/Proxiwash/ProxiwashListItem.tsx b/src/components/Lists/Proxiwash/ProxiwashListItem.tsx index 2317805..9882333 100644 --- a/src/components/Lists/Proxiwash/ProxiwashListItem.tsx +++ b/src/components/Lists/Proxiwash/ProxiwashListItem.tsx @@ -71,7 +71,7 @@ const styles = StyleSheet.create({ * Component used to display a proxiwash item, showing machine progression and state */ class ProxiwashListItem extends React.Component { - static stateStrings: {[key in MachineStates]: string} = { + stateStrings: {[key in MachineStates]: string} = { [MachineStates.AVAILABLE]: i18n.t('screens.proxiwash.states.ready'), [MachineStates.RUNNING]: i18n.t('screens.proxiwash.states.running'), [MachineStates.RUNNING_NOT_STARTED]: i18n.t( @@ -146,7 +146,7 @@ class ProxiwashListItem extends React.Component { ? `${props.item.startTime}/${props.item.endTime}` : ''; const stateIcon = ProxiwashConstants.stateIcons[machineState]; - const stateString = ProxiwashListItem.stateStrings[machineState]; + const stateString = this.stateStrings[machineState]; let progress; if (isRunning && props.item.donePercent !== '') { progress = parseFloat(props.item.donePercent) / 100; diff --git a/src/screens/About/AboutScreen.tsx b/src/screens/About/AboutScreen.tsx index 22437df..6549ae5 100644 --- a/src/screens/About/AboutScreen.tsx +++ b/src/screens/About/AboutScreen.tsx @@ -84,7 +84,7 @@ class AboutScreen extends React.Component { /** * Object containing data relative to major contributors */ - static majorContributors: {[key: string]: MemberItemType} = { + majorContributors: {[key: string]: MemberItemType} = { arnaud: { name: 'Arnaud Vergnet', message: i18n.t('screens.about.user.arnaud'), @@ -115,7 +115,7 @@ class AboutScreen extends React.Component { /** * Object containing data relative to users who helped during development */ - static helpfulUsers: {[key: string]: MemberItemType} = { + helpfulUsers: {[key: string]: MemberItemType} = { beranger: { name: 'Béranger Quintana Y Arciosana', message: i18n.t('screens.about.user.beranger'), @@ -199,18 +199,18 @@ class AboutScreen extends React.Component { teamData: Array = [ { onPressCallback: () => { - this.onContributorListItemPress(AboutScreen.majorContributors.arnaud); + this.onContributorListItemPress(this.majorContributors.arnaud); }, - icon: AboutScreen.majorContributors.arnaud.icon, - text: AboutScreen.majorContributors.arnaud.name, + icon: this.majorContributors.arnaud.icon, + text: this.majorContributors.arnaud.name, showChevron: false, }, { onPressCallback: () => { - this.onContributorListItemPress(AboutScreen.majorContributors.yohan); + this.onContributorListItemPress(this.majorContributors.yohan); }, - icon: AboutScreen.majorContributors.yohan.icon, - text: AboutScreen.majorContributors.yohan.name, + icon: this.majorContributors.yohan.icon, + text: this.majorContributors.yohan.name, showChevron: false, }, { @@ -230,42 +230,42 @@ class AboutScreen extends React.Component { thanksData: Array = [ { onPressCallback: () => { - this.onContributorListItemPress(AboutScreen.helpfulUsers.beranger); + this.onContributorListItemPress(this.helpfulUsers.beranger); }, - icon: AboutScreen.helpfulUsers.beranger.icon, - text: AboutScreen.helpfulUsers.beranger.name, + icon: this.helpfulUsers.beranger.icon, + text: this.helpfulUsers.beranger.name, showChevron: false, }, { onPressCallback: () => { - this.onContributorListItemPress(AboutScreen.helpfulUsers.celine); + this.onContributorListItemPress(this.helpfulUsers.celine); }, - icon: AboutScreen.helpfulUsers.celine.icon, - text: AboutScreen.helpfulUsers.celine.name, + icon: this.helpfulUsers.celine.icon, + text: this.helpfulUsers.celine.name, showChevron: false, }, { onPressCallback: () => { - this.onContributorListItemPress(AboutScreen.helpfulUsers.damien); + this.onContributorListItemPress(this.helpfulUsers.damien); }, - icon: AboutScreen.helpfulUsers.damien.icon, - text: AboutScreen.helpfulUsers.damien.name, + icon: this.helpfulUsers.damien.icon, + text: this.helpfulUsers.damien.name, showChevron: false, }, { onPressCallback: () => { - this.onContributorListItemPress(AboutScreen.helpfulUsers.titouan); + this.onContributorListItemPress(this.helpfulUsers.titouan); }, - icon: AboutScreen.helpfulUsers.titouan.icon, - text: AboutScreen.helpfulUsers.titouan.name, + icon: this.helpfulUsers.titouan.icon, + text: this.helpfulUsers.titouan.name, showChevron: false, }, { onPressCallback: () => { - this.onContributorListItemPress(AboutScreen.helpfulUsers.theo); + this.onContributorListItemPress(this.helpfulUsers.theo); }, - icon: AboutScreen.helpfulUsers.theo.icon, - text: AboutScreen.helpfulUsers.theo.name, + icon: this.helpfulUsers.theo.icon, + text: this.helpfulUsers.theo.name, showChevron: false, }, ]; diff --git a/src/screens/Proxiwash/ProxiwashScreen.tsx b/src/screens/Proxiwash/ProxiwashScreen.tsx index fd35027..38a5f70 100644 --- a/src/screens/Proxiwash/ProxiwashScreen.tsx +++ b/src/screens/Proxiwash/ProxiwashScreen.tsx @@ -86,7 +86,7 @@ class ProxiwashScreen extends React.Component { ); } - static modalStateStrings: {[key in MachineStates]: string} = { + modalStateStrings: {[key in MachineStates]: string} = { [MachineStates.AVAILABLE]: i18n.t('screens.proxiwash.modal.ready'), [MachineStates.RUNNING]: i18n.t('screens.proxiwash.modal.running'), [MachineStates.RUNNING_NOT_STARTED]: i18n.t( @@ -205,7 +205,7 @@ class ProxiwashScreen extends React.Component { icon: '', onPress: () => undefined, }; - let message = ProxiwashScreen.modalStateStrings[item.state]; + let message = this.modalStateStrings[item.state]; const onPress = () => this.onSetupNotificationsPress(item); if (item.state === MachineStates.RUNNING) { let remainingTime = parseInt(item.remainingTime, 10);