Merge pull request #214 from argentlabs/feat/rebranding-ready

Feat/rebranding

Author: bluecco

README.md

@@ -49,10 +49,10 @@ const wallet = await connect()
 
 By default, the list of connectors is:
 
-- Argent X
+- Ready Wallet
 - Braavos
-- Argent mobile
-- Argent webwallet
+- Ready (formerly Argent)
+- Web Wallet
 
 ## Connect with specific connectors
 

src/connectors/argent/argentMobile/index.ts

@@ -35,7 +35,6 @@ import { isInArgentMobileAppBrowser } from "../helpers"
 import type { StarknetAdapter } from "./modal/starknet/adapter"
 import { ArgentX } from "../../injected/argentX"
 import { getModalWallet } from "../../../helpers/mapModalWallets"
-import { isMobileDevice } from "../../../helpers/navigator"
 
 export interface ArgentMobileConnectorOptions {
   dappName: string
@@ -82,7 +81,7 @@ export class ArgentMobileBaseConnector extends Connector {
   }
 
   get name(): string {
-    return "Argent (mobile)"
+    return "Ready (formerly Argent)"
   }
 
   get icon(): ConnectorIcons {
@@ -209,6 +208,17 @@ export class ArgentMobileBaseConnector extends Connector {
         ? publicRPCNode.mainnet
         : publicRPCNode.testnet)
 
+    // TODO: remove this when get-starknet will be updated
+    const discoveryWallets = (await sn.getDiscoveryWallets()).map((wallet) => {
+      if (wallet.id.toLowerCase() === "argentx") {
+        return {
+          ...wallet,
+          name: "Ready Wallet (formerly Argent)",
+        }
+      }
+      return wallet
+    })
+
     const options = {
       onlyQRCode: props?.onlyQRCode,
       chainId: chainId ?? constants.NetworkName.SN_MAIN,
@@ -218,7 +228,7 @@ export class ArgentMobileBaseConnector extends Connector {
       url,
       icons,
       rpcUrl: providerRpcUrl,
-      modalWallet: getModalWallet(this, await sn.getDiscoveryWallets()),
+      modalWallet: getModalWallet(this, discoveryWallets),
     }
 
     if (projectId === DEFAULT_PROJECT_ID) {

src/connectors/argent/argentMobile/modal/argentModal.ts

@@ -37,7 +37,7 @@ interface Urls {
 type ModalWalletExtended = ModalWallet & { dappName: string }
 
 class ArgentModal {
-  public bridgeUrl = "https://login.argent.xyz"
+  public bridgeUrl = "https://login.ready.co"
   public mobileUrl = "argent://"
   public type: "overlay" | "window" = "overlay"
   public wcUri?: string

src/connectors/argent/argentMobile/modal/starknet/account.ts

@@ -47,13 +47,13 @@ export class StarknetRemoteAccount extends Account implements AccountInterface {
     _contractPayload: DeclareContractPayload,
     _transactionsDetail?: InvocationsDetails | undefined,
   ): Promise<DeclareContractResponse> {
-    throw new Error("Not supported via Argent Login")
+    throw new Error("Not supported via Ready Login")
   }
 
   public async deployAccount(
     _contractPayload: any,
     _transactionsDetail?: InvocationsDetails | undefined,
   ): Promise<DeployContractResponse> {
-    throw new Error("Not supported via Argent Login")
+    throw new Error("Not supported via Ready Login")
   }
 }

src/connectors/argent/argentMobile/modal/starknet/adapter.ts

@@ -38,7 +38,7 @@ export class StarknetAdapter
   implements StarknetWindowObject
 {
   id = "argentMobile"
-  name = "Argent Mobile"
+  name = "Ready (formerly Argent)"
   version = "0.1.0"
   icon = ""
   provider: ProviderInterface

src/connectors/argent/argentMobile/modal/starknet/signer.ts

@@ -14,7 +14,7 @@ export class StarknetRemoteSigner implements SignerInterface {
   constructor(private wallet: IStarknetRpc) {}
 
   public async getPubKey(): Promise<string> {
-    throw new Error("Not supported via Argent Login")
+    throw new Error("Not supported via Ready Login")
   }
 
   public async signMessage(
@@ -33,18 +33,18 @@ export class StarknetRemoteSigner implements SignerInterface {
     _transactionsDetail: InvocationsSignerDetails,
     _abis?: Abi[],
   ): Promise<Signature> {
-    throw new Error("Not supported via Argent Login")
+    throw new Error("Not supported via Ready Login")
   }
 
   public async signDeployAccountTransaction(
     _transaction: DeployAccountSignerDetails,
   ): Promise<Signature> {
-    throw new Error("Not supported via Argent Login")
+    throw new Error("Not supported via Ready Login")
   }
 
   public async signDeclareTransaction(
     _transaction: DeclareSignerDetails,
   ): Promise<Signature> {
-    throw new Error("Not supported via Argent Login")
+    throw new Error("Not supported via Ready Login")
   }
 }

src/connectors/argent/index.ts

@@ -34,7 +34,7 @@ class Argent
   readonly fallbackConnector: ArgentMobileBaseConnector | null
 
   get name() {
-    return "Argent"
+    return "Ready Wallet (formerly Argent)"
   }
   get icon() {
     return ArgentIcon

src/connectors/injected/index.ts

@@ -35,7 +35,7 @@ export interface InjectedConnectorOptions {
   name?: string
   /** Wallet icons. */
   icon?: ConnectorIcons
-  /** Used for StarknetReactWrapper/Argent connector + sn-react */
+  /** Used for StarknetReactWrapper/Ready connector + sn-react */
   shouldEmit?: boolean
 }
 
@@ -95,6 +95,12 @@ export class InjectedConnector extends Connector {
 
   get name(): string {
     this.ensureWallet()
+
+    // TODO: remove when get-starknet is updated
+    if (this._options.id.toLowerCase() === "argentx") {
+      return "Ready Wallet (formerly Argent)"
+    }
+
     return this._options.name ?? this._wallet?.name ?? this._options.id
   }
 
@@ -173,7 +179,7 @@ export class InjectedConnector extends Connector {
     }
 
     /**
-     * @dev This emit ensures compatibility of Argent connector with starknet-react
+     * @dev This emit ensures compatibility of Ready connector with starknet-react
      */
     if (this._options.shouldEmit) {
       this.emit("connectionStatus", "init")
@@ -216,7 +222,7 @@ export class InjectedConnector extends Connector {
      */
     this.emit("connect", { account, chainId })
     /**
-     *  @dev This emit ensures compatibility of Argent connector with starknet-react
+     *  @dev This emit ensures compatibility of Ready connector with starknet-react
      */
     if (this._options.shouldEmit) {
       this.emit("connectionStatus", "success")

src/connectors/webwallet/constants.ts

@@ -1,4 +1,4 @@
-export const DEFAULT_WEBWALLET_URL = "https://web.argent.xyz"
+export const DEFAULT_WEBWALLET_URL = "https://web.ready.co"
 
 export const DEFAULT_WEBWALLET_ICON = `<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
   <rect x="2" y="2" width="28" height="28" rx="5.6" fill="black"/>

src/connectors/webwallet/helpers/mapTargetUrlToNodeUrl.ts

@@ -13,7 +13,7 @@ export function mapTargetUrlToNodeUrl(target: string): string {
     if (origin.includes("staging")) {
       return publicRPCNode.mainnet
     }
-    if (origin.includes("argent.xyz")) {
+    if (origin.includes("ready.co")) {
       return publicRPCNode.mainnet
     }
   } catch (e) {