chore: removed dev.lab links, fixed link_mode tag in wallet

Author: ignaciosantise

dapps/W3MWagmi/src/components/RequestModal.tsx

@@ -52,7 +52,19 @@ export function RequestModal({
             </Text>
           </>
         )}
-
+        {isCurrentRequestLinkMode && (
+          <View
+            style={[
+              styles.linkModeContainer,
+              {
+                backgroundColor: Theme['accent-100'],
+              },
+            ]}>
+            <Text style={[styles.linkMode, {color: Theme['inverse-100']}]}>
+              LINK MODE
+            </Text>
+          </View>
+        )}
         {rpcResponse && (
           <>
             <Text style={[styles.title, {color: Theme['success-100']}]}>
@@ -71,19 +83,6 @@ export function RequestModal({
             </Text>
           </>
         )}
-        {isCurrentRequestLinkMode && (
-          <View
-            style={[
-              styles.linkModeContainer,
-              {
-                backgroundColor: Theme['accent-100'],
-              },
-            ]}>
-            <Text style={[styles.linkMode, {color: Theme['inverse-100']}]}>
-              LINK MODE
-            </Text>
-          </View>
-        )}
       </View>
     </Modal>
   );
@@ -135,7 +134,7 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     justifyContent: 'center',
     alignSelf: 'center',
-    marginTop: 20,
+    marginBottom: 12,
   },
   linkMode: {
     fontSize: 12,

dapps/W3MWagmi/src/utils/misc.ts

@@ -8,7 +8,7 @@ export const getCustomWallets = () => {
       image_url:
         'https://docs.walletconnect.com/assets/images/web3walletLogo-54d3b546146931ceaf47a3500868a73a.png',
       mobile_link: 'rn-web3wallet://',
-      link_mode: 'https://dev.lab.web3modal.com/walletkit_rn',
+      link_mode: 'https://lab.web3modal.com/walletkit_rn',
     },
     {
       id: 'flutter-wallet',

wallets/rn_cli_wallet/src/components/Modal.tsx

@@ -18,8 +18,8 @@ export default function Modal() {
   const onClose = useCallback(() => {
     if (open) {
       ModalStore.close();
+      SettingsStore.setCurrentRequestLinkMode(false);
     }
-    SettingsStore.setCurrentRequestLinkMode(false);
   }, [open]);
 
   const componentView = useMemo(() => {
@@ -45,6 +45,9 @@ export default function Modal() {
     <RNModal
       backdropOpacity={0.6}
       hideModalContentWhileAnimating
+      useNativeDriver
+      statusBarTranslucent
+      propagateSwipe
       onBackdropPress={onClose}
       onModalHide={onClose}
       style={styles.modal}

wallets/rn_cli_wallet/src/components/Modal/ModalHeader.tsx

@@ -1,31 +1,32 @@
 import {Image, StyleSheet, Text, View} from 'react-native';
+import {useSnapshot} from 'valtio';
 import {SignClientTypes, Verify} from '@walletconnect/types';
 
 import {useTheme} from '@/hooks/useTheme';
 import VerifiedDomain from '@/assets/VerifiedDomain.png';
 import VerifyTag from '@/components/VerifyTag';
+import SettingsStore from '@/store/SettingsStore';
 
 interface ModalHeaderProps {
   metadata?: SignClientTypes.Metadata;
   intention?: string;
   verifyContext?: Verify.Context;
-  isLinkMode?: boolean;
 }
 
 export function ModalHeader({
   metadata,
   intention,
   verifyContext,
-  isLinkMode,
 }: ModalHeaderProps) {
   const Theme = useTheme();
+  const {isCurrentRequestLinkMode} = useSnapshot(SettingsStore.state);
   const color = Theme['fg-100'];
   const validation = verifyContext?.verified.validation;
   const isScam = verifyContext?.verified.isScam;
 
   return (
     <View style={styles.container}>
-      {isLinkMode && (
+      {isCurrentRequestLinkMode && (
         <View
           style={[
             styles.linkModeContainer,

wallets/rn_cli_wallet/src/modals/RequestModal.tsx

@@ -28,17 +28,14 @@ export function RequestModal({
   intention,
 }: RequestModalProps) {
   const Theme = useTheme();
-  const {currentRequestVerifyContext, isCurrentRequestLinkMode} = useSnapshot(
-    SettingsStore.state,
-  );
+  const {currentRequestVerifyContext} = useSnapshot(SettingsStore.state);
 
   return (
     <View style={[styles.container, {backgroundColor: Theme['bg-125']}]}>
       <ModalHeader
         metadata={metadata}
         intention={intention}
         verifyContext={currentRequestVerifyContext}
-        isLinkMode={isCurrentRequestLinkMode}
       />
       {children}
       <ModalFooter

wallets/rn_cli_wallet/src/utils/WalletConnectUtil.ts

@@ -19,7 +19,7 @@ export async function createWeb3Wallet(relayerRegionURL: string) {
       icons: ['https://avatars.githubusercontent.com/u/37784886'],
       redirect: {
         native: 'rn-web3wallet://',
-        universal: 'https://dev.lab.web3modal.com/walletkit_rn',
+        universal: 'https://lab.web3modal.com/walletkit_rn',
         linkMode: true,
       },
     },