Fix post rebase

GemWallet · Oct 23, 2023 · ce31639 · ce31639
1 parent f4b57e9
commit ce31639
Show file tree

Hide file tree

Showing 8 changed files with 255 additions and 316 deletions.
diff --git a/packages/extension/cypress/e2e/set_regular_key.cy.ts b/packages/extension/cypress/e2e/set_regular_key.cy.ts
@@ -50,11 +50,13 @@ describe('Set Regular Key', () => {
 
     cy.get('h1[data-testid="page-title"]').should('have.text', 'Set Regular Key');
 
-    cy.contains('Regular Key:').next().should('have.text', 'rNvFCZXpDtGeQ3bVas95wGLN6N2stGmA9o');
-    cy.contains('Memos:').next().should('have.text', 'Test memo');
+    cy.contains('p', 'Regular Key')
+      .next()
+      .should('have.text', 'rNvFCZXpDtGeQ3bVas95wGLN6N2stGmA9o');
+    cy.contains('Memo').next().should('have.text', 'Test memo');
 
     // Confirm
-    cy.contains('button', 'Confirm').click();
+    cy.contains('button', 'Submit').click();
 
     cy.get('h1[data-testid="transaction-title"]').should('have.text', 'Transaction in progress');
     cy.get('p[data-testid="transaction-subtitle"]').should(
@@ -82,15 +84,15 @@ describe('Set Regular Key', () => {
     cy.get('input[name="regularKey"]').type('fake');
     cy.get('input[name="regularKey"]').blur();
     cy.get('#regularKey-helper-text').should('have.text', 'The regular key is not a valid address');
-    cy.contains('button', 'Confirm').should('be.disabled');
+    cy.contains('button', 'Submit').should('be.disabled');
 
     // Enter Regular Key
     cy.get('input[name="regularKey"]').clear();
     cy.get('input[name="regularKey"]').type('rNvFCZXpDtGeQ3bVas95wGLN6N2stGmA9o');
-    cy.contains('button', 'Confirm').should('be.enabled');
+    cy.contains('button', 'Submit').should('be.enabled');
 
     // Confirm
-    cy.contains('button', 'Confirm').click();
+    cy.contains('button', 'Submit').click();
 
     cy.get('h1[data-testid="transaction-title"]').should('have.text', 'Transaction in progress');
     cy.get('p[data-testid="transaction-subtitle"]').should(
@@ -118,10 +120,10 @@ describe('Set Regular Key', () => {
 
     // Check the checkbox
     cy.get('input[name="deleteRegularKey"]').click();
-    cy.contains('button', 'Confirm').should('be.enabled');
+    cy.contains('button', 'Submit').should('be.enabled');
 
     // Confirm
-    cy.contains('button', 'Confirm').click();
+    cy.contains('button', 'Submit').click();
 
     cy.get('h1[data-testid="transaction-title"]').should('have.text', 'Transaction in progress');
     cy.get('p[data-testid="transaction-subtitle"]').should(

diff --git a/packages/extension/src/components/molecules/ActionButtons/ActionButtons.tsx b/packages/extension/src/components/molecules/ActionButtons/ActionButtons.tsx
@@ -14,6 +14,7 @@ export interface ActionButtonsProps {
   headerText?: string;
   isApproveEnabled?: boolean;
   approveButtonText?: string;
+  rejectButtonText?: string;
   navigation?: NavigationProps;
 }
 
@@ -31,6 +32,7 @@ export const ActionButtons: FC<ActionButtonsProps> = ({
   headerText,
   isApproveEnabled = true,
   approveButtonText = 'Sign',
+  rejectButtonText = 'Reject',
   navigation
 }) => {
   const buttonStyle = {
@@ -73,7 +75,7 @@ export const ActionButtons: FC<ActionButtonsProps> = ({
               onClick={onClickReject}
               style={buttonStyle}
             >
-              Reject
+              {rejectButtonText}
             </Button>
           </Grid>
           {navigation?.isNavigationEnabled ? (

diff --git a/packages/extension/src/components/molecules/XRPLTransaction/XRPLTransaction.tsx b/packages/extension/src/components/molecules/XRPLTransaction/XRPLTransaction.tsx
@@ -90,7 +90,8 @@ export const XRPLTransaction: FC<XRPLTxProps> = ({
     OfferSequence: (value?: number) =>
       renderSimpleText({ title: 'Offer Sequence', value, useLegacy }),
     EmailHash: (value?: string) => renderSimpleText({ title: 'Email Hash', value, useLegacy }),
-    NFTokenTaxon: (value?: string) => renderSimpleText({ title: 'Taxon', value, useLegacy })
+    NFTokenTaxon: (value?: string) => renderSimpleText({ title: 'Taxon', value, useLegacy }),
+    RegularKey: (value?: string) => renderSimpleText({ title: 'Regular Key', value, useLegacy })
   };
 
   const renderSimpleText = (params: {