Do not wait for finalization

src/ExtrinsicSubmissionResult.test.tsx

@@ -13,23 +13,23 @@ test("No result, error", () => {
     expect(tree).toMatchSnapshot();
 });
 
-test("Non-finalized result, error", () => {
-    const tree = render(<ExtrinsicSubmissionResult result={{isFinalized: false, status: {isFinalized: false}} as SignedTransaction} error={"error"} />);
+test("In progress result, error", () => {
+    const tree = render(<ExtrinsicSubmissionResult result={{isInBlock: false, status: {isInBlock: false}} as SignedTransaction} error={"error"} />);
     expect(tree).toMatchSnapshot();
 });
 
-test("Non-finalized result, no error", () => {
-    const tree = render(<ExtrinsicSubmissionResult result={{isFinalized: false, status: {type: "Ready", isFinalized: false}} as SignedTransaction} error={null} />);
+test("In progress result, no error", () => {
+    const tree = render(<ExtrinsicSubmissionResult result={{isInBlock: false, status: {type: "Ready", isInBlock: false}} as SignedTransaction} error={null} />);
     expect(tree).toMatchSnapshot();
 });
 
-test("Finalized result, no error", () => {
-    const tree = render(<ExtrinsicSubmissionResult result={{isFinalized: true, status: {isFinalized: true}} as SignedTransaction} error={null} />);
+test("Done result, no error", () => {
+    const tree = render(<ExtrinsicSubmissionResult result={{isInBlock: true, status: {isInBlock: true}} as SignedTransaction} error={null} />);
     expect(tree).toMatchSnapshot();
 });
 
-test("Finalized result, no error, custom message", () => {
-    const tree = render(<ExtrinsicSubmissionResult result={{isFinalized: true, status: {isFinalized: true}} as SignedTransaction} error={null} successMessage="Success" />);
+test("Done result, no error, custom message", () => {
+    const tree = render(<ExtrinsicSubmissionResult result={{isInBlock: true, status: {isInBlock: true}} as SignedTransaction} error={null} successMessage="Success" />);
     expect(tree).toMatchSnapshot();
 });
 

src/ExtrinsicSubmitter.test.tsx

@@ -21,8 +21,8 @@ describe("ExtrinsicSubmitter", () => {
         />);
 
         expect(screen.getByRole('generic')).toBeEmptyDOMElement();
-        expect(onSuccess).not.toBeCalled();
-        expect(onError).not.toBeCalled();
+        expect(onSuccess).not.toHaveBeenCalled();
+        expect(onError).not.toHaveBeenCalled();
     });
 
     it("is initially showing submitting", async () => {
@@ -39,8 +39,8 @@ describe("ExtrinsicSubmitter", () => {
         />);
 
         await waitFor(() => expectSubmitting());
-        expect(onSuccess).not.toBeCalled();
-        expect(onError).not.toBeCalled();
+        expect(onSuccess).not.toHaveBeenCalled();
+        expect(onError).not.toHaveBeenCalled();
     });
 
     it("shows error and calls onError", async () => {
@@ -57,8 +57,8 @@ describe("ExtrinsicSubmitter", () => {
         />);
 
         await waitFor(() => expect(screen.getByText("Submission failed: error")).toBeInTheDocument());
-        expect(onSuccess).not.toBeCalled();
-        expect(onError).toBeCalled();
+        expect(onSuccess).not.toHaveBeenCalled();
+        expect(onError).toHaveBeenCalled();
     });
 
     it("shows progress", async () => {
@@ -75,8 +75,8 @@ describe("ExtrinsicSubmitter", () => {
         />);
 
         await waitFor(() => expect(screen.getByText("Current status: undefined")).toBeInTheDocument());
-        expect(onSuccess).not.toBeCalled();
-        expect(onError).not.toBeCalled();
+        expect(onSuccess).not.toHaveBeenCalled();
+        expect(onError).not.toHaveBeenCalled();
     });
 
     it("shows success and calls onSuccess", async () => {
@@ -93,8 +93,8 @@ describe("ExtrinsicSubmitter", () => {
         />);
 
         await waitFor(() => expect(screen.getByText("Submission successful.")).toBeInTheDocument());
-        expect(onSuccess).toBeCalledWith("extrinsicId");
-        expect(onError).not.toBeCalled();
+        expect(onSuccess).toHaveBeenCalledWith("extrinsicId");
+        expect(onError).not.toHaveBeenCalled();
     });
 });
 

src/__snapshots__/ExtrinsicSubmissionResult.test.tsx.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Finalized result, no error 1`] = `
+exports[`Done result, no error 1`] = `
 <div
   className="ExtrinsicSubmissionResult"
 >
@@ -20,7 +20,7 @@ exports[`Finalized result, no error 1`] = `
 </div>
 `;
 
-exports[`Finalized result, no error, custom message 1`] = `
+exports[`Done result, no error, custom message 1`] = `
 <div
   className="ExtrinsicSubmissionResult"
 >
@@ -38,7 +38,7 @@ exports[`Finalized result, no error, custom message 1`] = `
 </div>
 `;
 
-exports[`No result, error 1`] = `
+exports[`In progress result, error 1`] = `
 <div
   className="ExtrinsicSubmissionResult"
 >
@@ -58,45 +58,50 @@ exports[`No result, error 1`] = `
 </div>
 `;
 
-exports[`No result, error, custom message 1`] = `
+exports[`In progress result, no error 1`] = `
 <div
   className="ExtrinsicSubmissionResult"
 >
   <div
-    className="Alert danger"
+    className="Alert polkadot"
     style={
       Object {
-        "backgroundColor": undefined,
-        "color": "#e11a25",
+        "backgroundColor": "#e6007a",
+        "color": "white",
       }
     }
   >
-    Error
+    <div
+      className="spinner-border"
+    />
+    <p>
+      Current status: Ready
+    </p>
   </div>
 </div>
 `;
 
-exports[`No result, no error 1`] = `
+exports[`No result, error 1`] = `
 <div
   className="ExtrinsicSubmissionResult"
 >
   <div
-    className="Alert polkadot"
+    className="Alert danger"
     style={
       Object {
-        "backgroundColor": "#e6007a",
-        "color": "white",
+        "backgroundColor": undefined,
+        "color": "#e11a25",
       }
     }
   >
     <p>
-      Submitting...
+      Submission failed: error
     </p>
   </div>
 </div>
 `;
 
-exports[`Non-finalized result, error 1`] = `
+exports[`No result, error, custom message 1`] = `
 <div
   className="ExtrinsicSubmissionResult"
 >
@@ -109,14 +114,12 @@ exports[`Non-finalized result, error 1`] = `
       }
     }
   >
-    <p>
-      Submission failed: error
-    </p>
+    Error
   </div>
 </div>
 `;
 
-exports[`Non-finalized result, no error 1`] = `
+exports[`No result, no error 1`] = `
 <div
   className="ExtrinsicSubmissionResult"
 >
@@ -129,11 +132,8 @@ exports[`Non-finalized result, no error 1`] = `
       }
     }
   >
-    <div
-      className="spinner-border"
-    />
     <p>
-      Current status: Ready
+      Submitting...
     </p>
   </div>
 </div>

src/common/PendingVaultTransferRequests.tsx

@@ -71,7 +71,7 @@ export default function PendingVaultTransferRequests() {
                     },
                 ]}
                 data={ pendingRequests }
-                renderEmpty={ () => <EmptyTableMessage>No pending vault-out transfers</EmptyTableMessage> }
+                renderEmpty={ () => <EmptyTableMessage>No pending vault withdrawals</EmptyTableMessage> }
             />
             <RequestToCancel
                 requestToCancel={ requestToCancel }

src/common/RequestToCancel.tsx

@@ -64,9 +64,9 @@ export default function RequestToCancel(props: Props) {
             ]}
             size="lg"
         >
-            <h2>Cancel vault-out transfer</h2>
+            <h2>Cancel vault withdrawal</h2>
 
-            <p>This will cancel the vault-out transfer. Your Legal Officer will be notified.</p>
+            <p>This will cancel the vault withdrawal. Your Legal Officer will be notified.</p>
 
             <ExtrinsicSubmissionStateView />
         </Dialog>