Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: name field error fixed in user details #622

Open
wants to merge 111 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
ecb4319
feat: added ui component for inheritance accordion (#439)
Ishaan28malik Jul 10, 2024
f60bd49
feat: added oneinmany ui component (#437)
Ishaan28malik Jul 12, 2024
d2e76bc
feat: ui added for inheritance reminder component (#443)
Ishaan28malik Jul 17, 2024
8e523a6
feat: ui added for many in many inheritance component (#476)
Ishaan28malik Jul 20, 2024
91f772f
refactor: using typography in many in many component
irshadjsr21 Jul 20, 2024
83e1343
feat: added silver button variant (#504)
irshadjsr21 Jul 20, 2024
73ec11a
feat: OTP input component ui (#489)
moayaan1911 Jul 22, 2024
efd01c4
Merge branch 'develop' into feat/inheritance-ui
irshadjsr21 Jul 22, 2024
4ebe8a1
refactor: otp input component props
irshadjsr21 Jul 22, 2024
3dc1606
feat: inheritance nominee message component ui (#499)
moayaan1911 Jul 22, 2024
2befa90
feat: added inheritance sync plans dialog ui (#508)
irshadjsr21 Jul 24, 2024
9b4a2b3
feat: coupon code input UI (#507)
moayaan1911 Jul 25, 2024
e04fa58
feat: added inheritance plan login dialog ui (#511)
irshadjsr21 Jul 27, 2024
1002199
feat: inheritance silver plan purchase ui (#513)
irshadjsr21 Aug 1, 2024
083a99a
feat: inheritance plan card UI (#506)
moayaan1911 Aug 1, 2024
66af3e0
feat: inheritance edit executor message dailog ui (#510)
AryanCypherock Aug 1, 2024
28dfd0d
Feat/inheritance edit reminder time (#512)
AryanCypherock Aug 3, 2024
9437d10
ui added for dashboardWallet inheritance component (#475)
Ishaan28malik Aug 8, 2024
5994059
feat/inheritance payment promo (#515)
AryanCypherock Aug 8, 2024
aa087a3
Feat/inheritance edit user details dialog (#517)
AryanCypherock Aug 9, 2024
eae0ee6
feat: inheritance page layout implemented PRF-7402 (#518)
AryanCypherock Aug 10, 2024
0bfd3a1
feat: added lang strings for edit encrypted message
AryanCypherock Aug 21, 2024
62f9b4c
feat: edit encrypted message dialog implemented
AryanCypherock Aug 21, 2024
d383971
chore: updated lang strings across all languages
AryanCypherock Aug 21, 2024
5b44a6a
Feat/inheritance pin recovery dialog (#520)
AryanCypherock Aug 22, 2024
cc744bd
feat: summary component UI (#514)
Ishaan28malik Aug 23, 2024
9c1cf9b
chore: updated review changes
AryanCypherock Aug 30, 2024
bc8d2b7
Merge branch 'feat/inheritance-ui' into feat/inheritance-edit-encrypt…
AryanCypherock Aug 30, 2024
c41c3b6
feat: inheritance home page and choose plan ui (#529)
AryanCypherock Aug 30, 2024
93589cd
feat: implemented inheritance pages (#530)
irshadjsr21 Aug 30, 2024
631286c
feat: implemented inheritance plan db (#533)
irshadjsr21 Aug 31, 2024
f025bfb
fix: inheritance UI many in many (#523)
AryanCypherock Aug 31, 2024
a796fc5
feat: inheritance pin recovery dialog (#526)
AryanCypherock Sep 2, 2024
95238d8
feat: silver plan setup api integration (#516)
irshadjsr21 Sep 3, 2024
2d3bcf1
feat: implemented inheritance sync plans api (#535)
irshadjsr21 Sep 4, 2024
702f6c6
feat: inheritance gold plan purchase UI (#525)
AryanCypherock Sep 10, 2024
d0b3539
fix: lang strings updated
AryanCypherock Sep 11, 2024
35cabbe
Merge branch 'feat/inheritance-ui' into feat/inheritance-edit-encrypt…
AryanCypherock Sep 11, 2024
40206d1
fix: layout updated as per latest designs
AryanCypherock Sep 11, 2024
5595c5c
feat: Inheritance UI plan details (#532)
AryanCypherock Sep 13, 2024
a63aa99
feat: updated inheritance api
irshadjsr21 Sep 13, 2024
90e8414
chore: pr review changes
AryanCypherock Sep 14, 2024
5f96276
Merge pull request #521 from Cypherock/feat/inheritance-edit-encrypte…
AryanCypherock Sep 14, 2024
1aa5a01
feat: updated build script to run with sdk submodules
irshadjsr21 Sep 14, 2024
3677d51
feat: updated test script to run with sdk submodules
irshadjsr21 Sep 14, 2024
7d892c9
fix: inheritance release (#539)
irshadjsr21 Sep 14, 2024
785b31f
fix: inheritance release
irshadjsr21 Sep 14, 2024
42f7f57
refactor: update submodules (#540)
TejasvOnly Sep 19, 2024
281ae42
feat: card tap input updated (#536)
AryanCypherock Sep 23, 2024
93965aa
feat: inheritance UI dashboard layout (#542)
AryanCypherock Sep 24, 2024
246522e
feat: inheritance pin recovery and silver plan setup refactor (#546)
irshadjsr21 Sep 26, 2024
4f5e222
feat: inheritance estate recovery dialog ui (#545)
AryanCypherock Sep 26, 2024
285b3db
feat: plan details and plan login integration (#550)
irshadjsr21 Sep 27, 2024
8d2e3b0
fix: updated dashboard wallet backgrounds and icons (#538)
AryanCypherock Sep 27, 2024
7acfae6
feat: inheritance silver plan UI update (#549)
AryanCypherock Oct 1, 2024
0be7e17
feat: character count in textarea added (#547)
AryanCypherock Oct 1, 2024
7096f66
Feat/inheritance gold setup functionality (#537)
TejasvOnly Oct 4, 2024
c5d4d13
fix: silver plan dialog flow ui fixes (#554)
AryanCypherock Oct 5, 2024
0fa25f9
fix: inheritance UI error dialog (#557)
AryanCypherock Oct 5, 2024
7c58552
fix: lang string updated (#553)
AryanCypherock Oct 7, 2024
824ff87
fix: fixed on paste behaviour of the otp input (#555)
AryanCypherock Oct 7, 2024
ee2312f
feat: inheritance estate recovery integration (#552)
irshadjsr21 Oct 7, 2024
70215e1
fix: implement check-coupon-code functionality (#556)
TejasvOnly Oct 7, 2024
753aa2f
fix: added delay in loader dialogs for inheritance (#558)
TejasvOnly Oct 7, 2024
91c4528
chore: update submodule (#561)
TejasvOnly Oct 8, 2024
c419298
fix: updated spacing and padding (#560)
AryanCypherock Oct 10, 2024
975ff46
fix: sync plan api update (#562)
TejasvOnly Oct 10, 2024
6d5ca52
feat: auto refresh accesstoken for inheritance api calls (#566)
TejasvOnly Oct 15, 2024
cdba957
Inheritance bug fixes (#565)
TejasvOnly Oct 15, 2024
4e2cae2
fix: hide pending plans till future handling (#568)
TejasvOnly Oct 15, 2024
a0cedcc
feat: pre-fill feilds in gold plan setup (#567)
TejasvOnly Oct 15, 2024
50d126b
fix: otp input time format fixed (#564)
AryanCypherock Oct 16, 2024
ccd9d1c
fix: inheritance UI nominee message subtext (#570)
AryanCypherock Oct 16, 2024
e8071ee
fix: inheritance UI gold plan summary (#569)
AryanCypherock Oct 16, 2024
f932ce8
fix: nominee message textarea issues fixes (#571)
AryanCypherock Oct 16, 2024
a3efe10
feat: added active state in many in many (#559)
AryanCypherock Oct 17, 2024
022a492
fix: show card location instead of personal message on device (#573)
TejasvOnly Oct 21, 2024
4b5bca6
fix: inheritance UI dashboard unlock auth (#596)
AryanCypherock Nov 9, 2024
31b7229
fix: email validation inconsistency (#574)
TejasvOnly Nov 9, 2024
6bb0fc5
fix: retry button on error handler (#575)
TejasvOnly Nov 9, 2024
3f3d60d
fix: abort on decryption flow (#576)
TejasvOnly Nov 9, 2024
fc8d59d
fix: allow multiple emails to be visisble on otp screens (#577)
TejasvOnly Nov 9, 2024
c9cd8d8
fix: estate recovery back button (#578)
TejasvOnly Nov 9, 2024
dc5db61
fix: force minimum value of nomineeIndex to be 0 (#579)
TejasvOnly Nov 9, 2024
ea05191
fix: don't skip login for setup flows (#580)
TejasvOnly Nov 9, 2024
69d5da5
fix: message box string fixed (#601)
AryanCypherock Nov 9, 2024
0f00738
fix: view pin layout fix in estate recovery (#598)
AryanCypherock Nov 9, 2024
2057a94
fix: updated lang strings in estate recovery decrypt message (#600)
AryanCypherock Nov 9, 2024
edee1fa
fix: tooltip added in view message estate recovery (#599)
AryanCypherock Nov 9, 2024
56e3d40
feat: video playback error ui implemented (#548)
AryanCypherock Nov 9, 2024
b736dc5
fix: build error fix
AryanCypherock Nov 11, 2024
06820f6
feat: inheritance edit flow navigation (#593)
AryanCypherock Nov 11, 2024
41e3a4a
fix: newline fixed in tooltips (#602)
AryanCypherock Nov 11, 2024
efd1faa
fix: exit button in otp input fixed (#603)
AryanCypherock Nov 11, 2024
04f2d96
feat: gold plan details page data (#572)
TejasvOnly Nov 12, 2024
52e52b2
feat: add prefill data for user details in setup (#604)
TejasvOnly Nov 12, 2024
03efb43
Merge branch 'develop' into feat/inheritance-ui
TejasvOnly Nov 12, 2024
eadf404
fix: propogate device session error (#606)
TejasvOnly Nov 14, 2024
a5190dc
fix: update errors from server (#609)
TejasvOnly Nov 14, 2024
07bc056
feat: integrate edit api for reminder time (#610)
TejasvOnly Nov 14, 2024
27e1351
feat: cypherock covery banner added in portfolio (#607)
AryanCypherock Nov 14, 2024
ab437ae
fix: card taps ui in pin recovery (#608)
AryanCypherock Nov 14, 2024
2c66fd6
fix: inheritance UI text overflow (#595)
AryanCypherock Nov 14, 2024
f2fbb37
fix: invalid input text validation ( ascii only ) (#605)
AryanCypherock Nov 14, 2024
34c8f75
fix: throw proper errors when invalid coupon code received (#612)
TejasvOnly Nov 14, 2024
5cc23a8
fix: use proper http status for unauthorized access
TejasvOnly Nov 15, 2024
09de230
fix: memoization of details input forms
TejasvOnly Nov 15, 2024
c402d1a
fix: disable button when executorm message is empty
TejasvOnly Nov 15, 2024
1ba644e
Merge pull request #615 from Cypherock/fix/inheritance/proper-memo-fo…
AryanCypherock Nov 15, 2024
4af036c
Merge pull request #614 from Cypherock/fix/inheritance/retry-token-er…
AryanCypherock Nov 15, 2024
8883059
fix: name field error fixed in user details
AryanCypherock Nov 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 25 additions & 5 deletions .github/workflows/build-early.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@ jobs:
with:
node-version: ${{ matrix.node }}

- name: Install Protoc
run: |
PB_REL="https://github.com/protocolbuffers/protobuf/releases"
curl -LO $PB_REL/download/v22.2/protoc-22.2-linux-x86_64.zip
unzip protoc-22.2-linux-x86_64.zip -d $HOME/.local
export PATH="$PATH:$HOME/.local/bin"

- name: Check protoc installation
run: protoc --version

- name: Setup pnpm store path
run: pnpm config set store-dir ~/.pnpm-store

Expand All @@ -66,7 +76,7 @@ jobs:
${{ runner.os }}-pnpm-store-

- name: pnpm install
run: pnpm install
run: pnpm inheritance-install

- name: Setup turbo cache
env:
Expand Down Expand Up @@ -115,6 +125,16 @@ jobs:
with:
node-version: ${{ matrix.node }}

- name: Install Protoc
run: |
PB_REL="https://github.com/protocolbuffers/protobuf/releases"
curl -LO $PB_REL/download/v22.2/protoc-22.2-linux-x86_64.zip
unzip protoc-22.2-linux-x86_64.zip -d $HOME/.local
export PATH="$PATH:$HOME/.local/bin"

- name: Check protoc installation
run: protoc --version

- name: Setup pnpm store path
run: pnpm config set store-dir ~/.pnpm-store

Expand All @@ -130,7 +150,7 @@ jobs:
run: sudo apt-get install fakeroot dpkg rpm -y

- name: pnpm install
run: pnpm install
run: pnpm inheritance-install

- name: Setup turbo cache
env:
Expand Down Expand Up @@ -205,11 +225,11 @@ jobs:
- name: Fix hashBang in pnpm.cjs
env:
WINDOWS_USERNAME: ${{ secrets.WINDOWS_USERNAME }}
IS_CI: "true"
IS_CI: 'true'
run: pnpm fix:hashbang

- name: pnpm install
run: pnpm install
run: pnpm inheritance-install

- name: Setup turbo cache
env:
Expand Down Expand Up @@ -281,7 +301,7 @@ jobs:
${{ runner.os }}-pnpm-store-

- name: pnpm install
run: pnpm install
run: pnpm inheritance-install

- name: Setup turbo cache
env:
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,17 @@ jobs:
with:
node-version: ${{ matrix.node }}

- name: Install Protoc
run: |
PB_REL="https://github.com/protocolbuffers/protobuf/releases"
curl -LO $PB_REL/download/v22.2/protoc-22.2-linux-x86_64.zip
unzip protoc-22.2-linux-x86_64.zip -d $HOME/.local
export PATH="$PATH:$HOME/.local/bin"

- name: Check protoc installation
run: protoc --version


- name: Setup pnpm store path
run: pnpm config set store-dir ~/.pnpm-store

Expand All @@ -58,7 +69,7 @@ jobs:
${{ runner.os }}-pnpm-store-

- name: pnpm install
run: pnpm install
run: pnpm inheritance-install

- name: Setup turbo cache
env:
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,17 @@ jobs:
with:
node-version: ${{ matrix.node }}

- name: Install Protoc
run: |
PB_REL="https://github.com/protocolbuffers/protobuf/releases"
curl -LO $PB_REL/download/v22.2/protoc-22.2-linux-x86_64.zip
unzip protoc-22.2-linux-x86_64.zip -d $HOME/.local
export PATH="$PATH:$HOME/.local/bin"

- name: Check protoc installation
run: protoc --version


- name: Setup pnpm store path
run: pnpm config set store-dir ~/.pnpm-store

Expand All @@ -48,7 +59,7 @@ jobs:
${{ runner.os }}-pnpm-store-

- name: pnpm install
run: pnpm install
run: pnpm inheritance-install

- name: Setup turbo cache
env:
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ auto-install-peers=true
# TODO: Find a better way to do this
# https://github.com/electron-userland/electron-builder/issues/6289
shamefully-hoist=true
node-options=--max-old-space-size=8192
1 change: 1 addition & 0 deletions apps/desktop/src/main/ipc/db.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const collectionNameList: (keyof IDatabase)[] = [
'priceInfo',
'transactionNotificationRead',
'transactionNotificationClick',
'inheritancePlan',
];

export const setupDbListeners = async (webContents: WebContents) => {
Expand Down
1 change: 1 addition & 0 deletions apps/desktop/src/preload/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ const electronAPI = {
'priceInfo',
'transactionNotificationRead',
'transactionNotificationClick',
'inheritancePlan',
];

const eventNames = ['change'];
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"email": "support@cypherock.com"
},
"scripts": {
"start": "cross-env NODE_OPTIONS=--max-old-space-size=4096 && node scripts/watch/index.js",
"start": "cross-env NODE_OPTIONS=--max_old_space_size=8192 node scripts/watch/index.js",
"dev": "turbo dev --no-daemon --filter @cypherock/cysync-desktop",
"dev:cli": "bash scripts/devCli.sh",
"make": "turbo make --no-daemon --filter @cypherock/cysync-desktop",
Expand All @@ -32,14 +32,15 @@
"clean:force": "node scripts/clean.js -f && bash ./scripts/clean.sh",
"build:submodules": "node scripts/submodules.js build",
"ci:publish": "pnpm publish -r --access public --no-git-checks --filter \"@cypherock/coins\"",
"ci:version": "pnpm changeset version && pnpm i --no-frozen-lockfile",
"ci:version": "pnpm changeset version && pnpm inheritance-install --no-frozen-lockfile",
"storybook": "turbo storybook --no-daemon",
"build:storybook": "turbo build:storybook --no-daemon",
"fix:hashbang": "bash scripts/hashBangFix.sh",
"erc20-diff": "turbo run erc20-diff --no-daemon",
"gen-erc20-list": "turbo run gen-erc20-list --no-daemon",
"download-erc20-images": "turbo run download-erc20-images --no-daemon",
"gen-translations": "turbo run gen-translations --no-daemon"
"gen-translations": "turbo run gen-translations --no-daemon",
"inheritance-install": "node scripts/inheritanceSetup.js"
},
"keywords": [],
"license": "AGPL-3.0",
Expand Down
8 changes: 8 additions & 0 deletions packages/app-support-inheritance/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = {
root: true,
extends: ['@cypherock/eslint-config/browser'],
parserOptions: {
tsconfigRootDir: __dirname,
project: ['./tsconfig.eslint.json'],
},
};
3 changes: 3 additions & 0 deletions packages/app-support-inheritance/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.turbo
dist
coverage
1 change: 1 addition & 0 deletions packages/app-support-inheritance/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"@cypherock/prettier-config"
3 changes: 3 additions & 0 deletions packages/app-support-inheritance/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# App Support for Inheritance

- All coin operations related to Inheritance
5 changes: 5 additions & 0 deletions packages/app-support-inheritance/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const baseConfig = require('@cypherock/jest-config/node');

module.exports = {
...baseConfig,
};
59 changes: 59 additions & 0 deletions packages/app-support-inheritance/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"name": "@cypherock/app-support-inheritance",
"version": "0.0.0",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
"types": "dist/esm/index.d.ts",
"license": "AGPL-3.0",
"private": true,
"scripts": {
"lint": "eslint --ext .ts,tsx,js,jsx src/ --fix",
"lint:check": "eslint --ext .ts,tsx,js,jsx src/",
"pretty": "prettier --write \"src/**/*.ts?(x)\" \"tests/**/*.ts?(x)\"",
"pretty:check": "prettier --check \"src/**/*.ts?(x)\" \"tests/**/*.ts?(x)\"",
"build": "rimraf dist && pnpm build:esm && pnpm build:cjs",
"build:cjs": "tsc -p tsconfig_cjs.json",
"build:esm": "tsc -p tsconfig.json",
"build:dirty": "pnpm build:esm",
"test": "jest",
"pre-commit": "lint-staged"
},
"devDependencies": {
"@cypherock/eslint-config": "workspace:^",
"@cypherock/jest-config": "workspace:^",
"@cypherock/prettier-config": "workspace:^",
"@cypherock/tsconfig": "workspace:^",
"@jest/globals": "^29.5.0",
"@stryker-mutator/core": "^7.0.2",
"@stryker-mutator/jest-runner": "^7.0.2",
"@stryker-mutator/typescript-checker": "^7.0.2",
"@types/jest": "^29.5.2",
"@types/lodash": "^4.14.195",
"@types/node": "18.15.11",
"eslint": "^8.43.0",
"jest": "^29.5.0",
"lint-staged": "^13.2.2",
"prettier": "^2.8.8",
"rimraf": "^5.0.1",
"ts-jest": "^29.1.0",
"typescript": "^4.9.5"
},
"dependencies": {
"@cypherock/cysync-interfaces": "workspace:^",
"@cypherock/cysync-utils": "workspace:^",
"@cypherock/sdk-app-inheritance": "^0.0.0",
"@cypherock/sdk-interfaces": "^0.0.15",
"@cypherock/sdk-utils": "^0.0.18",
"lodash": "^4.17.21",
"rxjs": "^7.8.1"
},
"lint-staged": {
"*.{ts,tsx}": [
"eslint --ext ts,tsx --quiet --fix --",
"prettier --write"
],
"*.{js,jsx,md,mdx,mjs,yml,yaml,css,json}": [
"prettier --write"
]
}
}
34 changes: 34 additions & 0 deletions packages/app-support-inheritance/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/* eslint-disable class-methods-use-this */
import * as operations from './operations';
import {
IInheritanceDecryptMessageParams,
IInheritanceEncryptMessageParams,
IInheritanceStartSessionParams,
IInheritanceStopSessionParams,
IInheritanceWalletAuthParams,
} from './operations/types';

export * from './operations/types';
export { updateLogger } from './utils/logger';

export class InheritanceSupport {
public walletAuth(params: IInheritanceWalletAuthParams) {
return operations.walletAuth(params);
}

public encryptMessageWithPin(params: IInheritanceEncryptMessageParams) {
return operations.encryptMessage(params);
}

public decryptMessageWithPin(params: IInheritanceDecryptMessageParams) {
return operations.decryptMessage(params);
}

public startSession(params: IInheritanceStartSessionParams) {
return operations.startSession(params);
}

public stopSession(params: IInheritanceStopSessionParams) {
return operations.stopSession(params);
}
}
4 changes: 4 additions & 0 deletions packages/app-support-inheritance/src/operations/common.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export const ENCRYPTED_DATA_SERIALIZATION_TAGS = {
WALLET_MESSAGE: 2,
NOMINEE_MESSAGE: 3,
};
Loading
Loading