update ls key names

packages/@magic-ext/web3modal-ethers5/jest.config.ts

@@ -7,7 +7,7 @@ const config: Config.InitialOptions = {
  '^.+\\.(js|jsx)$': 'babel-jest',
  '\\.(ts|tsx)$': 'ts-jest',
  },
- coveragePathIgnorePatterns: ['index.ts, index.cdn.ts', 'index.native.ts'],
+ coveragePathIgnorePatterns: ['index.cdn.ts', 'index.native.ts'],
 };
 
 export default config;

packages/@magic-ext/web3modal-ethers5/src/index.ts

@@ -27,15 +27,15 @@ export class Web3ModalExtension extends Extension.Internal<'web3modal'> {
  }
 
  public setIsConnected() {
- localStorage.setItem('3pw_provider', 'web3modal');
- localStorage.setItem('3pw_address', this.modal.getAddress() as string);
- localStorage.setItem('3pw_chainId', (this.modal.getChainId() as number).toString());
+ localStorage.setItem('magic_3pw_provider', 'web3modal');
+ localStorage.setItem('magic_3pw_address', this.modal.getAddress() as string);
+ localStorage.setItem('magic_3pw_chainId', (this.modal.getChainId() as number).toString());
  this.sdk.thirdPartyWallet.isConnected = true;
  }
 
  public initialize() {
  this.sdk.thirdPartyWallet.enabledWallets.web3modal = true;
- this.sdk.thirdPartyWallet.isConnected = Boolean(localStorage.getItem('3pw_address'));
+ this.sdk.thirdPartyWallet.isConnected = Boolean(localStorage.getItem('magic_3pw_address'));
  this.sdk.thirdPartyWallet.eventListeners.push({
  event: ThirdPartyWalletEvents.Web3ModalSelected,
  callback: async (payloadId) => {
@@ -50,16 +50,16 @@ export class Web3ModalExtension extends Extension.Internal<'web3modal'> {
 
  this.modal.subscribeProvider(({ address, chainId }) => {
  // If user disconnected all accounts from wallet
- if (!address && localStorage.getItem('3pw_address')) {
+ if (!address && localStorage.getItem('magic_3pw_address')) {
  this.sdk.thirdPartyWallet.resetState();
  return this.sdk.rpcProvider.emit('accountsChanged', []);
  }
- if (address && address !== localStorage.getItem('3pw_address')) {
- localStorage.setItem('3pw_address', address);
+ if (address && address !== localStorage.getItem('magic_3pw_address')) {
+ localStorage.setItem('magic_3pw_address', address);
  return this.sdk.rpcProvider.emit('accountsChanged', [address]);
  }
- if (chainId && chainId !== Number(localStorage.getItem('3pw_chainId'))) {
- localStorage.setItem('3pw_chainId', chainId.toString());
+ if (chainId && chainId !== Number(localStorage.getItem('magic_3pw_chainId'))) {
+ localStorage.setItem('magic_3pw_chainId', chainId.toString());
  return this.sdk.rpcProvider.emit('chainChanged', chainId);
  }
  return null;

packages/@magic-ext/web3modal-ethers5/test/spec/chainChanged.spec.ts

@@ -32,7 +32,7 @@ const web3modalParams = {
 
 test('setEip1193EventListeners emits chainChanged', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
- localStorage.setItem('3pw_address', '0x123');
+ localStorage.setItem('magic_3pw_address', '0x123');
  magic.web3modal.modal.subscribeProvider = jest.fn(
  (callback: (provider: { address: string; chainId: number }) => void) => {
  callback({ address: '0x123', chainId: 1 });

packages/@magic-ext/web3modal-ethers5/test/spec/setIsConnected.spec.ts

@@ -32,8 +32,8 @@ const web3modalParams = {
 test('setIsConnected sets localStorage values', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  magic.web3modal.setIsConnected();
- expect(localStorage.getItem('3pw_provider')).toEqual('web3modal');
- expect(localStorage.getItem('3pw_address')).toEqual('0x123');
- expect(localStorage.getItem('3pw_chainId')).toEqual('1');
+ expect(localStorage.getItem('magic_3pw_provider')).toEqual('web3modal');
+ expect(localStorage.getItem('magic_3pw_address')).toEqual('0x123');
+ expect(localStorage.getItem('magic_3pw_chainId')).toEqual('1');
  expect(magic.thirdPartyWallet.isConnected).toBeTruthy();
 });

packages/@magic-sdk/provider/src/modules/third-party-wallet.ts

@@ -8,9 +8,9 @@ export class ThirdPartyWalletModule extends BaseModule {
  public isConnected = false;
 
  public resetState() {
- localStorage.removeItem('3pw_provider');
- localStorage.removeItem('3pw_address');
- localStorage.removeItem('3pw_chainId');
+ localStorage.removeItem('magic_3pw_provider');
+ localStorage.removeItem('magic_3pw_address');
+ localStorage.removeItem('magic_3pw_chainId');
  this.isConnected = false;
  }
 
@@ -30,7 +30,7 @@ export class ThirdPartyWalletModule extends BaseModule {
  return this.logout(payload);
  }
  // Route all other requests to 3pw provider
- switch (localStorage.getItem('3pw_provider')) {
+ switch (localStorage.getItem('magic_3pw_provider')) {
  case 'web3modal':
  return this.web3modalRequest(payload);
  // Fallback to default request
@@ -43,7 +43,7 @@ export class ThirdPartyWalletModule extends BaseModule {
  /* Core Method Overrides */
 
  private isLoggedIn(payload: Partial<JsonRpcRequestPayload>): PromiEvent<boolean> {
- switch (localStorage.getItem('3pw_provider')) {
+ switch (localStorage.getItem('magic_3pw_provider')) {
  case 'web3modal':
  return this.web3modalIsLoggedIn();
  default:
@@ -53,7 +53,7 @@ export class ThirdPartyWalletModule extends BaseModule {
  }
 
  private getInfo(payload: Partial<JsonRpcRequestPayload>): PromiEvent<MagicUserMetadata> {
- switch (localStorage.getItem('3pw_provider')) {
+ switch (localStorage.getItem('magic_3pw_provider')) {
  case 'web3modal':
  return this.web3modalGetInfo();
  default:
@@ -63,7 +63,7 @@ export class ThirdPartyWalletModule extends BaseModule {
  }
 
  private logout(payload: Partial<JsonRpcRequestPayload>): PromiEvent<boolean> {
- const provider = localStorage.getItem('3pw_provider');
+ const provider = localStorage.getItem('magic_3pw_provider');
  this.resetState();
  switch (provider) {
  case 'web3modal': {

packages/@magic-sdk/provider/test/spec/modules/third-party-wallet/getInfo.spec.ts

@@ -11,7 +11,7 @@ beforeEach(() => {
 
 describe('third party wallet getInfo', () => {
  it('should call web3modalGetInfo if provider is web3modal', () => {
- localStorage.setItem('3pw_provider', 'web3modal');
+ localStorage.setItem('magic_3pw_provider', 'web3modal');
  const payload = { method: 'getInfo' };
  const magic = createMagicSDK();
  const spy = jest.spyOn(magic.thirdPartyWallet, 'web3modalGetInfo').mockImplementation(() => Promise.resolve({}));

packages/@magic-sdk/provider/test/spec/modules/third-party-wallet/isLoggedIn.spec.ts

@@ -11,7 +11,7 @@ beforeEach(() => {
 
 describe('third party wallet isLoggedIn', () => {
  it('should call web3modalIsLoggedIn if provider is web3modal', () => {
- localStorage.setItem('3pw_provider', 'web3modal');
+ localStorage.setItem('magic_3pw_provider', 'web3modal');
  const payload = { method: 'isLoggedIn' };
  const magic = createMagicSDK();
  const spy = jest.spyOn(magic.thirdPartyWallet, 'web3modalIsLoggedIn').mockImplementation(() => Promise.resolve({}));

packages/@magic-sdk/provider/test/spec/modules/third-party-wallet/logout.spec.ts

@@ -11,7 +11,7 @@ beforeEach(() => {
 
 describe('third party wallet logout', () => {
  it('should call web3modal.logout if provider is web3modal', () => {
- localStorage.setItem('3pw_provider', 'web3modal');
+ localStorage.setItem('magic_3pw_provider', 'web3modal');
  const payload = { method: 'logout' };
  const magic = createMagicSDK();
  const spy = jest.spyOn(magic.thirdPartyWallet, 'web3modalLogout').mockImplementation(() => Promise.resolve({}));

packages/@magic-sdk/provider/test/spec/modules/third-party-wallet/requestOverride.spec.ts

@@ -51,7 +51,7 @@ describe('third party wallet requestOverride', () => {
  });
 
  it('should call web3modalRequest if provider is web3modal', () => {
- localStorage.setItem('3pw_provider', 'web3modal');
+ localStorage.setItem('magic_3pw_provider', 'web3modal');
  const payload = { method: 'someMethod' };
  const magic = createMagicSDK();
  const spy = jest.spyOn(magic.thirdPartyWallet, 'web3modalRequest').mockImplementation(() => Promise.resolve({}));

packages/@magic-sdk/provider/test/spec/modules/third-party-wallet/resetState.spec.ts

@@ -10,16 +10,16 @@ beforeEach(() => {
 describe('third party wallet resetState', () => {
  it('should clear relevant localStorage items and set isConnected to false', () => {
  const magic = createMagicSDK();
- localStorage.setItem('3pw_provider', 'some_provider');
- localStorage.setItem('3pw_address', 'some_address');
- localStorage.setItem('3pw_chainId', 'some_chainId');
+ localStorage.setItem('magic_3pw_provider', 'some_provider');
+ localStorage.setItem('magic_3pw_address', 'some_address');
+ localStorage.setItem('magic_3pw_chainId', 'some_chainId');
  magic.thirdPartyWallet.isConnected = true;
 
  magic.thirdPartyWallet.resetState();
 
- expect(localStorage.getItem('3pw_provider')).toBeUndefined();
- expect(localStorage.getItem('3pw_address')).toBeUndefined();
- expect(localStorage.getItem('3pw_chainId')).toBeUndefined();
+ expect(localStorage.getItem('magic_3pw_provider')).toBeUndefined();
+ expect(localStorage.getItem('magic_3pw_address')).toBeUndefined();
+ expect(localStorage.getItem('magic_3pw_chainId')).toBeUndefined();
  expect(magic.thirdPartyWallet.isConnected).toBe(false);
  });
 });

packages/@magic-sdk/provider/test/spec/modules/third-party-wallet/web3modalGetInfo.spec.ts

@@ -9,7 +9,7 @@ beforeEach(() => {
 
 describe('third party wallet web3modalGetInfo', () => {
  it('should call getIsConnected', () => {
- localStorage.setItem('3pw_provider', 'web3modal');
+ localStorage.setItem('magic_3pw_provider', 'web3modal');
  const payload = { method: 'getInfo' };
  const magic = createMagicSDK();
  const spy = jest.spyOn(magic.thirdPartyWallet, 'web3modalGetInfo').mockImplementation(() => Promise.resolve({}));

packages/@magic-sdk/provider/test/spec/modules/third-party-wallet/web3modalIsLoggedIn.spec.ts

@@ -9,7 +9,7 @@ beforeEach(() => {
 
 describe('third party wallet web3modalIsLoggedIn', () => {
  it('should call getIsConnected', () => {
- localStorage.setItem('3pw_provider', 'web3modal');
+ localStorage.setItem('magic_3pw_provider', 'web3modal');
  const magic = createMagicSDK();
  const spy = jest.spyOn(magic.thirdPartyWallet, 'web3modalIsLoggedIn').mockImplementation(() => Promise.resolve({}));
  magic.thirdPartyWallet.isLoggedIn();

packages/@magic-sdk/provider/test/spec/modules/third-party-wallet/web3modalLogout.spec.ts

@@ -9,7 +9,7 @@ beforeEach(() => {
 
 describe('third party wallet web3modalLogout', () => {
  it('should call getIsConnected', () => {
- localStorage.setItem('3pw_provider', 'web3modal');
+ localStorage.setItem('magic_3pw_provider', 'web3modal');
  const payload = { method: 'logout' };
  const magic = createMagicSDK();
  const spy = jest.spyOn(magic.thirdPartyWallet, 'web3modalLogout').mockImplementation(() => Promise.resolve({}));

packages/@magic-sdk/provider/test/spec/modules/third-party-wallet/web3modalRequest.spec.ts

@@ -9,7 +9,7 @@ beforeEach(() => {
 
 describe('third party wallet web3modalRequest', () => {
  it('should call getIsConnected', () => {
- localStorage.setItem('3pw_provider', 'web3modal');
+ localStorage.setItem('magic_3pw_provider', 'web3modal');
  const payload = { method: 'request' };
  const magic = createMagicSDK();
  const spy = jest.spyOn(magic.thirdPartyWallet, 'web3modalRequest').mockImplementation(() => Promise.resolve({}));