Add generic address labelling

api/schema.graphql

@@ -183,6 +183,10 @@ The `JSON` scalar type represents JSON values as specified by [ECMA-404](http://
 """
 scalar JSON @specifiedBy(url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf")
 
+input LabelInput {
+ address: Address!
+}
+
 type Mutation {
  approve(input: ApproveInput!): TransactionProposal!
  createAccount(input: CreateAccountInput!): Account!
@@ -336,6 +340,7 @@ type Query {
  contacts: [Contact!]!
  contract(input: ContractInput!): Contract
  contractFunction(input: ContractFunctionInput!): ContractFunction
+ label(input: LabelInput!): String
  paymaster: Address!
  policies: [Policy!]!
  policy(input: UniquePolicyInput!): Policy

api/src/features/contacts/contacts.input.ts

@@ -19,3 +19,9 @@ export class UpsertContactInput {
  @Field(() => String)
  label: string;
 }
+
+@InputType()
+export class LabelInput {
+ @AddressField()
+ address: Address;
+}

api/src/features/contacts/contacts.resolver.ts

@@ -1,6 +1,6 @@
 import { ID, Info, Mutation, Query, Resolver } from '@nestjs/graphql';
 import { GraphQLResolveInfo } from 'graphql';
-import { ContactInput, UpsertContactInput } from './contacts.input';
+import { ContactInput, LabelInput, UpsertContactInput } from './contacts.input';
 import { Contact } from './contacts.model';
 import { ContactsService } from './contacts.service';
 import { getShape } from '../database/database.select';
@@ -21,6 +21,11 @@ export class ContactsResolver {
  return this.service.select(getShape(info));
  }
 
+ @Query(() => String, { nullable: true })
+ async label(@Input() { address }: LabelInput) {
+ return this.service.label(address);
+ }
+
  @Mutation(() => Contact)
  async upsertContact(@Input() input: UpsertContactInput, @Info() info: GraphQLResolveInfo) {
  const id = await this.service.upsert(input);

api/src/features/contacts/contacts.service.ts

@@ -81,4 +81,23 @@ export class ContactsService {
  async delete(address: Address) {
  return this.db.query(e.delete(e.Contact, uniqueContact(address)).id);
  }
+
+ async label(address: Address) {
+ const contact = e.select(e.Contact, () => ({
+ filter_single: { user: e.global.current_user, address },
+ label: true,
+ })).label;
+
+ const account = e.select(e.Account, () => ({
+ filter_single: { address },
+ name: true,
+ })).name;
+
+ const approver = e.select(e.Approver, () => ({
+ filter_single: { address },
+ label: true,
+ })).label;
+
+ return this.db.query(e.select(e.op(e.op(contact, '??', account), '??', approver)));
+ }
 }

app/src/components/address/AddressLabel.tsx

@@ -2,13 +2,26 @@ import { Address } from 'lib';
 import { useMemo } from 'react';
 import { useMaybeToken } from '@token/useToken';
 import { truncateAddr } from '~/util/format';
+import { gql } from '@api/gen';
+import { useSuspenseQuery } from '@apollo/client';
+import { AddressLabelQuery, AddressLabelQueryVariables } from '@api/gen/graphql';
+
+const AddressLabelDoc = gql(/* GraphQL */ `
+ query AddressLabel($address: Address!) {
+ label(input: { address: $address })
+ }
+`);
 
 export const useAddressLabel = <A extends Address | undefined>(address: A) => {
  const token = useMaybeToken(address);
+ const label = useSuspenseQuery<AddressLabelQuery, AddressLabelQueryVariables>(AddressLabelDoc, {
+ variables: { address: address! },
+ skip: !address,
+ }).data?.label;
 
  return useMemo(
- () => (!address ? undefined : token?.name || truncateAddr(address)),
- [address, token?.name],
+ () => (!address ? undefined : label || token?.name || truncateAddr(address)),
+ [label, address, token?.name],
  ) as A extends undefined ? string | undefined : string;
 };