Compare commits

..

No commits in common. "09ed0058aef3e6ab3700bbb6a8c484f5d073f431" and "faac5688f8089c958e95187db50bf25e7d1051e4" have entirely different histories.

3 changed files with 6 additions and 8 deletions

View file

@ -475,8 +475,8 @@
"loading": "Chargement...",
"retry": "Réessayer",
"networkError": "Impossible de contacter les serveurs. Assure-toi d'être connecté à Internet.",
"goBack": "Précédent",
"goForward": "Suivant",
"goBack": "Suivant",
"goForward": "Précédent",
"openInBrowser": "Ouvrir dans le navigateur",
"notAvailable": "Non disponible",
"listUpdateFail": "Erreur lors de la mise à jour de la liste"

View file

@ -66,8 +66,6 @@ class WebViewScreen extends React.PureComponent<PropsType> {
customPaddingFunction: null,
};
currentUrl: string;
webviewRef: {current: null | WebView};
canGoBack: boolean;
@ -76,7 +74,6 @@ class WebViewScreen extends React.PureComponent<PropsType> {
super(props);
this.webviewRef = React.createRef();
this.canGoBack = false;
this.currentUrl = props.url;
}
/**
@ -225,7 +222,8 @@ class WebViewScreen extends React.PureComponent<PropsType> {
};
onOpenClicked = () => {
Linking.openURL(this.currentUrl);
const {url} = this.props;
Linking.openURL(url);
};
onScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
@ -263,8 +261,7 @@ class WebViewScreen extends React.PureComponent<PropsType> {
onRefresh={this.onRefreshClicked}
/>
)}
onNavigationStateChange={(navState) => {
this.currentUrl = navState.url;
onNavigationStateChange={(navState: {canGoBack: boolean}) => {
this.canGoBack = navState.canGoBack;
}}
onMessage={props.onMessage}

View file

@ -61,6 +61,7 @@ function EquipmentConfirmScreen(props: Props) {
date: getRelativeDateString(start),
});
}
console.log(buttonText);
return (
<CollapsibleScrollView>
<Card style={{margin: 5}}>