Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/docker/release/main/docker-165496…
Browse files Browse the repository at this point in the history
…bfae
  • Loading branch information
dzolt-4chain authored Dec 11, 2024
2 parents 0d6b1e9 + ef74ac2 commit c408511
Show file tree
Hide file tree
Showing 5 changed files with 705 additions and 587 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node-version: [18.x]
node-version: [22.x]
fail-fast: true
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Use Node.js 18.x
- name: Use Node.js 22.x
uses: actions/setup-node@v4
with:
node-version: '18.x'
node-version: '22.x'
cache: 'yarn'
- name: Install dependencies with yarn
run: yarn install --frozen-lockfile
Expand Down
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,50 +13,50 @@
"dependencies": {
"@4chain-ag/react-configuration": "^1.0.4",
"@material-ui/lab": "^4.0.0-alpha.61",
"@mui/base": "^5.0.0-beta.58",
"@mui/material": "^6.1.8",
"@mui/base": "^5.0.0-beta.63",
"@mui/material": "^6.1.10",
"@mui/utils": "^6.0.2",
"@types/axios": "^0.14.4",
"@types/lodash": "^4.17.13",
"@types/scroll-lock": "^2.1.3",
"axios": "^1.7.7",
"axios": "^1.7.9",
"centrifuge": "^5.2.2",
"date-fns": "^4.1.0",
"history": "^5.3.0",
"lodash": "^4.17.21",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-toastify": "^10.0.6",
"scroll-lock": "^2.1.5"
},
"devDependencies": {
"@emotion/babel-plugin": "^11.13.5",
"@emotion/eslint-plugin": "^11.12.0",
"@emotion/react": "^11.13.5",
"@emotion/styled": "^11.13.5",
"@mui/icons-material": "^6.1.8",
"@types/node": "^22.9.3",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@mui/icons-material": "^6.1.10",
"@types/node": "^22.10.1",
"@types/react": "^19.0.1",
"@types/react-dom": "^19.0.1",
"@types/styled-components": "^5.1.34",
"@typescript-eslint/eslint-plugin": "^8.15.0",
"@typescript-eslint/parser": "^8.15.0",
"@vitejs/plugin-react": "^4.3.3",
"@typescript-eslint/eslint-plugin": "^8.17.0",
"@typescript-eslint/parser": "^8.17.0",
"@vitejs/plugin-react": "^4.3.4",
"emotion-normalize": "^11.0.1",
"eslint": "8.57.1",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-import-resolver-typescript": "^3.7.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-refresh": "^0.4.14",
"prettier": "^3.3.3",
"react-router-dom": "^6.27.0",
"eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-react-refresh": "^0.4.16",
"prettier": "^3.4.2",
"react-router-dom": "^7.0.2",
"typescript": "^5.7.2",
"vite": "^5.4.11",
"vite": "^6.0.3",
"vite-plugin-checker": "^0.8.0",
"vite-plugin-pwa": "^0.21.0"
"vite-plugin-pwa": "^0.21.1"
},
"resolutions": {
"styled-components": "^5"
Expand Down
33 changes: 15 additions & 18 deletions src/components/Input/PaymailAutocomplete.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,23 @@ export const PaymailAutocomplete = forwardRef<HTMLInputElement, PaymailAutocompl
openOnFocus: false,
});


return (
<div {...getRootProps()}>
<PaymailInput {...props} inputProps={getInputProps()} ref={ref}>
{children}

{groupedOptions.length > 0 ? (
<Listbox {...getListboxProps()}>
{(groupedOptions as string[]).map((option, index) => {

return (
<li {...getOptionProps({ option, index })} key={index}>
{option}
</li>
);
})}
</Listbox>
) : null}
</PaymailInput>
<PaymailInput {...props} inputProps={getInputProps()} ref={ref}>
{children}

{groupedOptions.length > 0 ? (
<Listbox {...getListboxProps()}>
{(groupedOptions as string[]).map((option, index) => {
return (
<li {...getOptionProps({ option, index })} key={index}>
{option}
</li>
);
})}
</Listbox>
) : null}
</PaymailInput>
</div>
);
},
Expand Down Expand Up @@ -85,4 +82,4 @@ const Listbox = styled.ul`
background-color: ${colors.thirdBackground};
padding: ${sizes(1)};
},
`
`;
2 changes: 1 addition & 1 deletion src/components/TransferForm/paymailInputAnimation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useCallback, useRef, RefObject } from 'react';

type PaymailAnimation = {
startAnimation: () => void;
ref: RefObject<HTMLInputElement>;
ref: RefObject<HTMLInputElement | null>;
};

export const usePaymailInputAnimation = (): PaymailAnimation => {
Expand Down
Loading

0 comments on commit c408511

Please sign in to comment.