views/Receive: autogen tweaks

ZeusLN · Mar 16, 2023 · 98a4e2d · 98a4e2d
1 parent 250da92
commit 98a4e2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/stores/InvoicesStore.ts b/stores/InvoicesStore.ts
@@ -111,6 +111,7 @@ export default class InvoicesStore {
         routeHints?: boolean,
         addressType?: string
     ) => {
+        this.creatingInvoice = true;
         return this.createInvoice(
             memo,
             value,
@@ -127,7 +128,6 @@ export default class InvoicesStore {
                 rHash: string;
                 paymentRequest: string;
             }) => {
-                this.creatingInvoice = true;
                 if (BackendUtils.supportsOnchainReceiving()) {
                     return this.getNewAddress(
                         addressType

diff --git a/views/Receive.tsx b/views/Receive.tsx
@@ -113,7 +113,7 @@ export default class Receive extends React.Component<
         rate: 0
     };
 
-    async componentDidMount() {
+    async UNSAFE_componentWillMount() {
         const { navigation, InvoicesStore, SettingsStore } = this.props;
         const { reset } = InvoicesStore;
         const { settings, posStatus } = SettingsStore;
@@ -917,7 +917,7 @@ export default class Receive extends React.Component<
                                     )}
                                 </>
                             )}
-                            {creatingInvoice && (
+                            {(creatingInvoice || loading) && (
                                 <View style={{ top: 40 }}>
                                     <LoadingIndicator />
                                 </View>