Merge branch 'master' into sagas

AmirAbrams · web-flow · commit 722a64bb56ac · 2020-10-20T01:42:02.000-05:00
diff --git a/web/src/components/MainFrame.tsx b/web/src/components/MainFrame.tsx
@@ -33,7 +33,7 @@ export class MainFrame extends Component<MainFrameProps, MainFrameState> {
     this.currentPage = props.currentPage ? props.currentPage : "home";
     // bind events
     this.componentDidMount = this.componentDidMount.bind(this);
-    this.componentWillUnmount = this.componentWillUnmount.bind(this);
+    this.componentDidUnmount = this.componentDidUnmount.bind(this);
     this.changePage = this.changePage.bind(this);
   }
 
@@ -46,7 +46,7 @@ export class MainFrame extends Component<MainFrameProps, MainFrameState> {
     });
   }
 
-  componentWillUnmount(): void {}
+  componentDidUnmount(): void {}
 
   private changePage(pageName: string): void {
     this.currentPage = pageName;
diff --git a/web/src/components/Settings.tsx b/web/src/components/Settings.tsx
@@ -28,7 +28,7 @@ export class Settings extends Component<SettingsProps, SettingsState> {
     super(props);
     // bind events
     this.componentDidMount = this.componentDidMount.bind(this);
-    this.componentWillUnmount = this.componentWillUnmount.bind(this);
+    this.componentDidUnmount = this.componentDidUnmount.bind(this);
     this.getConfigSettings = this.getConfigSettings.bind(this);
     this.updateIceConfig = this.updateIceConfig.bind(this);
     this.updateWebServerConfig = this.updateWebServerConfig.bind(this);
@@ -39,7 +39,7 @@ export class Settings extends Component<SettingsProps, SettingsState> {
     this.getConfigSettings();
   }
 
-  componentWillUnmount(): void {}
+  componentDidUnmount(): void {}
 
   private getConfigSettings = () => {
     GetConfigSettings().then((data) => {
diff --git a/web/src/components/SetupWizard.tsx b/web/src/components/SetupWizard.tsx
@@ -17,14 +17,14 @@ export class SetupWizard extends Component<SetupWizardProps, SetupWizardState> {
     super(props);
     // bind events
     this.componentDidMount = this.componentDidMount.bind(this);
-    this.componentWillUnmount = this.componentWillUnmount.bind(this);
+    this.componentDidUnmount = this.componentDidUnmount.bind(this);
   }
 
   componentDidMount(): void {
     this.setState({ currentStep: this.props.currentStep });
   }
 
-  componentWillUnmount(): void {}
+  componentDidUnmount(): void {}
 
   render() {
     return (
diff --git a/web/src/components/TerminalPage.tsx b/web/src/components/TerminalPage.tsx
@@ -18,13 +18,14 @@ export class TerminalPage extends Component<TerminalProps, TerminalState> {
 
     // bind events
     this.componentDidMount = this.componentDidMount.bind(this);
+    this.componentDidUnmount = this.componentDidUnmount.bind(this);
   }
 
   componentDidMount(): void {
     this.setState({ mode: this.props.mode });
   }
 
-  componentWillUnmount(): void {}
+  componentDidUnmount(): void {}
 
   render() {
     return (
diff --git a/web/src/components/wallet/FileRestore.tsx b/web/src/components/wallet/FileRestore.tsx
@@ -34,7 +34,7 @@ export class WalletFileRestore extends Component<
     super(props);
     // bind events
     this.componentDidMount = this.componentDidMount.bind(this);
-    this.componentWillUnmount = this.componentWillUnmount.bind(this);
+    this.componentDidUnmount = this.componentDidUnmount.bind(this);
     this.filesSelectedHandler = this.filesSelectedHandler.bind(this);
     this.loadSecureFileData = this.loadSecureFileData.bind(this);
     this.onMnemonic = this.onMnemonic.bind(this);
@@ -48,7 +48,7 @@ export class WalletFileRestore extends Component<
     this.setState({ fileContents: undefined });
   }
 
-  componentWillUnmount(): void {}
+  componentDidUnmount(): void {}
 
   private loadSecureFileData = (file: FilePathInfo, reader?: FileReader) => {
     if (reader) {
diff --git a/web/src/components/wallet/MnemonicBackup.tsx b/web/src/components/wallet/MnemonicBackup.tsx
@@ -25,7 +25,7 @@ export class MnemonicBackup extends Component<
     super(props);
     // bind events
     this.componentDidMount = this.componentDidMount.bind(this);
-    this.componentWillUnmount = this.componentWillUnmount.bind(this);
+    this.componentDidUnmount = this.componentDidUnmount.bind(this);
     this.handleFileCreation = this.handleFileCreation.bind(this);
     this.getMnemonic = this.getMnemonic.bind(this);
   }
@@ -34,7 +34,7 @@ export class MnemonicBackup extends Component<
     this.getMnemonic();
   }
 
-  componentWillUnmount(): void {}
+  componentDidUnmount(): void {}
 
   handleFileCreation = (e: FormEvent) => {
     //if we don't prevent form submission, causes a browser reload
diff --git a/web/src/components/wallet/MnemonicRestore.tsx b/web/src/components/wallet/MnemonicRestore.tsx
@@ -27,13 +27,13 @@ export class WalletMnemonicRestore extends Component<
     super(props);
     // bind events
     this.componentDidMount = this.componentDidMount.bind(this);
-    this.componentWillUnmount = this.componentWillUnmount.bind(this);
+    this.componentDidUnmount = this.componentDidUnmount.bind(this);
     this.setMnemonic = this.setMnemonic.bind(this);
   }
 
   componentDidMount(): void {}
 
-  componentWillUnmount(): void {}
+  componentDidUnmount(): void {}
 
   private setMnemonic(words: string): void {
     this.setState({ mnemonic: words });
diff --git a/web/src/components/wallet/MnemonicWarning.tsx b/web/src/components/wallet/MnemonicWarning.tsx
@@ -20,13 +20,13 @@ export class MnemonicWarning extends Component<
     super(props);
     // bind events
     this.componentDidMount = this.componentDidMount.bind(this);
-    this.componentWillUnmount = this.componentWillUnmount.bind(this);
+    this.componentDidUnmount = this.componentDidUnmount.bind(this);
     this.handleSubmit = this.handleSubmit.bind(this);
   }
 
   componentDidMount(): void {}
 
-  componentWillUnmount(): void {}
+  componentDidUnmount(): void {}
 
   handleSubmit = (e: FormEvent) => {
     //if we don't prevent form submission, causes a browser reload
diff --git a/web/src/components/wallet/Restore.tsx b/web/src/components/wallet/Restore.tsx
@@ -25,14 +25,14 @@ export class WalletRestore extends Component<
     super(props);
     // bind events
     this.componentDidMount = this.componentDidMount.bind(this);
-    this.componentWillUnmount = this.componentWillUnmount.bind(this);
+    this.componentDidUnmount = this.componentDidUnmount.bind(this);
   }
 
   componentDidMount(): void {
     this.setState({ useMnemonic: undefined });
   }
 
-  componentWillUnmount(): void {}
+  componentDidUnmount(): void {}
 
   render() {
     return (
diff --git a/web/src/components/wallet/RestoreFilePassword.tsx b/web/src/components/wallet/RestoreFilePassword.tsx
@@ -28,13 +28,13 @@ export class WalletRestoreFilePassword extends Component<
     super(props);
     // bind events
     this.componentDidMount = this.componentDidMount.bind(this);
-    this.componentWillUnmount = this.componentWillUnmount.bind(this);
+    this.componentDidUnmount = this.componentDidUnmount.bind(this);
     this.decryptSecureMnemonicFile = this.decryptSecureMnemonicFile.bind(this);
   }
 
   componentDidMount(): void {}
 
-  componentWillUnmount(): void {}
+  componentDidUnmount(): void {}
 
   private decryptSecureMnemonicFile(): void {
     let mnemonicFilePassphrase = this.state.passwordText;
diff --git a/web/src/components/wallet/Setup.tsx b/web/src/components/wallet/Setup.tsx
@@ -57,7 +57,7 @@ export class WalletSetup extends Component<WalletViewDispatchProps, WalletSetupS
     this.onInitWallet();
   }
 
-  componentWillUnmount(): void {}
+  componentDidUnmount(): void {}
 
   private onInitWallet(): void {
     this.props.walletImportMnemonic("hello test green oil elephant");
diff --git a/web/src/components/wallet/View.tsx b/web/src/components/wallet/View.tsx
@@ -17,14 +17,14 @@ export class WalletView extends Component<WalletViewProps, WalletViewState> {
     super(props);
     // bind events
     this.componentDidMount = this.componentDidMount.bind(this);
-    this.componentWillUnmount = this.componentWillUnmount.bind(this);
+    this.componentDidUnmount = this.componentDidUnmount.bind(this);
     this.getWalletAddresses = this.getWalletAddresses.bind(this);
     this.getWalletAddresses();
   }
 
   componentDidMount(): void {}
 
-  componentWillUnmount(): void {}
+  componentDidUnmount(): void {}
 
   private getWalletAddresses = () => {
     GetWalletAddresses().then((data) => {
diff --git a/web/src/components/wallet/WalletPassword.tsx b/web/src/components/wallet/WalletPassword.tsx
@@ -38,15 +38,15 @@ export class WalletPassword extends Component<
     super(props);
     // bind events
     this.componentDidMount = this.componentDidMount.bind(this);
-    this.componentWillUnmount = this.componentWillUnmount.bind(this);
+    this.componentDidUnmount = this.componentDidUnmount.bind(this);
     this.state = {
       isValidating: false
     };
   }
 
   componentDidMount(): void {}
 
-  componentWillUnmount(): void {}
+  componentDidUnmount(): void {}
 
   handleChange = (e: ChangeEvent<HTMLInputElement>) => {
     let name: string = e.target.name;

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ export class MainFrame extends Component<MainFrameProps, MainFrameState> {`
`33`	`33`	`this.currentPage = props.currentPage ? props.currentPage : "home";`
`34`	`34`	`// bind events`
`35`	`35`	`this.componentDidMount = this.componentDidMount.bind(this);`
`36`		`- this.componentWillUnmount = this.componentWillUnmount.bind(this);`
	`36`	`+ this.componentDidUnmount = this.componentDidUnmount.bind(this);`
`37`	`37`	`this.changePage = this.changePage.bind(this);`
`38`	`38`	`}`
`39`	`39`
`@@ -46,7 +46,7 @@ export class MainFrame extends Component<MainFrameProps, MainFrameState> {`
`46`	`46`	`});`
`47`	`47`	`}`
`48`	`48`
`49`		`- componentWillUnmount(): void {}`
	`49`	`+ componentDidUnmount(): void {}`
`50`	`50`
`51`	`51`	`private changePage(pageName: string): void {`
`52`	`52`	`this.currentPage = pageName;`
Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,14 @@ export class SetupWizard extends Component<SetupWizardProps, SetupWizardState> {`
`17`	`17`	`super(props);`
`18`	`18`	`// bind events`
`19`	`19`	`this.componentDidMount = this.componentDidMount.bind(this);`
`20`		`- this.componentWillUnmount = this.componentWillUnmount.bind(this);`
	`20`	`+ this.componentDidUnmount = this.componentDidUnmount.bind(this);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`componentDidMount(): void {`
`24`	`24`	`this.setState({ currentStep: this.props.currentStep });`
`25`	`25`	`}`
`26`	`26`
`27`		`- componentWillUnmount(): void {}`
	`27`	`+ componentDidUnmount(): void {}`
`28`	`28`
`29`	`29`	`render() {`
`30`	`30`	`return (`
Original file line number	Diff line number	Diff line change
`@@ -18,13 +18,14 @@ export class TerminalPage extends Component<TerminalProps, TerminalState> {`
`18`	`18`
`19`	`19`	`// bind events`
`20`	`20`	`this.componentDidMount = this.componentDidMount.bind(this);`
	`21`	`+ this.componentDidUnmount = this.componentDidUnmount.bind(this);`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`componentDidMount(): void {`
`24`	`25`	`this.setState({ mode: this.props.mode });`
`25`	`26`	`}`
`26`	`27`
`27`		`- componentWillUnmount(): void {}`
	`28`	`+ componentDidUnmount(): void {}`
`28`	`29`
`29`	`30`	`render() {`
`30`	`31`	`return (`
Original file line number	Diff line number	Diff line change
`@@ -25,14 +25,14 @@ export class WalletRestore extends Component<`
`25`	`25`	`super(props);`
`26`	`26`	`// bind events`
`27`	`27`	`this.componentDidMount = this.componentDidMount.bind(this);`
`28`		`- this.componentWillUnmount = this.componentWillUnmount.bind(this);`
	`28`	`+ this.componentDidUnmount = this.componentDidUnmount.bind(this);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`componentDidMount(): void {`
`32`	`32`	`this.setState({ useMnemonic: undefined });`
`33`	`33`	`}`
`34`	`34`
`35`		`- componentWillUnmount(): void {}`
	`35`	`+ componentDidUnmount(): void {}`
`36`	`36`
`37`	`37`	`render() {`
`38`	`38`	`return (`