Revert AccountSelector (#2794)

This PR reverts the work on the `AccountSelector` component.
MetaMask · Oct 7, 2024 · 249fb25 · 249fb25
1 parent 4506049
commit 249fb25
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 266 deletions.
diff --git a/packages/examples/packages/browserify-plugin/snap.manifest.json b/packages/examples/packages/browserify-plugin/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "BbaKbj8YVe957H1cnhBBv8X4ITiFjgmmor7/Rp9b/Yc=",
+    "shasum": "4a1znWfS1zEU7F+KvELAq39Q31sOaFMrxy40yNz4B0s=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/examples/packages/browserify/snap.manifest.json b/packages/examples/packages/browserify/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "j5111I9EFtd21hrAQ1CIU41NgKleyEr7AiW4Gj3yHLg=",
+    "shasum": "t0meIgWvqOjHA02oXh9UmcfDmGoiklTgVud+eqyKbRE=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/snaps-controllers/coverage.json b/packages/snaps-controllers/coverage.json
@@ -1,5 +1,5 @@
 {
-  "branches": 92.64,
+  "branches": 92.6,
   "functions": 96.65,
   "lines": 97.97,
   "statements": 97.67

diff --git a/packages/snaps-controllers/src/interface/utils.test.tsx b/packages/snaps-controllers/src/interface/utils.test.tsx
@@ -15,7 +15,6 @@ import {
   Selector,
   Card,
   SelectorOption,
-  AccountSelector,
 } from '@metamask/snaps-sdk/jsx';
 
 import { assertNameIsUnique, constructState, getJsxInterface } from './utils';
@@ -548,82 +547,6 @@ describe('constructState', () => {
     });
   });
 
-  it('sets default value for root level Account selector', () => {
-    const element = (
-      <Box>
-        <AccountSelector
-          name="foo"
-          title="Choose an account"
-          chainId="eip155:1"
-          selectedAddress="0x1234567890123456789012345678901234567890"
-        />
-      </Box>
-    );
-
-    const result = constructState({}, element);
-    expect(result).toStrictEqual({
-      foo: '0x1234567890123456789012345678901234567890',
-    });
-  });
-
-  it('supports root level Account selector', () => {
-    const element = (
-      <Box>
-        <AccountSelector
-          name="foo"
-          title="Choose an account"
-          chainId="eip155:1"
-          selectedAddress="0x1234567890123456789012345678901234567890"
-        />
-      </Box>
-    );
-
-    const result = constructState({}, element);
-    expect(result).toStrictEqual({
-      foo: '0x1234567890123456789012345678901234567890',
-    });
-  });
-
-  it('sets default value for Account selector in form', () => {
-    const element = (
-      <Box>
-        <Form name="form">
-          <AccountSelector
-            name="foo"
-            title="Choose an account"
-            chainId="eip155:1"
-            selectedAddress="0x1234567890123456789012345678901234567890"
-          />
-        </Form>
-      </Box>
-    );
-
-    const result = constructState({}, element);
-    expect(result).toStrictEqual({
-      form: { foo: '0x1234567890123456789012345678901234567890' },
-    });
-  });
-
-  it('supports Account selector in form', () => {
-    const element = (
-      <Box>
-        <Form name="form">
-          <AccountSelector
-            name="foo"
-            title="Choose an account"
-            chainId="eip155:1"
-            selectedAddress="0x1234567890123456789012345678901234567890"
-          />
-        </Form>
-      </Box>
-    );
-
-    const result = constructState({}, element);
-    expect(result).toStrictEqual({
-      form: { foo: '0x1234567890123456789012345678901234567890' },
-    });
-  });
-
   it('supports nested fields', () => {
     const element = (
       <Box>

diff --git a/packages/snaps-controllers/src/interface/utils.ts b/packages/snaps-controllers/src/interface/utils.ts
@@ -17,7 +17,6 @@ import type {
   RadioElement,
   SelectorElement,
   SelectorOptionElement,
-  AccountSelectorElement,
 } from '@metamask/snaps-sdk/jsx';
 import { isJSXElementUnsafe } from '@metamask/snaps-sdk/jsx';
 import {
@@ -71,8 +70,7 @@ function constructComponentSpecificDefaultState(
     | DropdownElement
     | RadioGroupElement
     | CheckboxElement
-    | SelectorElement
-    | AccountSelectorElement,
+    | SelectorElement,
 ) {
   switch (element.type) {
     case 'Dropdown': {
@@ -113,16 +111,12 @@ function getComponentStateValue(
     | DropdownElement
     | RadioGroupElement
     | CheckboxElement
-    | SelectorElement
-    | AccountSelectorElement,
+    | SelectorElement,
 ) {
   switch (element.type) {
     case 'Checkbox':
       return element.props.checked;
 
-    case 'AccountSelector':
-      return element.props.selectedAddress;
-
     default:
       return element.props.value;
   }
@@ -144,8 +138,7 @@ function constructInputState(
     | RadioGroupElement
     | FileInputElement
     | CheckboxElement
-    | SelectorElement
-    | AccountSelectorElement,
+    | SelectorElement,
   form?: string,
 ) {
   const oldStateUnwrapped = form ? (oldState[form] as FormState) : oldState;
@@ -203,8 +196,7 @@ export function constructState(
         component.type === 'RadioGroup' ||
         component.type === 'FileInput' ||
         component.type === 'Checkbox' ||
-        component.type === 'Selector' ||
-        component.type === 'AccountSelector')
+        component.type === 'Selector')
     ) {
       const formState = newState[currentForm.name] as FormState;
       assertNameIsUnique(formState, component.props.name);
@@ -223,8 +215,7 @@ export function constructState(
       component.type === 'RadioGroup' ||
       component.type === 'FileInput' ||
       component.type === 'Checkbox' ||
-      component.type === 'Selector' ||
-      component.type === 'AccountSelector'
+      component.type === 'Selector'
     ) {
       assertNameIsUnique(newState, component.props.name);
       newState[component.props.name] = constructInputState(oldState, component);

diff --git a/packages/snaps-rpc-methods/src/permitted/createInterface.test.tsx b/packages/snaps-rpc-methods/src/permitted/createInterface.test.tsx
@@ -140,7 +140,7 @@ describe('snap_createInterface', () => {
       error: {
         code: -32602,
         message:
-          'Invalid params: At path: ui -- Expected type to be one of: "AccountSelector", "Address", "Bold", "Box", "Button", "Copyable", "Divider", "Dropdown", "RadioGroup", "FileInput", "Form", "Heading", "Input", "Image", "Italic", "Link", "Row", "Spinner", "Text", "Tooltip", "Checkbox", "Card", "Icon", "Selector", "Section", "Container", but received: undefined.',
+          'Invalid params: At path: ui -- Expected type to be one of: "Address", "Bold", "Box", "Button", "Copyable", "Divider", "Dropdown", "RadioGroup", "FileInput", "Form", "Heading", "Input", "Image", "Italic", "Link", "Row", "Spinner", "Text", "Tooltip", "Checkbox", "Card", "Icon", "Selector", "Section", "Container", but received: undefined.',
         stack: expect.any(String),
       },
       id: 1,
@@ -190,7 +190,7 @@ describe('snap_createInterface', () => {
       error: {
         code: -32602,
         message:
-          'Invalid params: At path: ui.props.children -- Expected type to be one of: "AccountSelector", "Address", "Bold", "Box", "Button", "Copyable", "Divider", "Dropdown", "RadioGroup", "FileInput", "Form", "Heading", "Input", "Image", "Italic", "Link", "Row", "Spinner", "Text", "Tooltip", "Checkbox", "Card", "Icon", "Selector", "Section", but received: "Field".',
+          'Invalid params: At path: ui.props.children -- Expected type to be one of: "Address", "Bold", "Box", "Button", "Copyable", "Divider", "Dropdown", "RadioGroup", "FileInput", "Form", "Heading", "Input", "Image", "Italic", "Link", "Row", "Spinner", "Text", "Tooltip", "Checkbox", "Card", "Icon", "Selector", "Section", but received: "Field".',
         stack: expect.any(String),
       },
       id: 1,

diff --git a/packages/snaps-sdk/src/jsx/components/form/AccountSelector.test.tsx b/packages/snaps-sdk/src/jsx/components/form/AccountSelector.test.tsx
diff --git a/packages/snaps-sdk/src/jsx/components/form/AccountSelector.ts b/packages/snaps-sdk/src/jsx/components/form/AccountSelector.ts
diff --git a/packages/snaps-sdk/src/jsx/components/form/Field.ts b/packages/snaps-sdk/src/jsx/components/form/Field.ts
@@ -1,6 +1,5 @@
 import type { GenericSnapChildren } from '../../component';
 import { createSnapComponent } from '../../component';
-import type { AccountSelectorElement } from './AccountSelector';
 import type { CheckboxElement } from './Checkbox';
 import type { DropdownElement } from './Dropdown';
 import type { FileInputElement } from './FileInput';
@@ -27,8 +26,7 @@ export type FieldProps = {
     | FileInputElement
     | InputElement
     | CheckboxElement
-    | SelectorElement
-    | AccountSelectorElement;
+    | SelectorElement;
 };
 
 const TYPE = 'Field';

diff --git a/packages/snaps-sdk/src/jsx/components/form/index.ts b/packages/snaps-sdk/src/jsx/components/form/index.ts
@@ -1,4 +1,3 @@
-import type { AccountSelectorElement } from './AccountSelector';
 import type { ButtonElement } from './Button';
 import type { CheckboxElement } from './Checkbox';
 import type { DropdownElement } from './Dropdown';
@@ -12,7 +11,6 @@ import type { RadioGroupElement } from './RadioGroup';
 import type { SelectorElement } from './Selector';
 import type { SelectorOptionElement } from './SelectorOption';
 
-export * from './AccountSelector';
 export * from './Button';
 export * from './Checkbox';
 export * from './Dropdown';
@@ -27,7 +25,6 @@ export * from './Selector';
 export * from './SelectorOption';
 
 export type StandardFormElement =
-  | AccountSelectorElement
   | ButtonElement
   | CheckboxElement
   | FormElement