Zal 162

api/dbschema/default.esdl

@@ -17,7 +17,7 @@ module default {
  required isActive: bool;
  required implementation: Address;
  required salt: Bytes32;
- multi link policies := (select .<account[is Policy] filter .state.isRemoved ?= false);
+ multi link policies := (select .<account[is Policy] filter (.isActive or exists .draft));
  multi link proposals := .<account[is Proposal];
  multi link transactionProposals := .<account[is TransactionProposal];
  multi link transfers := .<account[is Transfer];

api/dbschema/edgeql-js/modules/default.ts

@@ -78,10 +78,10 @@ export type $AccountλShape = $.typeutil.flatten<_std.$Object_169a5ce7108a11eeb5
  "<account[is Transfer]": $.LinkDesc<$Transfer, $.Cardinality.Many, {}, false, false, false, false>;
  "<account[is Policy]": $.LinkDesc<$Policy, $.Cardinality.Many, {}, false, false, false, false>;
  "<accounts[is Approver]": $.LinkDesc<$Approver, $.Cardinality.Many, {}, false, false, false, false>;
+ "<account[is MessageProposal]": $.LinkDesc<$MessageProposal, $.Cardinality.Many, {}, false, false, false, false>;
  "<accounts[is current_approver]": $.LinkDesc<$current_approver, $.Cardinality.Many, {}, false, false, false, false>;
  "<accounts[is User]": $.LinkDesc<$User, $.Cardinality.Many, {}, false, false, false, false>;
  "<accounts[is current_user]": $.LinkDesc<$current_user, $.Cardinality.Many, {}, false, false, false, false>;
- "<account[is MessageProposal]": $.LinkDesc<$MessageProposal, $.Cardinality.Many, {}, false, false, false, false>;
  "<account": $.LinkDesc<$.ObjectType, $.Cardinality.Many, {}, false, false, false, false>;
  "<accounts": $.LinkDesc<$.ObjectType, $.Cardinality.Many, {}, false, false, false, false>;
 }>;
@@ -141,8 +141,8 @@ export type $ApproverλShape = $.typeutil.flatten<_std.$Object_169a5ce7108a11eeb
  "<proposedBy[is Proposal]": $.LinkDesc<$Proposal, $.Cardinality.Many, {}, false, false, false, false>;
  "<proposedBy[is TransactionProposal]": $.LinkDesc<$TransactionProposal, $.Cardinality.Many, {}, false, false, false, false>;
  "<approvers[is PolicyState]": $.LinkDesc<$PolicyState, $.Cardinality.Many, {}, false, false, false, false>;
- "<approvers[is Account]": $.LinkDesc<$Account, $.Cardinality.Many, {}, false, false, false, false>;
  "<proposedBy[is MessageProposal]": $.LinkDesc<$MessageProposal, $.Cardinality.Many, {}, false, false, false, false>;
+ "<approvers[is Account]": $.LinkDesc<$Account, $.Cardinality.Many, {}, false, false, false, false>;
  "<approver": $.LinkDesc<$.ObjectType, $.Cardinality.Many, {}, false, false, false, false>;
  "<approvers": $.LinkDesc<$.ObjectType, $.Cardinality.Many, {}, false, false, false, false>;
  "<proposedBy": $.LinkDesc<$.ObjectType, $.Cardinality.Many, {}, false, false, false, false>;

api/dbschema/migrations/00027.edgeql

@@ -0,0 +1,19 @@
+CREATE MIGRATION m1ltit76m3dki4tixcyjxlzlcil27yag5depkcrr6sarp2hf3c7f6a
+ ONTO m1gi4tvmgtsvjgnymrdmw5ebzvq5i6llq7raoa754vlopfvqlhslsa
+{
+ ALTER TYPE default::Policy {
+ ALTER PROPERTY isActive {
+ USING ((.state.isRemoved ?= false));
+ SET REQUIRED;
+ };
+ };
+ ALTER TYPE default::Account {
+ ALTER LINK policies {
+ USING (SELECT
+ .<account[IS default::Policy]
+ FILTER
+ (.isActive OR EXISTS (.draft))
+ );
+ };
+ };
+};

api/dbschema/policy.esdl

@@ -23,7 +23,7 @@ module default {
  limit 1
  ) filter not exists .activationBlock
  );
- property isActive := (exists .state);
+ required property isActive := (.state.isRemoved ?= false);
 
  constraint exclusive on ((.account, .key));
  constraint exclusive on ((.account, .name));

api/src/features/transactions/transactions.service.ts

@@ -151,26 +151,24 @@ export class TransactionsService {
  },
  );
 
- const transactionHash = asHex(transaction.hash);
- await e
- .insert(e.Transaction, {
- hash: transactionHash,
- proposal: selectTransactionProposal(proposal.id),
- gasPrice,
- })
- .run(this.db.client);
-
- // Set executing policy if none was set
- if (!proposal.policy?.state) {
- await e
- .update(e.TransactionProposal, () => ({
+ // Set executing policy if not already set
+ const selectedProposal = proposal.policy?.state
+ ? selectTransactionProposal(proposal.id)
+ : e.update(e.TransactionProposal, () => ({
  filter_single: { id: proposal.id },
  set: {
  policy: selectPolicy({ account: proposal.account.address as Address, key: policy.key }),
  },
- }))
- .run(this.db.client);
- }
+ }));
+
+ const transactionHash = asHex(transaction.hash);
+ await this.db.query(
+ e.insert(e.Transaction, {
+ hash: transactionHash,
+ proposal: selectedProposal,
+ gasPrice,
+ }),
+ );
 
  await this.proposals.publishProposal(
  { hash: proposal.hash as Hex, account: proposal.account.address as Address },

app/src/components/InputsView.tsx

@@ -8,7 +8,6 @@ import { View } from 'react-native';
 import { Button, IconButton, Text } from 'react-native-paper';
 import { FiatValue } from '~/components/fiat/FiatValue';
 import { TokenAmount } from '~/components/token/TokenAmount';
-import { logWarning } from '~/util/analytics';
 
 const FragmentDoc = gql(/* GraphQL */ `
  fragment InputsView_token on Token @argumentDefinitions(account: { type: "Address!" }) {
@@ -65,10 +64,6 @@ export const InputsView = ({ input, setInput, type, setType, ...props }: InputsV
  setType(InputType.Token);
  setInput(formatUnits(token.balance, token.decimals));
  }}
- onLayout={(e) => {
- if (e.nativeEvent.layout.width !== BUTTON_WIDTH)
- logWarning(`BUTTON_WIDTH mismatch`, { width: e.nativeEvent.layout.width });
- }}
  >
  Max
  </Button>
@@ -87,10 +82,6 @@ export const InputsView = ({ input, setInput, type, setType, ...props }: InputsV
  iconColor={styles.button.color}
  style={styles.iconButton}
  onPress={() => setType((type) => Number(!type))}
- onLayout={(e) => {
- if (e.nativeEvent.layout.width !== ICON_BUTTON_WIDTH)
- logWarning('ICON_BUTTON_WIDTH mismatch', { width: e.nativeEvent.layout.width });
- }}
  />
  </View>
 

app/src/screens/home/Tabs/ActivityTab.tsx

@@ -68,17 +68,22 @@ export type ActivityTabProps = TabNavigatorScreenProp<'Activity'> & { account: A
 
 export const ActivityTab = withSuspense(
  ({ account }: ActivityTabProps) => {
- const { proposals, transfers, user } = useQuery(Query, { accounts: [account] }).data ?? {};
+ // When proposals are invalidated (on proposal sub) and the user is on a different screen this screen remains mounted but suspense doesn't occur
+ const {
+ proposals = [],
+ transfers = [],
+ user,
+ } = useQuery(Query, { accounts: [account] }).data ?? {};
  useSubscription({ query: ProposalSubscription, variables: { accounts: [account] } });
  useSubscription({ query: TransferSubscription, variables: { accounts: [account] } });
 
- const data = [...proposals, ...transfers].sort(
+ const items = [...proposals, ...transfers].sort(
  (a, b) => asDateTime(b.timestamp).toMillis() - asDateTime(a.timestamp).toMillis(),
  );
 
  return (
  <FlashList
- data={data}
+ data={items}
  renderItem={({ item }) =>
  match(item)
  .with({ __typename: 'TransactionProposal' }, (p) => (
@@ -97,6 +102,7 @@ export const ActivityTab = withSuspense(
  There is no activity to show
  </Text>
  }
+ extraData={[user]}
  contentContainerStyle={styles.contentContainer}
  estimatedItemSize={ListItemHeight.DOUBLE_LINE}
  showsVerticalScrollIndicator={false}

app/src/screens/policy/PolicyAppbar.tsx

@@ -48,6 +48,13 @@ const Remove = gql(/* GraphQL */ `
  mutation PolicyAppbar_Remove($account: Address!, $key: PolicyKey!) {
  removePolicy(input: { account: $account, key: $key }) {
  id
+ draft {
+ id
+ proposal {
+ id
+ hash
+ }
+ }
  }
  }
 `);
@@ -123,8 +130,11 @@ export const PolicyAppbar = ({ view, reset, setParams, ...props }: PolicyAppbarP
  onPress={async () => {
  close();
  if (await confirmRemove()) {
- await remove({ account: policy.account.address, key: policy.key });
- goBack();
+ const proposal = (
+ await remove({ account: policy.account.address, key: policy.key })
+ ).data?.removePolicy.draft?.proposal?.hash;
+
+ proposal ? navigate('Proposal', { proposal }) : goBack();
  }
  }}
  />