Merge remote-tracking branch 'origin/master' into multiple-connection…

…-support
0xsequence · Jan 16, 2025 · ed2ce6d · ed2ce6d
2 parents dc75502 + 629db5d
commit ed2ce6d
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 7 deletions.
diff --git a/packages/checkout/CHANGELOG.md b/packages/checkout/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @0xsequence/kit-connectors
 
+## 4.5.7
+
+### Patch Changes
+
+- QR code improvement for NFT checkout
+
+- Updated dependencies []:
+  - @0xsequence/kit@4.5.7
+
 ## 4.5.6
 
 ### Patch Changes

diff --git a/packages/checkout/package.json b/packages/checkout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/kit-checkout",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "description": "Checkout UI for Sequence Kit",
   "repository": "https://github.com/0xsequence/kit/tree/master/packages/checkout",
   "author": "Horizon Blockchain Games",

diff --git a/packages/checkout/src/views/PaymentSelection/TransferFunds.tsx b/packages/checkout/src/views/PaymentSelection/TransferFunds.tsx
@@ -2,12 +2,13 @@ import { useState, useEffect } from 'react'
 import { Box, Card, CheckmarkIcon, CopyIcon, IconButton, Text, truncateAddress } from '@0xsequence/design-system'
 import { CopyToClipboard } from 'react-copy-to-clipboard'
 
+import { useSelectPaymentModal, useTransferFundsModal } from '../../hooks'
 import { QRCodeCanvas } from 'qrcode.react'
 import { useAccount } from 'wagmi'
 
-import { truncateAtMiddle } from '../../utils'
-
 export const TransferFunds = () => {
+  const { openTransferFundsModal } = useTransferFundsModal()
+  const { openSelectPaymentModal, closeSelectPaymentModal, selectPaymentSettings } = useSelectPaymentModal()
   const { address: userAddress } = useAccount()
   const [isCopied, setCopy] = useState(false)
 
@@ -23,6 +24,27 @@ export const TransferFunds = () => {
     setCopy(true)
   }
 
+  const onClickQrCode = (e: React.MouseEvent<HTMLDivElement>) => {
+    e.preventDefault()
+    e.stopPropagation()
+    if (!selectPaymentSettings) {
+      return
+    }
+
+    closeSelectPaymentModal()
+
+    setTimeout(() => {
+      openTransferFundsModal({
+        walletAddress: userAddress || '',
+        onClose: () => {
+          setTimeout(() => {
+            openSelectPaymentModal(selectPaymentSettings)
+          }, 500)
+        }
+      })
+    }, 500)
+  }
+
   return (
     <Box width="full">
       <Box marginBottom="3">
@@ -31,7 +53,14 @@ export const TransferFunds = () => {
         </Text>
       </Box>
 
-      <Card width="full" justifyContent="space-between" padding="4">
+      <Card
+        opacity={{ hover: '80' }}
+        onClick={onClickQrCode}
+        cursor="pointer"
+        width="full"
+        justifyContent="space-between"
+        padding="4"
+      >
         <Box flexDirection="row" gap="3">
           <Box background="white" padding="4" borderRadius="xs" style={{ width: 40, height: 40 }}>
             <QRCodeCanvas
@@ -56,7 +85,12 @@ export const TransferFunds = () => {
             </Box>
           </Box>
         </Box>
-        <Box>
+        <Box
+          onClick={e => {
+            e.stopPropagation()
+            e.preventDefault()
+          }}
+        >
           <CopyToClipboard text={userAddress || ''} onCopy={handleCopy}>
             <IconButton
               color="text50"

diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @0xsequence/kit
 
+## 4.5.7
+
+### Patch Changes
+
+- QR code improvement for NFT checkout
+
 ## 4.5.6
 
 ### Patch Changes

diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/kit",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "description": "Core package for Sequence Kit",
   "keywords": [
     "sequence",

diff --git a/packages/wallet/CHANGELOG.md b/packages/wallet/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @0xsequence/kit-wallet
 
+## 4.5.7
+
+### Patch Changes
+
+- QR code improvement for NFT checkout
+
+- Updated dependencies []:
+  - @0xsequence/kit@4.5.7
+
 ## 4.5.6
 
 ### Patch Changes

diff --git a/packages/wallet/package.json b/packages/wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/kit-wallet",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "description": "Wallet UI for Sequence Kit",
   "repository": "https://github.com/0xsequence/kit/tree/master/packages/wallet",
   "author": "Horizon Blockchain Games",