Skip to content

Commit

Permalink
Merge branch 'master' of github.com:FuelLabs/fuels-wallet into ag/fe/…
Browse files Browse the repository at this point in the history
…feat-1205
  • Loading branch information
arthurgeron committed Feb 3, 2025
2 parents b5d855e + 37a5c22 commit ed2caa7
Show file tree
Hide file tree
Showing 37 changed files with 119 additions and 478 deletions.
5 changes: 5 additions & 0 deletions .changeset/friendly-lemons-carry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"fuels-wallet": major
---

chore: make address checksummed on Receive Page
5 changes: 5 additions & 0 deletions .changeset/moody-eggs-hope.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"fuels-wallet": patch
---

chore: upgrade checkout action to v4 + remove chainInfo machine
5 changes: 0 additions & 5 deletions .changeset/old-jars-battle.md

This file was deleted.

2 changes: 2 additions & 0 deletions .changeset/tall-suns-carry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion .github/workflows/docs-scrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Docker
uses: FuelLabs/github-actions/setups/docker@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-tests-e2e-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: buildjet-8vcpu-ubuntu-2204
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: FuelLabs/github-actions/setups/node@master
with:
node-version: 20.11.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-tests-e2e-crx-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: buildjet-8vcpu-ubuntu-2204
timeout-minutes: 7
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: FuelLabs/github-actions/setups/node@master
with:
node-version: 20.11.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-tests-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
timeout-minutes: 15
runs-on: buildjet-8vcpu-ubuntu-2204
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: FuelLabs/github-actions/setups/node@master
with:
node-version: 20.11.0
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
runs-on: buildjet-8vcpu-ubuntu-2204
continue-on-error: true
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: FuelLabs/github-actions/setups/node@master
with:
node-version: 20.11.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-tests-jest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Test
runs-on: buildjet-8vcpu-ubuntu-2204
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: FuelLabs/github-actions/setups/node@master
with:
node-version: 20.11.0
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
outputs:
changed: ${{ steps.packages-changed.outputs.any_changed }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Check external packages changes
id: packages-changed
uses: tj-actions/[email protected]
Expand All @@ -40,7 +40,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -57,7 +57,7 @@ jobs:
name: Audit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: FuelLabs/github-actions/setups/node@master
with:
node-version: 20.11.0
Expand All @@ -83,7 +83,7 @@ jobs:
name: Strict Audit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: FuelLabs/github-actions/setups/node@master
with:
node-version: 20.11.0
Expand All @@ -99,7 +99,7 @@ jobs:
contents: write
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: FuelLabs/github-actions/setups/node@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-npm-changeset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Release master or rc
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# need this to get full git-history/clone in order to build changelogs and check changesets
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-devnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: E2E Contract Tests - Devnet
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: FuelLabs/github-actions/setups/node@master
with:
node-version: 20.11.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-testnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: E2E Contract Tests - Testnet
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: FuelLabs/github-actions/setups/node@master
with:
node-version: 20.11.0
Expand Down
31 changes: 0 additions & 31 deletions .github/workflows/unpublish-npm.yaml

This file was deleted.

38 changes: 0 additions & 38 deletions .github/workflows/update-sdk-cron.yaml

This file was deleted.

60 changes: 0 additions & 60 deletions .github/workflows/update-sdk-manual.yaml

This file was deleted.

12 changes: 12 additions & 0 deletions packages/app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# fuels-wallet

## 0.47.1

### Patch Changes

- [#1760](https://github.com/FuelLabs/fuels-wallet/pull/1760) [`5399a354`](https://github.com/FuelLabs/fuels-wallet/commit/5399a3544f3203df689649e2d5bc4bd7a0ded988) Thanks [@Dhanraj30](https://github.com/Dhanraj30)! - Fixing display of long recipient names

- [#1783](https://github.com/FuelLabs/fuels-wallet/pull/1783) [`5680b65b`](https://github.com/FuelLabs/fuels-wallet/commit/5680b65b8bf09c42eadc4a5342bdae905c577351) Thanks [@LuizAsFight](https://github.com/LuizAsFight)! - fix: make send screen flows more stable by relying less on form changes

- Updated dependencies []:
- @fuel-wallet/connections@0.47.1
- @fuels/playwright-utils@0.47.1

## 0.47.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fuels-wallet",
"private": true,
"version": "0.47.0",
"version": "0.47.1",
"type": "module",
"database": "23",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,21 @@ export function createAmount(text: string, units = 0) {

let amount: BN | undefined;
if (isZeroUnits) {
const textWithoutDecimals = textAmountFixed
.replaceAll(',', '')
.split('.')[0];
amount = bn(textWithoutDecimals);
const integerPart = textAmountFixed.replaceAll(',', '').split('.')?.[0];
amount = bn(integerPart);
} else {
amount = bn.parseUnits(textAmountFixed.replaceAll(',', ''), units);
// get value after fraction, remove extra decimals
const textWithoutComma = textAmountFixed.replaceAll(',', '');
const textIntegerPart = textWithoutComma.split('.')[0];
const fractionWithoutExtraDecimals = textWithoutComma
.split('.')?.[1]
?.slice(0, units);
const textWithoutExtraDecimals = textIntegerPart
? `${textIntegerPart}${
fractionWithoutExtraDecimals ? `.${fractionWithoutExtraDecimals}` : ''
}`
: '';
amount = bn.parseUnits(textWithoutExtraDecimals, units);
}

return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import type { InputNumberProps } from '@fuel-ui/react';

export const isAmountAllowed: InputNumberProps['isAllowed'] = ({ value }) => {
console.log(value);
// Allow to clear the input
if (!value) {
return true;
Expand Down
9 changes: 7 additions & 2 deletions packages/app/src/systems/Home/pages/Receive/Receive.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { cssObj } from '@fuel-ui/css';
import { Address } from 'fuels';
import { useNavigate } from 'react-router-dom';
import { useAccounts } from '~/systems/Account';
import { Layout, MotionFlex, Pages, animations } from '~/systems/Core';
Expand All @@ -15,8 +16,12 @@ export function Receive() {
<Layout.Content>
{account?.address && (
<MotionFlex {...animations.slideInTop()} css={styles.contentWrapper}>
<UserAddressCard address={account?.address} />
<ReceiverQRCode address={account?.address} />
<UserAddressCard
address={Address.fromDynamicInput(account?.address).toChecksum()}
/>
<ReceiverQRCode
address={Address.fromDynamicInput(account?.address).toChecksum()}
/>
</MotionFlex>
)}
</Layout.Content>
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/systems/Network/hooks/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export * from './useChainInfo';
export * from './useNetworkForm';
export * from './useNetworks';
Loading

0 comments on commit ed2caa7

Please sign in to comment.