Skip to content

Commit 325b02a

Browse files
authored
fix: name confirmation aligned with method request (#423)
Aims to fix MetaMask/metamask-extension#33622 Changes the name of the confirmation accordingly with method requested
1 parent 5f3b1ad commit 325b02a

5 files changed

Lines changed: 15 additions & 13 deletions

File tree

packages/snap/locales/en.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,15 @@
148148
"confirmation.confirmButton": {
149149
"message": "Confirm"
150150
},
151-
"confirmation.title": {
151+
"confirmation.signAndSendTransaction.title": {
152152
"message": "Transaction request"
153153
},
154+
"confirmation.signTransaction.title": {
155+
"message": "Signing request"
156+
},
157+
"confirmation.sendAndConfirmTransaction.title": {
158+
"message": "Sending and confirming transaction"
159+
},
154160
"confirmation.advanced.unknownInstruction": {
155161
"message": "Unknown"
156162
},

packages/snap/messages.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@
4848
"confirmation.advanced.hide": "Hide advanced",
4949
"confirmation.cancelButton": "Cancel",
5050
"confirmation.confirmButton": "Confirm",
51-
"confirmation.title": "Transaction request",
51+
"confirmation.signAndSendTransaction.title": "Transaction request",
52+
"confirmation.signTransaction.title": "Signing request",
53+
"confirmation.sendAndConfirmTransaction.title": "Sending and confirming transaction",
5254
"confirmation.advanced.unknownInstruction": "Unknown",
5355
"confirmation.advanced.programId": "Program ID",
5456
"confirmation.advanced.data": "Data",
@@ -84,4 +86,4 @@
8486
"transactionScan.errors.insufficientSol": "Account does not have enough SOL to perform the operation.",
8587
"transactionScan.errors.slippageToleranceExceeded": "The transaction was reverted because the slippage tolerance was exceeded.",
8688
"transactionScan.errors.unknownError": "An unknown error occurred."
87-
}
89+
}

packages/snap/snap.manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"url": "https://github.com/MetaMask/snap-solana-wallet.git"
88
},
99
"source": {
10-
"shasum": "0G8PXZNx7ioU2jbDWfX7Qv94bxORrt2q1mgWZj/ajow=",
10+
"shasum": "rx+CMYlfj25LOq11FMftpUP3nc+J+mO7C64XS2cmrGw=",
1111
"location": {
1212
"npm": {
1313
"filePath": "dist/bundle.js",

packages/snap/src/core/validation/structs.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,6 @@ export const ListAccountAssetsResponseStruct = array(CaipAssetTypeStruct);
185185

186186
export const SubmitRequestMethodStruct = enums(Object.values(SolMethod));
187187

188-
export const SendAndConfirmTransactionParamsStruct = object({
189-
base64EncodedTransactionMessage: string(),
190-
});
191-
192-
export type SendAndConfirmTransactionParams = Infer<
193-
typeof SendAndConfirmTransactionParamsStruct
194-
>;
195-
196188
export const NetworkStruct = enums(Object.values(Network));
197189

198190
export const Curenc = enums([

packages/snap/src/features/confirmation/views/ConfirmTransactionRequest/ConfirmTransactionRequest.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ export const ConfirmTransactionRequest = ({
4242
) : null}
4343
<Box alignment="center" center>
4444
<Box>{null}</Box>
45-
<Heading size="lg">{translate('confirmation.title')}</Heading>
45+
<Heading size="lg">
46+
{translate(`confirmation.${context.method}.title`)}
47+
</Heading>
4648
<Box>{null}</Box>
4749
</Box>
4850
{context.preferences.simulateOnChainActions ? (

0 commit comments

Comments
 (0)