This commit is contained in:
jessop 2019-12-11 15:27:03 -05:00 committed by Sean Yesmunt
parent db9a2152fa
commit a3a56e7f89
3 changed files with 7 additions and 2 deletions

View file

@ -926,6 +926,8 @@
"Unable to load your saved preferences.": "Unable to load your saved preferences.", "Unable to load your saved preferences.": "Unable to load your saved preferences.",
"Add/Delete": "Add/Delete", "Add/Delete": "Add/Delete",
"The wallet server took a bit too long. Resetting defaults just in case.": "The wallet server took a bit too long. Resetting defaults just in case.", "The wallet server took a bit too long. Resetting defaults just in case.": "The wallet server took a bit too long. Resetting defaults just in case.",
"The wallet server took a bit too long. Resetting defaults just in case. Restart the App and SDK if this continues.": "The wallet server took a bit too long. Resetting defaults just in case. Restart the App and SDK if this continues.",
"The wallet server took a bit too long. Resetting defaults just in case.": "The wallet server took a bit too long. Resetting defaults just in case.",
"PDF opened externally. %click_here% to open it again.": "PDF opened externally. %click_here% to open it again.", "PDF opened externally. %click_here% to open it again.": "PDF opened externally. %click_here% to open it again.",
"%numberOfMonthsSincePublish% years ago": "%numberOfMonthsSincePublish% years ago", "%numberOfMonthsSincePublish% years ago": "%numberOfMonthsSincePublish% years ago",
"%numberOfYearsSincePublish% years ago": "%numberOfYearsSincePublish% years ago", "%numberOfYearsSincePublish% years ago": "%numberOfYearsSincePublish% years ago",

View file

@ -129,9 +129,9 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
}); });
} else if (this.state.waitingForWallet > MAX_WALLET_WAIT && launchedModal === false && !modal) { } else if (this.state.waitingForWallet > MAX_WALLET_WAIT && launchedModal === false && !modal) {
clearWalletServers(); clearWalletServers();
doShowSnackBar(__('The wallet server took a bit too long. Resetting defaults just in case.')) doShowSnackBar(__('The wallet server took a bit too long. Resetting defaults just in case. Restart the App and SDK if this continues.'));
this.setState({waitingForWallet: 0}); this.setState({waitingForWallet: 0});
this.updateStatusCallback(status) this.updateStatusCallback(status);
} else { } else {
this.updateStatusCallback(status); this.updateStatusCallback(status);
} }

View file

@ -289,10 +289,13 @@ function AppWrapper() {
</ErrorBoundary> </ErrorBoundary>
</ConnectedRouter> </ConnectedRouter>
) : ( ) : (
<Fragment>
<SplashScreen <SplashScreen
authenticate={() => app.store.dispatch(doAuthenticate(pjson.version))} authenticate={() => app.store.dispatch(doAuthenticate(pjson.version))}
onReadyToLaunch={() => setReadyToLaunch(true)} onReadyToLaunch={() => setReadyToLaunch(true)}
/> />
<SnackBar />
</Fragment>
)} )}
</Fragment> </Fragment>
</PersistGate> </PersistGate>