Skip to content

Commit

Permalink
Merge pull request #175 from zallo-labs/Z-187-policy-settings
Browse files Browse the repository at this point in the history
Z 187 policy settings
  • Loading branch information
hbriese authored Nov 9, 2023
2 parents 970a7b3 + 5149e40 commit d218fd6
Show file tree
Hide file tree
Showing 213 changed files with 2,787 additions and 2,477 deletions.
3 changes: 0 additions & 3 deletions .config/.eslintignore

This file was deleted.

36 changes: 14 additions & 22 deletions .config/.eslintrc.js → .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,36 +1,28 @@
module.exports = {
root: true,
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaFeatures: {
jsx: true,
},
ecmaVersion: '2021',
sourceType: 'module',
},
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:react/recommended',
'neverthrow',
],
plugins: ['@typescript-eslint', 'react-hooks'],
env: {
es2021: true,
browser: true,
node: true,
mocha: true,
},
parser: '@typescript-eslint/parser',
// parserOptions: {
// ecmaVersion: '2021',
// sourceType: 'module',
// },
extends: [
'eslint:recommended',
'plugin:eslint-comments/recommended',
'plugin:@typescript-eslint/recommended',
// 'plugin:neverthrow/recommended', // https://github.com/mdbetancourt/eslint-plugin-neverthrow/issues/14
'prettier' /* last */,
],
plugins: ['@typescript-eslint', 'neverthrow'],
rules: {
'@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
'@typescript-eslint/no-non-null-assertion': 'off',
'@typescript-eslint/no-empty-interface': 'off',
'react-hooks/rules-of-hooks': 'error',
'react-hooks/exhaustive-deps': [
'warn',
{ additionalHooks: '(useRecoilCallback|useRecoilTransaction_UNSTABLE)' },
],
'neverthrow/must-use-result': 'error',
},
ignorePatterns: ['**/node_modules', '**/dist', '**/*generated*'],
};
3 changes: 3 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ jobs:
- name: 🏗️ Pre-Build
run: yarn app prebuild

- name: 👕 Lint
run: yarn app lint

- name: 🧪 Test
run: yarn app test

Expand Down
6 changes: 1 addition & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,5 @@
"jest.testExplorer": {
"enabled": false
},
"jest.monitorLongRun": 180000,
"eslint.options": {
"overrideConfigFile": ".config/.eslintrc.js",
"ignorePath": ".config/.eslintignore"
}
"jest.monitorLongRun": 180000
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
53 changes: 53 additions & 0 deletions .yarn/patches/react-native-paper-npm-5.11.1-686e668968.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
diff --git a/lib/module/components/Typography/Text.js b/lib/module/components/Typography/Text.js
index 0f74223bec974f8460cd69740a8f9b89142b9201..2549639deab9e799fae1667c6a48dff484059858 100644
--- a/lib/module/components/Typography/Text.js
+++ b/lib/module/components/Typography/Text.js
@@ -1,6 +1,8 @@
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
import * as React from 'react';
import { I18nManager, StyleSheet, Text as NativeText } from 'react-native';
+import AnimatedText from './AnimatedText';
+import StyledText from './v2/StyledText';
import { useInternalTheme } from '../../core/theming';
import { forwardRef } from '../../utils/forwardRef';
// @component-group Typography
@@ -61,7 +63,10 @@ const Text = (_ref, ref) => {
if (theme.isV3 && variant) {
let font = theme.fonts[variant];
let textStyle = [font, style];
- if (rest.children && typeof rest.children === 'object' && 'props' in rest.children) {
+ if (React.isValidElement(rest.children) &&
+ (rest.children.type === Component ||
+ rest.children.type === AnimatedText ||
+ rest.children.type === StyledText)) {
const {
props
} = rest.children;
diff --git a/src/components/Typography/Text.tsx b/src/components/Typography/Text.tsx
index 0492751d8e6199dc75f493c036dc51fe2f679bab..78d2949a4301d844fc538795e5071d46883ca4d0 100644
--- a/src/components/Typography/Text.tsx
+++ b/src/components/Typography/Text.tsx
@@ -7,7 +7,9 @@ import {
TextStyle,
} from 'react-native';

+import AnimatedText from './AnimatedText';
import type { VariantProp } from './types';
+import StyledText from './v2/StyledText';
import { useInternalTheme } from '../../core/theming';
import type { ThemeProp } from '../../types';
import { forwardRef } from '../../utils/forwardRef';
@@ -96,9 +98,10 @@ const Text = (
let textStyle = [font, style];

if (
- rest.children &&
- typeof rest.children === 'object' &&
- 'props' in rest.children
+ React.isValidElement(rest.children) &&
+ (rest.children.type === Component ||
+ rest.children.type === AnimatedText ||
+ rest.children.type === StyledText)
) {
const { props } = rest.children;

115 changes: 56 additions & 59 deletions api/dbschema/edgeql-js/__spec__.ts

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions api/dbschema/edgeql-js/castMaps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export type scalarAssignableBy<T extends $.ScalarType> =
T extends _default.$uint16 ? _default.$uint16 :
T extends _std.$int32 ? _std.$int32 :
T extends _default.$current_accounts_set ? _default.$current_accounts_set :
T extends _default.$id_435afe04795511ee99c77584d5d93f56 ? _default.$id_435afe04795511ee99c77584d5d93f56 :
T extends _default.$id_f315347c7cf911eeac3bedf1cc94a60e ? _default.$id_f315347c7cf911eeac3bedf1cc94a60e :
T extends _std.$uuid ? _std.$uuid :
T extends _default.$TransferDirection ? _default.$TransferDirection :
T extends _default.$TransactionProposalStatus ? _default.$TransactionProposalStatus :
Expand Down Expand Up @@ -107,7 +107,7 @@ export type scalarCastableFrom<T extends $.ScalarType> =
T extends _default.$uint16 ? _default.$uint16 :
T extends _std.$int32 ? _std.$int32 :
T extends _default.$current_accounts_set ? _default.$current_accounts_set :
T extends _default.$id_435afe04795511ee99c77584d5d93f56 ? _default.$id_435afe04795511ee99c77584d5d93f56 :
T extends _default.$id_f315347c7cf911eeac3bedf1cc94a60e ? _default.$id_f315347c7cf911eeac3bedf1cc94a60e :
T extends _std.$uuid ? _std.$uuid :
T extends _default.$TransferDirection ? _default.$TransferDirection :
T extends _default.$TransactionProposalStatus ? _default.$TransactionProposalStatus :
Expand Down Expand Up @@ -354,8 +354,8 @@ type getSharedParentScalar<A, B> =
:
never
:
A extends _default.$id_435afe04795511ee99c77584d5d93f56 ?
B extends _default.$id_435afe04795511ee99c77584d5d93f56 ?
A extends _default.$id_f315347c7cf911eeac3bedf1cc94a60e ?
B extends _default.$id_f315347c7cf911eeac3bedf1cc94a60e ?
B
:
never
Expand Down
Loading

0 comments on commit d218fd6

Please sign in to comment.