Merge branch 'develop' of https://github.com/secretkeylabs/xverse-web…

…-extension into imamahzafar/show-ordinal-in-psbt-signing

package.json

@@ -5,7 +5,7 @@
   "private": true,
   "dependencies": {
     "@react-spring/web": "^9.6.1",
-    "@secretkeylabs/xverse-core": "0.16.1",
+    "@secretkeylabs/xverse-core": "0.17.0",
     "@stacks/connect": "^6.10.2",
     "@stacks/encryption": "4.3.5",
     "@stacks/stacks-blockchain-api-types": "^6.1.1",
@@ -46,7 +46,7 @@
     "react-tooltip": "^5.4.0",
     "redux": "^4.0.5",
     "redux-persist": "^6.0.0",
-    "sats-connect": "^0.1.11",
+    "sats-connect": "0.2.0",
     "stream-browserify": "^3.0.0",
     "string-to-color": "^2.2.2",
     "styled-components": "^5.3.5",

src/app/components/AlertMessage/index.tsx

@@ -12,27 +12,29 @@ const Container = styled.div((props) => ({
   width: 312,
   borderRadius: 12,
   zIndex: 16000,
-  background: props.theme.colors.background.elevation2,
+  background: props.theme.colors.background.elevation3,
   filter: 'drop-shadow(0px 16px 36px rgba(0, 0, 0, 0.5))',
 }));
 
 const HeaderText = styled.h1((props) => ({
   ...props.theme.body_bold_m,
+  fontSize: 16,
   flex: 1,
 }));
 
 const DescriptionText = styled.h1((props) => ({
   ...props.theme.body_m,
   color: props.theme.colors.white[200],
   margin: 16,
+  fontSize: 16,
 }));
 
 const RowContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'row',
   padding: '20px 16px 16px 16px',
   alignItems: 'space-between',
-  borderBottom: `1px solid ${props.theme.colors.background.elevation3}`,
+  borderBottom: `1px solid ${props.theme.colors.background.elevation6}`,
 }));
 
 const TickMarkButtonContainer = styled.div((props) => ({
@@ -110,6 +112,7 @@ interface Props {
   description: string;
   buttonText?: string;
   secondButtonText?: string;
+  isWarningAlert?: boolean;
   tickMarkButtonText?: string;
   onButtonClick?: () => void;
   onSecondButtonClick?: () => void;
@@ -118,7 +121,7 @@ interface Props {
 }
 
 function AlertMessage({
-  onClose, title, description, buttonText, secondButtonText, tickMarkButtonText, onButtonClick, onSecondButtonClick, tickMarkButtonClick,
+  onClose, title, description, buttonText, secondButtonText, tickMarkButtonText, isWarningAlert, onButtonClick, onSecondButtonClick, tickMarkButtonClick,
 }: Props) {
   return (
     <>
@@ -143,6 +146,7 @@ function AlertMessage({
           <ActionButton
             text={secondButtonText ?? 'Yes'}
             onPress={onSecondButtonClick}
+            warning={isWarningAlert}
           />
         </ButtonContainer>
         )}